database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

bzr merge -r4346 maria/10.0 (maria-10.0.13)

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-08-11 23:55:41 -04:00
parent e06e12f5b8 4105cbf4a2
commit 8358dd53b7
631 changed files with 28781 additions and 9885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_admin.cc
View File

@ -914,7 +914,7 @@ send_result_message:
protocol->store(operator_name, system_charset_info);
if (result_code) // either mysql_recreate_table or analyze failed
{
DBUG_ASSERT(thd->is_error() || thd->killed);
DBUG_ASSERT(thd->is_error());
if (thd->is_error())
{
const char *err_msg= thd->get_stmt_da()->message();