From da9fe0e6e258d326c139676654dcda88d622a92b Mon Sep 17 00:00:00 2001 From: "miguel@hegel.txg.br" <> Date: Tue, 17 Aug 2004 12:20:01 -0300 Subject: Removed non-used variable --- BitKeeper/etc/logging_ok | 1 + sql/sql_db.cc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e4648f7d849..b48e861f6df 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -95,6 +95,7 @@ miguel@hegel.(none) miguel@hegel.br miguel@hegel.local miguel@hegel.txg +miguel@hegel.txg.br miguel@light. miguel@light.local miguel@sartre.local diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 82fef3f7c7b..3b12cbe3422 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -560,7 +560,6 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) char path[FN_REFLEN+16], tmp_db[NAME_LEN+1]; MY_DIR *dirp; uint length; - my_dbopt_t *dbopt; DBUG_ENTER("mysql_rm_db"); VOID(pthread_mutex_lock(&LOCK_mysql_create_db)); -- cgit v1.2.1 From 7e89f474ab0e9ea12d5d7bfd629487774211250b Mon Sep 17 00:00:00 2001 From: "guilhem@mysql.com" <> Date: Tue, 17 Aug 2004 17:33:21 +0200 Subject: Fix for BUG#5038 "Cannot disable LOAD DATA LOCAL INFILE from client" (specific to 4.1): don't put CLIENT_LOCAL_FILES in CLIENT_CAPABILITIES; it would make mysql_options(CLIENT_LOCAL_FILES,0) have no effect. --- libmysql/client_settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index 1d4f45b729f..5857c0c84d6 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -18,7 +18,7 @@ extern uint mysql_port; extern my_string mysql_unix_port; #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | \ - CLIENT_LOCAL_FILES | CLIENT_TRANSACTIONS | \ + CLIENT_TRANSACTIONS | \ CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION) sig_handler pipe_sig_handler(int sig __attribute__((unused))); -- cgit v1.2.1