Projects/mysql-admutils
13
0
Fork 0
Code Issues Pull Requests Activity

fikset litt småtteri så den kompilerer på SLES9

Browse Source
This commit is contained in:
Knut Auvor Grythe
2005-06-27 10:13:01 +00:00
parent a5f4841fb8
commit 83dd083eec
5 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-dbadm.c
View File

@@ -1,5 +1,5 @@
/*
* @(#) $Header: /tmp/cvs/mysql-admutils/mysql-dbadm.c,v 1.12 2004-11-16 20:56:51 lkarsten Exp $
* @(#) $Header: /tmp/cvs/mysql-admutils/mysql-dbadm.c,v 1.13 2005-06-27 10:13:01 knuta Exp $
*
* mysql-dbadm.c
*
@@ -97,9 +97,10 @@ create(MYSQL *pmysql, char *db)
}
mysql_select_db(pmysql, "mysql");
// oppretter databasen.
if (mysql_create_db(pmysql, db)) {
char query[1024];
sprintf(query, "create database `%s`", db);
if (mysql_query(pmysql, query))
return dberror(pmysql, "Cannot create database '%s'.", db);
}
fprintf(stderr, "Database '%s' created.\n", db);
return 0;
}
@@ -120,7 +121,8 @@ drop(MYSQL *pmysql, char *db)
}
mysql_select_db(pmysql, "mysql");
if (mysql_drop_db(pmysql, db))
sprintf(query, "drop database `%s`", db);
if (mysql_query(pmysql, query))
return dberror(pmysql, "Cannot drop database '%s'.", db);
fprintf(stderr, "Database '%s' dropped.\n", db);
@@ -421,6 +423,7 @@ main(int argc, char *argv[])
int i;
enum { c_create, c_drop, c_editperm, c_show } command;
MYSQL mysql;
mysql_init(&mysql);
char **dblist, **p;
char *db;
@@ -463,7 +466,7 @@ main(int argc, char *argv[])
read_config_file();
/* connect to the database server and select the mysql database */
if (!mysql_connect(&mysql, db_server, db_user, db_passwd))
if (!mysql_real_connect(&mysql, db_server, db_user, db_passwd, db_name, 0, NULL, 0))
return dberror(&mysql, "Cannot connect to database server '%s'.",
db_server);
if (mysql_select_db(&mysql, db_name))