• unknown's avatar
    Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7ca7da41
    unknown authored
    into mysql.com:/home/psergey/mysql-5.0-bug11869-part3
    
    
    BitKeeper/deleted/.del-not_windows.inc:
      Auto merged
    mysql-test/r/create.result:
      Auto merged
    mysql-test/r/query_cache.result:
      Auto merged
    mysql-test/r/type_datetime.result:
      Auto merged
    mysql-test/t/query_cache.test:
      Auto merged
    mysql-test/t/rpl_flush_tables.test:
      Auto merged
    sql/item_sum.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql-common/my_time.c:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_union.cc:
      Auto merged
    7ca7da41
sql_union.cc 17.9 KB