• unknown's avatar
    Merge mysql.com:/home/mydev/mysql-4.1-bug14400 · fef31470
    unknown authored
    into  mysql.com:/home/mydev/mysql-5.0-ateam
    
    
    libmysqld/libmysqld.c:
      Auto merged
    myisam/mi_rkey.c:
      Auto merged
    mysql-test/r/func_sapdb.result:
      Auto merged
    mysql-test/r/symlink.result:
      Auto merged
    mysql-test/t/func_sapdb.test:
      Auto merged
    scripts/make_binary_distribution.sh:
      Auto merged
    sql/item_geofunc.h:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    libmysqld/lib_sql.cc:
      Manual merge
    mysql-test/r/func_time.result:
      Manual merge
    mysql-test/r/gis.result:
      Manual merge
    mysql-test/t/func_time.test:
      Manual merge
    mysql-test/t/gis.test:
      Manual merge
    sql-common/client.c:
      Manual merge
    fef31470
func_time.test 24.2 KB