summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorMartin Hansson <martin.hansson@sun.com>2009-06-22 14:51:33 +0200
committerMartin Hansson <martin.hansson@sun.com>2009-06-22 14:51:33 +0200
commit543885d1b1402bea2475ad76161de5a62929e8c2 (patch)
tree975e56055845ed8efe4d6a0af0dc9aecb836ea58 /sql
parenteac6619ff00ef2c13f30eb5bfb894857b10e4bc0 (diff)
downloadmariadb-git-543885d1b1402bea2475ad76161de5a62929e8c2.tar.gz
Bug#44653: Server crash noticed when executing random queries with partitions.
When opening a table, it is imperative that the flag TABLE::auto_increment_field_not_null be false. But if an error occured during the creation of a table (e.g. the table exists already) with an auto_increment column and a BEFORE trigger that used the INSERT ... SELECT construct, the flag was not reset until after error checking. Thus if an error occured, select_insert::send_data() returned immediately and it was not reset (see * in pseudocode below). Crash happened if the table was opened again. Fixed by resetting the flag after error checking. nested-loops_join(): for each row in SELECT table { select_insert::send_data(): if a values is supplied for AUTO_INCREMENT column table->auto_increment_field_not_null= TRUE else table->auto_increment_field_not_null= FALSE if (error) return 1; * if (table->auto_increment_field_not_null == FALSE) ... table->auto_increment_field_not_null == FALSE } <-- table returned to table cache and later retrieved by open_table: open_table(): assert(table->auto_increment_field_not_null) mysql-test/r/trigger.result: Bug#44653: Test result mysql-test/t/trigger.test: Bug#44653: Test case sql/sql_insert.cc: Bug#44653: Fix: Make sure to unset this field before returning in case of error
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_insert.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 9de27868d74..633dbf67bbc 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -3100,7 +3100,10 @@ bool select_insert::send_data(List<Item> &values)
store_values(values);
thd->count_cuted_fields= CHECK_FIELD_IGNORE;
if (thd->is_error())
+ {
+ table->auto_increment_field_not_null= FALSE;
DBUG_RETURN(1);
+ }
if (table_list) // Not CREATE ... SELECT
{
switch (table_list->view_check_option(thd, info.ignore)) {