• unknown's avatar
    Fix for BUG#21774: Column count doesn't match value count at row x · 900e66f8
    unknown authored
    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:
      Test for BUG#21774.
    mysql-test/t/insert_select.test:
      Test for BUG#21774.
    sql/sql_base.cc:
      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:
      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:
      Removed unnecessary reset of the name resolution context.
      The context is anyway unconditionally reset in mysql_insert()
      and mysql_prepare_insert().
    900e66f8
sql_base.cc 166 KB