• unknown's avatar
    Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 8e62e86f
    unknown authored
    into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
    
    
    client/mysqldump.c:
      Auto merged
    mysql-test/r/func_time.result:
      Auto merged
    mysql-test/r/mysqldump.result:
      Auto merged
    mysql-test/t/func_time.test:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/table.cc:
      Auto merged
    mysql-test/include/mix1.inc:
      Manual merge.
    mysql-test/r/innodb_mysql.result:
      Manual merge.
    8e62e86f
func_time.test 32.5 KB