mariadb/sql/share
unknown 0a03601fab merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-identity.result~e41453a364242503:
  Auto merged
BitKeeper/deleted/.del-identity.test~326f469b59105404:
  Auto merged
include/my_pthread.h:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/pars/pars0opt.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2002-04-25 01:16:42 +03:00
..
charsets Add latin1_de character set, and make it the default. 2001-09-06 17:18:36 -04:00
czech merge 2002-04-25 01:16:42 +03:00
danish merge 2002-04-25 01:16:42 +03:00
dutch merge 2002-04-25 01:16:42 +03:00
english merge 2002-04-25 01:16:42 +03:00
estonian merge 2002-04-25 01:16:42 +03:00
french merge 2002-04-25 01:16:42 +03:00
german merge 2002-04-25 01:16:42 +03:00
greek merge 2002-04-25 01:16:42 +03:00
hungarian merge 2002-04-25 01:16:42 +03:00
italian merge 2002-04-25 01:16:42 +03:00
japanese merge 2002-04-25 01:16:42 +03:00
korean merge 2002-04-25 01:16:42 +03:00
norwegian merge 2002-04-25 01:16:42 +03:00
norwegian-ny merge 2002-04-25 01:16:42 +03:00
polish merge 2002-04-25 01:16:42 +03:00
portuguese merge 2002-04-25 01:16:42 +03:00
romanian merge 2002-04-25 01:16:42 +03:00
russian merge 2002-04-25 01:16:42 +03:00
slovak merge 2002-04-25 01:16:42 +03:00
spanish merge 2002-04-25 01:16:42 +03:00
swedish merge 2002-04-25 01:16:42 +03:00
ukrainian merge 2002-04-25 01:16:42 +03:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
Makefile.am merge with 3.23.50 2002-03-27 01:56:10 +02:00