mariadb/sql-common
unknown baad44b9e1 Merge mysql.com:/home/jimw/my/mysql-5.0-5906
into  mysql.com:/home/jimw/my/mysql-5.0-clean


libmysql/libmysql.c:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/field.cc:
  Auto merged
mysql-test/r/strict.result:
  Resolve conflict
mysql-test/t/strict.test:
  Resolve conflict
2005-07-19 19:59:34 -07:00
..
client.c Restore previous used client charset in mysql_reconnect 2005-07-16 07:13:40 +02:00
Makefile.am Fix for Bug#4030 "Client side conversion string -> date type doesn't 2004-06-24 19:08:36 +04:00
my_time.c Fix number to date conversion so it always honors the NO_ZERO_DATE, 2005-07-18 16:12:44 -07:00
pack.c Added missing SSL library (Should be in source distribution) 2003-11-28 12:18:13 +02:00