mariadb/sql/share
unknown 146b0e1475 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


client/mysqldump.c:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/events_bugs.result:
  Manual merge.
2007-07-16 17:22:33 +04:00
..
charsets Merge siva.hindu.god:/usr/home/tim/m/bk/g50 2006-12-26 22:28:28 -07:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
errmsg.txt Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-07-16 17:22:33 +04:00
Makefile.am Many files: 2006-12-23 20:17:15 +01:00