mariadb/sql/share
unknown 2ee2747bd2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818


mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
mysql-test/r/rpl_sp.result:
  Manual merge.
2005-11-10 22:48:00 +03:00
..
charsets Merge mysql.com:/home/gluh/MySQL/Merge/4.1 2005-07-21 17:55:16 +05:00
.cvsignore
errmsg.txt Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-11-10 22:48:00 +03:00
Makefile.am Fix build using --without-server. (Bug #11680) 2005-08-23 11:25:24 -07:00