From 83dd083eec9899fe270d44b007147b0d5283003f Mon Sep 17 00:00:00 2001 From: Knut Auvor Grythe Date: Mon, 27 Jun 2005 10:13:01 +0000 Subject: [PATCH] =?UTF-8?q?fikset=20litt=20sm=C3=A5tteri=20s=C3=A5=20den?= =?UTF-8?q?=20kompilerer=20p=C3=A5=20SLES9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 7 +++++++ configure | 6 +++--- configure.in | 2 +- mysql-dbadm.c | 13 ++++++++----- mysql-useradm.c | 5 +++-- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab05e0f..6b6d0b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +v0.46 (2005-06-27) knuta@itea.ntnu.no + * Replaced deprecated functions not supported in SLES9 + +v0.42-0.45 (2002-03-07 - 2004-12-08) unknown + * Various undocumented fixes, at least something about length + of group names, I think + v0.41 (2002-03-07) tlan@stud.ntnu.no * Fixed a seg.fault bug in is_password_set()-routine. diff --git a/configure b/configure index 1dc47cf..f2baef0 100644 --- a/configure +++ b/configure @@ -1544,7 +1544,7 @@ fi # Define the identity of the package. PACKAGE=mysql-admutils - VERSION=0.41 + VERSION=0.46 cat >>confdefs.h <<_ACEOF @@ -3969,8 +3969,8 @@ echo "$as_me: error: Invalid MySQL directory - unable to find mysql.h under $wit fi fi MYSQL_INCLUDE=-I$MYSQL_INCDIR - #MYSQL_LFLAGS="-L$MYSQL_LIBDIR -Wl,-rpath,$MYSQL_LIBDIR" - MYSQL_LFLAGS="-L$MYSQL_LIBDIR" + MYSQL_LFLAGS="-L$MYSQL_LIBDIR -Wl,-R,$MYSQL_LIBDIR" + #MYSQL_LFLAGS="-L$MYSQL_LIBDIR" MYSQL_LIBS=-lmysqlclient cat >>confdefs.h <<\_ACEOF diff --git a/configure.in b/configure.in index 24f253c..9b7bc2b 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(mysql-dbadm.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(mysql-admutils, 0.41) +AM_INIT_AUTOMAKE(mysql-admutils, 0.46) AM_SANITY_CHECK dnl Checks for programs. diff --git a/mysql-dbadm.c b/mysql-dbadm.c index f9d01c2..5a19fe1 100644 --- a/mysql-dbadm.c +++ b/mysql-dbadm.c @@ -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)) diff --git a/mysql-useradm.c b/mysql-useradm.c index c0ba4f7..c5de2e0 100644 --- a/mysql-useradm.c +++ b/mysql-useradm.c @@ -1,5 +1,5 @@ /* - * @(#) $Header: /tmp/cvs/mysql-admutils/mysql-useradm.c,v 1.9 2004-11-16 20:59:42 lkarsten Exp $ + * @(#) $Header: /tmp/cvs/mysql-admutils/mysql-useradm.c,v 1.10 2005-06-27 10:13:01 knuta Exp $ * * mysql-useradm.c * @@ -226,6 +226,7 @@ main(int argc, char *argv[]) int i; enum { c_create, c_delete, c_passwd, c_show } command; MYSQL mysql; + mysql_init(&mysql); char **dblist, **p; char *user; @@ -267,7 +268,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))