mariadb/sql/share
unknown 5fe662e290 merging
include/mysqld_error.h:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_subselect.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/english/errmsg.txt:
  Auto merged
sql/share/estonian/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/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/hungarian/errmsg.txt:
  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/serbian/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-11-28 20:12:14 +02:00
..
charsets
czech merging 2002-11-28 20:12:14 +02:00
danish merging 2002-11-28 20:12:14 +02:00
dutch merging 2002-11-28 20:12:14 +02:00
english merging 2002-11-28 20:12:14 +02:00
estonian merging 2002-11-28 20:12:14 +02:00
french merging 2002-11-28 20:12:14 +02:00
german merging 2002-11-28 20:12:14 +02:00
greek merging 2002-11-28 20:12:14 +02:00
hungarian merging 2002-11-28 20:12:14 +02:00
italian merging 2002-11-28 20:12:14 +02:00
japanese merging 2002-11-28 20:12:14 +02:00
korean merging 2002-11-28 20:12:14 +02:00
norwegian merging 2002-11-28 20:12:14 +02:00
norwegian-ny merging 2002-11-28 20:12:14 +02:00
polish merging 2002-11-28 20:12:14 +02:00
portuguese merging 2002-11-28 20:12:14 +02:00
romanian merging 2002-11-28 20:12:14 +02:00
russian merging 2002-11-28 20:12:14 +02:00
serbian merging 2002-11-28 20:12:14 +02:00
slovak merging 2002-11-28 20:12:14 +02:00
spanish merging 2002-11-28 20:12:14 +02:00
swedish merging 2002-11-28 20:12:14 +02:00
ukrainian merging 2002-11-28 20:12:14 +02:00
.cvsignore
Makefile.am