mariadb/sql/share
unknown aecdd6993e merge with work
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  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/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
myisam/rt_test.c:
  Merge
myisam/sp_key.c:
  Merge
myisam/sp_test.c:
  Merge
mysql-test/r/create.result:
  Merge
sql/share/english/errmsg.txt:
  Merge
sql/sql_yacc.yy:
  Merge
2002-10-02 13:45:16 +03:00
..
charsets Some new charsets. 2002-09-05 19:55:53 +05:00
czech merge with work 2002-10-02 13:45:16 +03:00
danish merge with work 2002-10-02 13:45:16 +03:00
dutch merge with work 2002-10-02 13:45:16 +03:00
english merge with work 2002-10-02 13:45:16 +03:00
estonian merge with work 2002-10-02 13:45:16 +03:00
french merge with work 2002-10-02 13:45:16 +03:00
german Merge with 4.0.3 2002-08-30 12:40:40 +03:00
greek merge with work 2002-10-02 13:45:16 +03:00
hungarian merge with work 2002-10-02 13:45:16 +03:00
italian merge with work 2002-10-02 13:45:16 +03:00
japanese merge with work 2002-10-02 13:45:16 +03:00
korean merge with work 2002-10-02 13:45:16 +03:00
norwegian merge with work 2002-10-02 13:45:16 +03:00
norwegian-ny merge with work 2002-10-02 13:45:16 +03:00
polish merge with work 2002-10-02 13:45:16 +03:00
portuguese merge with work 2002-10-02 13:45:16 +03:00
romanian merge with work 2002-10-02 13:45:16 +03:00
russian Merge with 4.0.3 2002-08-30 12:40:40 +03:00
serbian fixed grammar error 2002-09-27 09:11:40 +03:00
slovak merge with work 2002-10-02 13:45:16 +03:00
spanish merge with work 2002-10-02 13:45:16 +03:00
swedish merge with work 2002-10-02 13:45:16 +03:00
ukrainian Merge with 4.0.3 2002-08-30 12:40:40 +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