mariadb/sql/share
unknown 49b0312dd7 merge commit, hope that none of bar and dlenev changes were
lost.


BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  merge commit: new error message added
sql-common/client.c:
  merge commit
sql/mysql_priv.h:
  merge commit: autoremerge
sql/set_var.h:
  merge commit
sql/share/czech/errmsg.txt:
  merge commit
sql/share/danish/errmsg.txt:
  merge commit
sql/share/dutch/errmsg.txt:
  merge commit
sql/share/english/errmsg.txt:
  merge commit
sql/share/estonian/errmsg.txt:
  merge commit
sql/share/french/errmsg.txt:
  merge commit
sql/share/german/errmsg.txt:
  merge commit
sql/share/greek/errmsg.txt:
  merge commit
sql/share/hungarian/errmsg.txt:
  merge commit
sql/share/italian/errmsg.txt:
  merge commit
sql/share/japanese/errmsg.txt:
  merge commit
sql/share/korean/errmsg.txt:
  merge commit
sql/share/norwegian-ny/errmsg.txt:
  merge commit
sql/share/norwegian/errmsg.txt:
  merge commit
sql/share/polish/errmsg.txt:
  merge commit
sql/share/portuguese/errmsg.txt:
  merge commit
sql/share/romanian/errmsg.txt:
  merge commit
sql/share/russian/errmsg.txt:
  merge commit
sql/share/serbian/errmsg.txt:
  merge commit
sql/share/slovak/errmsg.txt:
  merge commit
sql/share/spanish/errmsg.txt:
  merge commit
sql/share/swedish/errmsg.txt:
  merge commit
sql/share/ukrainian/errmsg.txt:
  merge commit
sql/slave.cc:
  merge commit
sql/slave.h:
  merge commit
sql/sql_acl.cc:
  merge commit
sql/sql_parse.cc:
  merge commit
sql/sql_repl.h:
  merge commit
2003-09-03 14:12:10 +04: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 commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04: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 commit, hope that none of bar and dlenev changes were 2003-09-03 14:12:10 +04: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 Import changeset 2000-07-31 21:29:14 +02:00
Makefile.am koi8_ru -> koi8_r 2003-01-05 17:34:24 +04:00