MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:timour Date:September 12 2006 11:33am
Subject:bk commit into 5.0 tree (timour:1.2254) BUG#21774
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of timka. When timka does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-12 14:33:14+03:00, timour@stripped +5 -0
  Fix for BUG#21774: Column count doesn't match value count at row x
  
  The cause of the bug was an incomplete fix for bug 18080.
  The problem was that setup_tables() unconditionally reset the
  name resolution context to its 'tables' argument, which pointed
  to the first table of an SQL statement.
  
  The bug fix limits resetting of the name resolution context in
  setup_tables() only in the cases when the context was not set
  by earlier parser/optimizer phases.

  mysql-test/r/insert_select.result@stripped, 2006-09-12 14:33:11+03:00, timour@stripped +10 -0
    Test for BUG#21774.

  mysql-test/t/insert_select.test@stripped, 2006-09-12 14:33:11+03:00, timour@stripped +18 -0
    Test for BUG#21774.

  sql/sql_base.cc@stripped, 2006-09-12 14:33:11+03:00, timour@stripped +13 -1
    Do not reset the name resolution contect unconditionally.
    Instead set the context to 'tables' only if it was not
    set before calling setup_tables().

  sql/sql_insert.cc@stripped, 2006-09-12 14:33:11+03:00, timour@stripped +9 -0
    Added asserts to make sure that in the case of INSERT ... VALUES ...
    statements it is not necessary to reset the name resolution context
    to the first table, because there is only one table in the list of
    tables anyway. The actual code is not removed in order not to
    confuse it with the actual bug fix.

  sql/sql_parse.cc@stripped, 2006-09-12 14:33:11+03:00, timour@stripped +0 -2
    Removed unnecessary reset of the name resolution context.
    The context is anyway unconditionally reset in mysql_insert()
    and mysql_prepare_insert().

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	timour
# Host:	lamia.home
# Root:	/home/timka/mysql/src/5.0-bug-21774-sm

--- 1.349/sql/sql_base.cc	2006-09-12 14:33:18 +03:00
+++ 1.350/sql/sql_base.cc	2006-09-12 14:33:18 +03:00
@@ -4453,7 +4453,19 @@ bool setup_tables(THD *thd, Name_resolut
   uint tablenr= 0;
   DBUG_ENTER("setup_tables");
 
-  context->table_list= context->first_name_resolution_table= tables;
+  /*
+    Due to the various call paths that lead to setup_tables() it may happen
+    that context->table_list and context->first_name_resolution_table can be
+    NULL.
+    TODO: investigate all cases when this my happen, and initialize the
+    name resolution context correctly in all those places.
+  */
+  if (!context->table_list || !context->first_name_resolution_table)
+  {
+    /* Test whether the context is in a consistent state. */
+    DBUG_ASSERT(!context->first_name_resolution_table && !context->table_list);
+    context->table_list= context->first_name_resolution_table= tables;
+  }
 
   /*
     this is used for INSERT ... SELECT.

--- 1.199/sql/sql_insert.cc	2006-09-12 14:33:18 +03:00
+++ 1.200/sql/sql_insert.cc	2006-09-12 14:33:18 +03:00
@@ -411,6 +411,15 @@ bool mysql_insert(THD *thd,TABLE_LIST *t
   table= table_list->table;
 
   context= &thd->lex->select_lex.context;
+  /*
+    These three asserts test the hypothesis that the resetting of the name
+    resolution context below is not necessary at all since the list of local
+    tables for INSERT always consists of one table.
+  */
+  DBUG_ASSERT(!table_list->next_local);
+  DBUG_ASSERT(!context->table_list->next_local);
+  DBUG_ASSERT(!context->first_name_resolution_table->next_name_resolution_table);
+
   /* Save the state of the current name resolution context. */
   ctx_state.save_state(context, table_list);
 

--- 1.564/sql/sql_parse.cc	2006-09-12 14:33:18 +03:00
+++ 1.565/sql/sql_parse.cc	2006-09-12 14:33:18 +03:00
@@ -3344,8 +3344,6 @@ end_with_restore_list:
     DBUG_ASSERT(first_table == all_tables && first_table != 0);
     if ((res= insert_precheck(thd, all_tables)))
       break;
-    /* Skip first table, which is the table we are inserting in */
-    select_lex->context.table_list= first_table->next_local;
 
     if (!thd->locked_tables &&
         !(need_start_waiting= !wait_if_global_read_lock(thd, 0, 1)))

--- 1.40/mysql-test/r/insert_select.result	2006-09-12 14:33:18 +03:00
+++ 1.41/mysql-test/r/insert_select.result	2006-09-12 14:33:18 +03:00
@@ -695,6 +695,16 @@ CREATE TABLE t2 (z int, y int);
 CREATE TABLE t3 (a int, b int);
 INSERT INTO t3 (SELECT x, y FROM t1 JOIN t2 USING (y) WHERE z = 1);
 DROP TABLE IF EXISTS t1,t2,t3;
+CREATE DATABASE bug21774_1;
+CREATE DATABASE bug21774_2;
+CREATE TABLE bug21774_1.t1(id VARCHAR(10) NOT NULL,label VARCHAR(255));
+CREATE TABLE bug21774_2.t1(id VARCHAR(10) NOT NULL,label VARCHAR(255));
+CREATE TABLE bug21774_1.t2(id VARCHAR(10) NOT NULL,label VARCHAR(255));
+INSERT INTO bug21774_2.t1 SELECT t1.* FROM bug21774_1.t1;
+use bug21774_1;
+INSERT INTO bug21774_2.t1 SELECT t1.* FROM t1;
+DROP DATABASE bug21774_1;
+DROP DATABASE bug21774_2;
 CREATE DATABASE meow;
 CREATE TABLE table_target   ( mexs_id CHAR(8), messzeit TIMESTAMP, PRIMARY KEY (mexs_id));
 CREATE TABLE table_target2  ( mexs_id CHAR(8), messzeit TIMESTAMP, PRIMARY KEY (mexs_id));

--- 1.32/mysql-test/t/insert_select.test	2006-09-12 14:33:18 +03:00
+++ 1.33/mysql-test/t/insert_select.test	2006-09-12 14:33:18 +03:00
@@ -249,6 +249,24 @@ INSERT INTO t3 (SELECT x, y FROM t1 JOIN
 DROP TABLE IF EXISTS t1,t2,t3;
 
 #
+# Bug #21774: Column count doesn't match value count at row x
+#
+CREATE DATABASE bug21774_1;
+CREATE DATABASE bug21774_2;
+
+CREATE TABLE bug21774_1.t1(id VARCHAR(10) NOT NULL,label VARCHAR(255));
+CREATE TABLE bug21774_2.t1(id VARCHAR(10) NOT NULL,label VARCHAR(255));
+CREATE TABLE bug21774_1.t2(id VARCHAR(10) NOT NULL,label VARCHAR(255));
+
+INSERT INTO bug21774_2.t1 SELECT t1.* FROM bug21774_1.t1;
+
+use bug21774_1;
+INSERT INTO bug21774_2.t1 SELECT t1.* FROM t1;
+
+DROP DATABASE bug21774_1;
+DROP DATABASE bug21774_2;
+
+#
 # Bug #20989: View '(null).(null)' references invalid table(s)... on
 #             SQL SECURITY INVOKER
 #
Thread
bk commit into 5.0 tree (timour:1.2254) BUG#21774timour12 Sep