database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.

Browse Source 
Conflicts:

Text conflict in client/mysqltest.cc
Text conflict in configure.in
Text conflict in mysql-test/include/mtr_warnings.sql
This commit is contained in:
Alexey Kopytov
2010-02-23 16:26:45 +03:00
parent 0afa209018 6f78ef71d4
commit f0d2fe34f2
35 changed files with 956 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_update.cc
View File

@@ -1292,7 +1292,8 @@ bool mysql_multi_update(THD *thd,
if (using_handler)
{
Internal_error_handler *top_handler= thd->pop_internal_handler();
Internal_error_handler *top_handler;
top_handler= thd->pop_internal_handler();
DBUG_ASSERT(&handler == top_handler);
}