• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f0364b7b
    unknown authored
    into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
    
    
    mysql-test/r/innodb_mysql.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/ctype_utf8.test:
      Auto merged
    mysql-test/t/im_daemon_life_cycle.imtest:
      Auto merged
    mysql-test/t/innodb_mysql.test:
      Auto merged
    mysql-test/t/sp-error.test:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    mysql-test/t/view.test:
      Auto merged
    sql/ha_innodb.cc:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sp.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_delete.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_prepare.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/sql_trigger.cc:
      Auto merged
    sql/sql_union.cc:
      Auto merged
    sql/sql_view.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/table.cc:
      Auto merged
    tests/mysql_client_test.c:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Manual merge.
    mysql-test/r/ps.result:
      Manual merge.
    mysql-test/t/ps.test:
      Manual merge.
    f0364b7b
sql_union.cc 19.6 KB