mariadb/sql/share
unknown 17994730c1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kostja/mysql/mysql-5.0-dsql3


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/errmsg.txt:
  manual merge
2005-09-03 03:25:59 +04:00
..
charsets Merge mysql.com:/home/gluh/MySQL/Merge/4.1 2005-07-21 17:55:16 +05:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
errmsg.txt Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-09-03 03:25:59 +04:00
Makefile.am Fix build using --without-server. (Bug #11680) 2005-08-23 11:25:24 -07:00