mariadb/sql/share
unknown 5d91dc2560 Manual merge
BitKeeper/etc/ignore:
  auto-union
mysql-test/r/events_logs_tests.result:
  Auto merged
mysql-test/t/events_logs_tests.test:
  Auto merged
mysql-test/t/events_stress.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/event_data_objects.cc:
  manual merge
sql/events.cc:
  manual merge
2006-07-10 14:42:29 +02:00
..
charsets Merge mysql.com:/usr/home/bar/mysql-5.0 2006-04-05 19:00:02 +05:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
errmsg.txt Manual merge 2006-07-10 14:42:29 +02:00
Makefile.am Additional "make distcheck" changes specific to 5.0 2005-11-09 11:56:04 +02:00