• unknown's avatar
    Merge mysql.com:/home/hf/work/27957/my50-27957 · 62db8d6d
    unknown authored
    into  mysql.com:/home/hf/work/27957/my51-27957
    
    
    mysql-test/r/insert_update.result:
      Auto merged
    mysql-test/t/insert_update.test:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    mysql-test/include/mix1.inc:
      merging
    mysql-test/r/innodb_mysql.result:
      SCCS merged
    sql/sql_select.cc:
      merging
    62db8d6d
sql_select.cc 501 KB