mariadb/sql/share
unknown 8db55dcf86 Merged 4.1 into 5.0.
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-03-27 12:09:11 +01:00
..
charsets greek.xml: 2003-03-26 14:11:04 +04:00
czech Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
danish Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
dutch Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
english Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
estonian Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
french Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
german Post-merge fixes. 2003-03-19 11:36:32 +01:00
greek Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
hungarian Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
italian Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
japanese Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
korean Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
norwegian Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
norwegian-ny Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
polish Merged 4.1 into 5.0. 2003-03-27 12:09:11 +01:00
portuguese Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
romanian Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
russian Merged 4.1 into 5.0. 2003-03-27 12:09:11 +01:00
serbian Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
slovak Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
spanish Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
swedish Merged 4.1 into 5.0. 2003-03-27 12:09:11 +01:00
ukrainian Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
.cvsignore
Makefile.am