mariadb/sql/share
unknown 0c259c54b0 Merge with public tree
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/m_ctype.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
mysql-test/r/warnings.result:
  Fix error numbers after merge
sql/share/czech/errmsg.txt:
  Add missing ',' and fix typo
sql/share/danish/errmsg.txt:
  Add missing ',' and fix typo
sql/share/dutch/errmsg.txt:
  Add missing ',' and fix typo
sql/share/estonian/errmsg.txt:
  Add missing ',' and fix typo
sql/share/french/errmsg.txt:
  Add missing ',' and fix typo
sql/share/german/errmsg.txt:
  Add missing ',' and fix typo
sql/share/greek/errmsg.txt:
  Add missing ',' and fix typo
sql/share/hungarian/errmsg.txt:
  Add missing ',' and fix typo
sql/share/italian/errmsg.txt:
  Add missing ',' and fix typo
sql/share/japanese/errmsg.txt:
  Add missing ',' and fix typo
sql/share/korean/errmsg.txt:
  Add missing ',' and fix typo
sql/share/norwegian-ny/errmsg.txt:
  Add missing ',' and fix typo
sql/share/norwegian/errmsg.txt:
  Add missing ',' and fix typo
sql/share/polish/errmsg.txt:
  Add missing ',' and fix typo
sql/share/portuguese/errmsg.txt:
  Add missing ',' and fix typo
sql/share/romanian/errmsg.txt:
  Add missing ',' and fix typo
sql/share/russian/errmsg.txt:
  Add missing ',' and fix typo
sql/share/slovak/errmsg.txt:
  Add missing ',' and fix typo
sql/share/spanish/errmsg.txt:
  Add missing ',' and fix typo
sql/share/swedish/errmsg.txt:
  Add missing ',' and fix typo
sql/share/ukrainian/errmsg.txt:
  Add missing ',' and fix typo
2004-02-16 10:31:05 +02:00
..
charsets
czech Merge with public tree 2004-02-16 10:31:05 +02:00
danish Merge with public tree 2004-02-16 10:31:05 +02:00
dutch Merge with public tree 2004-02-16 10:31:05 +02:00
english Merge with public tree 2004-02-16 10:31:05 +02:00
estonian Merge with public tree 2004-02-16 10:31:05 +02:00
french Merge with public tree 2004-02-16 10:31:05 +02:00
german Merge with public tree 2004-02-16 10:31:05 +02:00
greek Merge with public tree 2004-02-16 10:31:05 +02:00
hungarian Merge with public tree 2004-02-16 10:31:05 +02:00
italian Merge with public tree 2004-02-16 10:31:05 +02:00
japanese Merge with public tree 2004-02-16 10:31:05 +02:00
korean Merge with public tree 2004-02-16 10:31:05 +02:00
norwegian Merge with public tree 2004-02-16 10:31:05 +02:00
norwegian-ny Merge with public tree 2004-02-16 10:31:05 +02:00
polish Merge with public tree 2004-02-16 10:31:05 +02:00
portuguese Merge with public tree 2004-02-16 10:31:05 +02:00
romanian Merge with public tree 2004-02-16 10:31:05 +02:00
russian Merge with public tree 2004-02-16 10:31:05 +02:00
serbian no dots in the error messages! 2004-02-15 19:16:38 +01:00
slovak Merge with public tree 2004-02-16 10:31:05 +02:00
spanish Merge with public tree 2004-02-16 10:31:05 +02:00
swedish Merge with public tree 2004-02-16 10:31:05 +02:00
ukrainian Merge with public tree 2004-02-16 10:31:05 +02:00
.cvsignore
Makefile.am