mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge with 4.0.11 tree to get latest bug fixes
client/mysql.cc: Auto merged client/mysqldump.c: Auto merged configure.in: Auto merged include/my_pthread.h: Auto merged include/mysql.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/libmysqld.c: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/rpl000001.result: Auto merged mysql-test/r/rpl000004.result: Auto merged mysql-test/r/type_blob.result: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/rpl000001.test: Auto merged mysys/my_init.c: Auto merged scripts/mysqld_safe.sh: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_table.cc: Auto merged sql/structs.h: Auto merged Makefile.am: Merge with 4.0.11 mysql-test/mysql-test-run.sh: Merge with 4.0.11 mysql-test/r/rpl_log.result: Use local version (needs to be updated) mysql-test/t/type_blob.test: Merge with 4.0.11 sql/mysqld.cc: Merge with 4.0.11 sql/protocol.cc: Use local version
This commit is contained in:
@ -86,18 +86,11 @@ int mysql_ha_close(THD *thd, TABLE_LIST *tables, bool dont_send_ok)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int mysql_ha_closeall(THD *thd, TABLE_LIST *tables, bool dont_send_ok)
|
||||
int mysql_ha_closeall(THD *thd, TABLE_LIST *tables)
|
||||
{
|
||||
TABLE **ptr=find_table_ptr_by_name(thd, tables->db, tables->real_name, 0);
|
||||
|
||||
DBUG_ASSERT(dont_send_ok);
|
||||
if (*ptr)
|
||||
{
|
||||
// if (!dont_send_ok) VOID(pthread_mutex_lock(&LOCK_open));
|
||||
close_thread_table(thd, ptr);
|
||||
// if (!dont_send_ok) VOID(pthread_mutex_unlock(&LOCK_open));
|
||||
}
|
||||
// if (!dont_send_ok) send_ok(&thd->net);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user