mariadb/sql/share
unknown 35af1442b6 merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
isam/open.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/handler.cc:
  Merge
sql/sql_acl.cc:
  Merge and code cleanup of acl_getroot()
2003-09-03 19:53:08 +03:00
..
charsets Adding Gerogian GEOSTD8 character set 2003-08-18 17:27:09 +05:00
czech merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
danish merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
dutch merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
english merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
estonian merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
french merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
german merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
greek merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
hungarian merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
italian merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
japanese merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
korean merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
norwegian merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
norwegian-ny merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
polish merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
portuguese merge 2003-09-03 19:53:08 +03:00
romanian merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
russian merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
serbian merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
slovak merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
spanish merge 2003-09-03 19:53:08 +03:00
swedish merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
ukrainian merge commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04:00
.cvsignore
Makefile.am