mariadb/sql/share
unknown 6efd76f317 Merge 4.1 into 5.0.
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-opt_ft.cc~2048ffa561f9c59:
  Auto merged
BitKeeper/deleted/.del-opt_ft.h~24aac1d29304599a:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.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_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql-common/client.c:
  Auto merged
2004-02-10 18:44:02 +01:00
..
charsets latin1.xml, Index.xml: 2003-12-29 19:58:18 +04:00
czech Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
danish Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
dutch Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
english Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
estonian Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
french Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
german Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
greek Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
hungarian Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
italian Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
japanese Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
korean Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
norwegian Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
norwegian-ny Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
polish Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
portuguese Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
romanian Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
russian Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
serbian Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
slovak Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
spanish Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
swedish Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
ukrainian Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
Makefile.am Charset number is now stored into error.sys by comp_err and loaded by mysqld. 2003-09-17 16:22:58 +05:00