mariadb/sql/share
unknown eff9369d10 Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836
into  mysql.com:/home/dlenev/src/mysql-5.1-merges


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Manual merge.
mysql-test/t/information_schema.test:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
2005-12-24 20:13:51 +03:00
..
charsets Merge mysql.com:/home/jimw/my/mysql-5.0-clean 2005-12-12 11:57:07 -08:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
errmsg.txt Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836 2005-12-24 20:13:51 +03:00
Makefile.am Additional "make distcheck" changes specific to 5.0 2005-11-09 11:56:04 +02:00