diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-11 23:55:41 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-11 23:55:41 -0400 |
| commit | 8358dd53b7406deaa9f50ad09b16a86b7e367632 (patch) | |
| tree | ef8995ad0e400cb6a1842649c3c886c7b3474835 /sql/sql_admin.cc | |
| parent | e06e12f5b8dfe0ab2e5976eec1b27b25d318441b (diff) | |
| parent | 4105cbf4a230c82ea7dee31d4d2262b798fad9f4 (diff) | |
| download | mariadb-git-8358dd53b7406deaa9f50ad09b16a86b7e367632.tar.gz | |
bzr merge -r4346 maria/10.0 (maria-10.0.13)
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index ee70914d331..f24bb2cff93 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -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(); |