Merge pull request #4 in APPDRIFT/mysql-admutils from hotfix/conf-parser-coredump to develop
* commit 'd0c72fcc54e7e682a3f6e7c897737307e7fa4c6f': og riktig sti til mysql-include er /usr/include/mysql Riktig sti til mysql-lib er /usr/lib/x86_64-linux-gnu begynn fjerning av yacc o.l. for lesing av mysql-admutils-config
This commit is contained in:
commit
c15b100a03
|
@ -619,7 +619,7 @@ main(int argc, char *argv[])
|
|||
if ((command != c_show) && (argc < 3))
|
||||
return wrong_use(NULL);
|
||||
|
||||
read_config_file();
|
||||
/* read_config_file(); */
|
||||
|
||||
/* connect to the database server and select the mysql database */
|
||||
if (!mysql_real_connect(&mysql, db_server, db_user, db_passwd, db_name, 0, NULL, 0))
|
||||
|
|
|
@ -277,7 +277,7 @@ main(int argc, char *argv[])
|
|||
if ((command != c_show) && (argc < 3))
|
||||
return wrong_use(NULL);
|
||||
|
||||
read_config_file();
|
||||
/* read_config_file(); */
|
||||
|
||||
/* connect to the database server and select the mysql database */
|
||||
if (!mysql_real_connect(&mysql, db_server, db_user, db_passwd, db_name, 0, NULL, 0))
|
||||
|
|
4
pwfile.c
4
pwfile.c
|
@ -19,8 +19,8 @@
|
|||
|
||||
/* defaults for configurable values */
|
||||
const char* db_user = "root";
|
||||
const char* db_server = "localhost";
|
||||
const char* db_passwd = NULL;
|
||||
const char* db_server = "mysql.stud.ntnu.no";
|
||||
const char* db_passwd = MYSQLPW ;
|
||||
const char* db_name = "mysql";
|
||||
|
||||
extern int yyparse(void);
|
||||
|
|
Loading…
Reference in New Issue