• unknown's avatar
    Merge 192.168.0.10:mysql/work/my51-work · 4b13e338
    unknown authored
    into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
    
    
    BitKeeper/etc/ignore:
      auto-union
    client/mysql.cc:
      Auto merged
    mysql-test/lib/mtr_process.pl:
      Auto merged
    mysql-test/lib/mtr_report.pl:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/r/func_misc.result:
      Auto merged
    mysql-test/r/mysql.result:
      Auto merged
    mysql-test/r/rpl_000015.result:
      Auto merged
    mysql-test/t/mysql.test:
      Auto merged
    mysql-test/t/rpl_000015.test:
      Auto merged
    sql-common/my_time.c:
      Auto merged
    sql/item_func.h:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    4b13e338
mysql-test-run.pl 137 KB