• unknown's avatar
    Merge trift2.:/MySQL/M50/push-5.0 · 0b2cb662
    unknown authored
    into  trift2.:/MySQL/M51/push-5.1
    
    
    BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
      Auto merged
    configure.in:
      Auto merged
    include/my_time.h:
      Auto merged
    mysql-test/install_test_db.sh:
      Auto merged
    mysql-test/mysql-test-run-shell.sh:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/r/func_time.result:
      Auto merged
    mysql-test/r/rename.result:
      Auto merged
    mysql-test/t/func_time.test:
      Auto merged
    mysql-test/t/rename.test:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql-common/my_time.c:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/time.cc:
      Auto merged
    storage/myisam/sort.c:
      Auto merged
    0b2cb662
install_test_db.sh 2.12 KB