• unknown's avatar
    Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525 · e54ecf09
    unknown authored
    into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
    
    
    client/mysqltest.c:
      Auto merged
    include/my_global.h:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/mysql-test-run.sh:
      Auto merged
    mysql-test/r/heap.result:
      Auto merged
    mysql-test/r/merge.result:
      Auto merged
    mysql-test/r/ps.result:
      Auto merged
    mysql-test/r/trigger.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/ps.test:
      Auto merged
    mysql-test/t/trigger.test:
      Auto merged
    mysql-test/t/view.test:
      Auto merged
    sql/field.cc:
      Auto merged
    sql/field.h:
      Auto merged
    sql/ha_myisammrg.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_select.h:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    storage/myisammrg/myrg_queue.c:
      Auto merged
    sql/sql_rename.cc:
      Manual merge.
    sql/sql_trigger.cc:
      Manual merge.
    sql/sql_yacc.yy:
      Manual merge.
    e54ecf09
mysql-test-run.pl 97.6 KB