• unknown's avatar
    Merge mysql.com:/home/kostja/mysql/tmp_merge · fa86430f
    unknown authored
    into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
    
    
    client/mysqltest.c:
      Auto merged
    mysql-test/r/date_formats.result:
      Auto merged
    mysql-test/r/sp-error.result:
      Auto merged
    mysql-test/r/sp-security.result:
      Auto merged
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/r/type_float.result:
      Auto merged
    mysql-test/t/date_formats.test:
      Auto merged
    mysql-test/t/sp-error.test:
      Auto merged
    mysql-test/t/sp-security.test:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    mysql-test/t/type_float.test:
      Auto merged
    mysql-test/t/variables.test:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    fa86430f
item_timefunc.cc 77.3 KB