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

rename st_my_thread_var::opt_info -> st_my_thread_var::keycache_link

Browse Source
This commit is contained in:
Sergei Golubchik
2015-01-19 14:19:05 +01:00
parent e2a2768278
commit c75eec8e0d
4 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_show.cc
View File

@ -4275,7 +4275,7 @@ fill_schema_table_by_open(THD *thd, bool is_show_fields_or_keys,
Again we don't do this for SHOW COLUMNS/KEYS because
of backward compatibility.
*/
if (!is_show_fields_or_keys && result && thd->is_error() &&
if (!is_show_fields_or_keys && result &&
(thd->get_stmt_da()->sql_errno() == ER_NO_SUCH_TABLE ||
thd->get_stmt_da()->sql_errno() == ER_WRONG_OBJECT))
{
@ -5282,12 +5282,11 @@ err:
column with the error text, and clear the error so that the operation
can continue.
*/
const char *error= thd->is_error() ? thd->get_stmt_da()->message() : "";
const char *error= thd->get_stmt_da()->message();
table->field[20]->store(error, strlen(error), cs);
push_warning(thd, Sql_condition::WARN_LEVEL_WARN,
thd->get_stmt_da()->sql_errno(),
thd->get_stmt_da()->message());
thd->get_stmt_da()->sql_errno(), error);
thd->clear_error();
}