mariadb/sql-common
unknown 4db14a57e7 Merge mysql.com:/home/alexi/dev/mysql-4.1-12440
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
2005-12-15 18:59:40 +03:00
..
client.c Fix value returned by mysql_warning_count() after fetching a prepared 2005-12-06 15:50:03 -08:00
Makefile.am
my_time.c Merge mysql.com:/home/alexi/dev/mysql-4.1-12440 2005-12-15 18:59:40 +03:00
pack.c