mariadb/libmysql
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
..
.cvsignore
acinclude.m4
client_settings.h
conf_to_src.c
dll.c
errmsg.c
get_password.c
libmysql.c Merge mysql.com:/home/jimw/my/mysql-5.0-5906 2005-07-19 19:59:34 -07:00
libmysql.def Fixes to previous changeset 2005-07-18 20:05:30 +03:00
Makefile.am Makefile.am: 2005-07-05 23:24:48 +02:00
Makefile.shared Cleanups during review 2005-07-18 15:33:18 +03:00
manager.c