Commit 7c1abe15 authored by Michael Widenius's avatar Michael Widenius

Fixed patch that was part of last push that didn't apply correctly.

parent 5f1f2fc0
...@@ -406,7 +406,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, ...@@ -406,7 +406,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
open_error= open_and_lock_tables(thd, table, TRUE, 0); open_error= open_and_lock_tables(thd, table, TRUE, 0);
da->pop_warning_info(&tmp_wi); da->pop_warning_info();
} }
else else
{ {
......
...@@ -2962,26 +2962,23 @@ void mysql_stmt_get_longdata(THD *thd, char *packet, ulong packet_length) ...@@ -2962,26 +2962,23 @@ void mysql_stmt_get_longdata(THD *thd, char *packet, ulong packet_length)
param= stmt->param_array[param_number]; param= stmt->param_array[param_number];
Diagnostics_area new_stmt_da(true), *save_stmt_da= thd->stmt_da; Diagnostics_area new_stmt_da(thd->query_id, false);
Warning_info new_warning_info(thd->query_id, false, true); Diagnostics_area *save_stmt_da= thd->get_stmt_da();
Warning_info *save_warning_info= thd->warning_info;
thd->stmt_da= &new_stmt_da; thd->set_stmt_da(&new_stmt_da);
thd->warning_info= &new_warning_info;
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
param->set_longdata(packet, (ulong) (packet_end - packet)); param->set_longdata(packet, (ulong) (packet_end - packet));
#else #else
param->set_longdata(thd->extra_data, thd->extra_length); param->set_longdata(thd->extra_data, thd->extra_length);
#endif #endif
if (thd->stmt_da->is_error()) if (thd->get_stmt_da()->is_error())
{ {
stmt->state= Query_arena::STMT_ERROR; stmt->state= Query_arena::STMT_ERROR;
stmt->last_errno= thd->stmt_da->sql_errno(); stmt->last_errno= thd->get_stmt_da()->sql_errno();
strncpy(stmt->last_error, thd->stmt_da->message(), MYSQL_ERRMSG_SIZE); strncpy(stmt->last_error, thd->get_stmt_da()->message(), MYSQL_ERRMSG_SIZE);
} }
thd->stmt_da= save_stmt_da; thd->set_stmt_da(save_stmt_da);
thd->warning_info= save_warning_info;
general_log_print(thd, thd->get_command(), NullS); general_log_print(thd, thd->get_command(), NullS);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment