diff options
| author | unknown <monty@mysql.com> | 2006-02-25 13:24:18 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-02-25 13:24:18 +0200 |
| commit | 3093b5fea7318d06b35e3e86a6a9991e6808d288 (patch) | |
| tree | 288406f6e3ace5d4c7f1cf508daf0f377101627d /sql/sql_db.cc | |
| parent | 0afb6ff66082f64c7c0aea62662e4c03e7c987c5 (diff) | |
| download | mariadb-git-3093b5fea7318d06b35e3e86a6a9991e6808d288.tar.gz | |
Fixed new introduced bug in binlog.test with --ps-protocol
mysql-test/t/binlog.test:
Fixed --ps-protocol (Side effect from last patch)
sql/sql_db.cc:
Removed compiler warning
Fixed memory loss on slave
tests/mysql_client_test.c:
Removed compiler warnings
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 357d2d5a21f..09412bfe401 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -1109,6 +1109,9 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check) DBUG_ENTER("mysql_change_db"); DBUG_PRINT("enter",("name: '%s'",name)); + LINT_INIT(db_length); + LINT_INIT(db_access); + /* dbname can only be NULL if malloc failed */ if (!dbname || !(db_length= strlen(dbname))) { @@ -1126,7 +1129,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check) if (check_db_name(dbname)) { my_error(ER_WRONG_DB_NAME, MYF(0), dbname); - x_free(dbname); + my_free(dbname, MYF(0)); DBUG_RETURN(1); } DBUG_PRINT("info",("Use database: %s", dbname)); @@ -1176,8 +1179,6 @@ end: x_free(thd->db); if (dbname && dbname[0] == 0) { - if (!(thd->slave_thread)) - x_free(dbname); thd->db= NULL; thd->db_length= 0; } |