sql-common/my_time.c · 94b52d9e87307e46a60349ef7597c3e7a14071bf · nexedi / MariaDB

Merge mysql.com:/home/alexi/dev/mysql-4.1-12440 · bf4b5b39

unknown authored Dec 15, 2005

into  mysql.com:/home/alexi/dev/mysql-5.0-12440


mysql-test/r/type_time.result:
  Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql-common/my_time.c:
  Auto merged
zlib/Makefile.am:
  Auto merged

bf4b5b39

my_time.c 31.5 KB

Replace my_time.c