diff options
| author | joreland@mysql.com <> | 2004-08-18 00:27:09 +0200 |
|---|---|---|
| committer | joreland@mysql.com <> | 2004-08-18 00:27:09 +0200 |
| commit | 029ce2f08f1ac53c4e55e59b280221ce076fd021 (patch) | |
| tree | 74001c3dca3e5062cc86948abac9ce27891eb0f0 | |
| parent | 26a30a73317eb5f90c0af10bf02500df84fbd9a3 (diff) | |
| parent | 05d75947b2b4b4cf4f4a7585e03d394b44e08b46 (diff) | |
| download | mariadb-git-029ce2f08f1ac53c4e55e59b280221ce076fd021.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | libmysql/client_settings.h | 2 | ||||
| -rw-r--r-- | sql/sql_db.cc | 1 |
3 files changed, 2 insertions, 2 deletions
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/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))); 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)); |