• unknown's avatar
    Manually merged · 70536ba1
    unknown authored
    
    client/mysqltest.c:
      Auto merged
    myisam/mi_check.c:
      Auto merged
    mysql-test/r/update.result:
      Auto merged
    mysql-test/t/update.test:
      Auto merged
    sql/item_timefunc.h:
      Auto merged
    sql/spatial.cc:
      Auto merged
    sql/sql_select.h:
      Auto merged
    BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
      Auto merged
    70536ba1
item_func.cc 119 KB