• unknown's avatar
    Better bug fix for: · 663b4c4f
    unknown authored
    #9728  'Decreased functionality in "on duplicate key update
    #8147  'a column proclaimed ambigous in INSERT ... SELECT .. ON DUPLICATE'
    
    This ensures fields are uniquely qualified and also that one can't update other tables in the ON DUPLICATE KEY UPDATE part
    
    
    mysql-test/r/insert_select.result:
      More tests for bug #9728 and #8147
    mysql-test/r/insert_update.result:
      Updated tests after changing how INSERT ... SELECT .. ON DUPLICATE KEY works
    mysql-test/t/insert_select.test:
      More tests for bug #9728 and #8147
    mysql-test/t/insert_update.test:
      Updated tests after changing how INSERT ... SELECT .. ON DUPLICATE KEY works
    mysys/my_access.c:
      Cleanup (shorter loop variable names)
    sql/ha_ndbcluster.cc:
      Indentation fixes
    sql/item.cc:
      Remove item_flags
    sql/item.h:
      Remove item_flags
    sql/mysql_priv.h:
      New arguments to mysql_prepare_insert
    sql/sql_base.cc:
      Remove old fix for bug #8147
    sql/sql_insert.cc:
      Extend mysql_prepare_insert() with new field list for tables that can be used in the values port of ON DUPLICATE KEY UPDATE
    sql/sql_parse.cc:
      Revert fix for #9728
      Allow one to use other tables in ON DUPLICATE_KEY for INSERT ... SELECT if there is no GROUP BY clause
    sql/sql_prepare.cc:
      New arguments to mysql_prepare_insert
    sql/sql_yacc.yy:
      Revert bug fix for #9728
    663b4c4f
sql_yacc.yy 153 KB