mariadb/sql/share
unknown 4d3dce7fc1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


mysys/my_error.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  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/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/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
2004-06-01 17:29:13 +04:00
..
charsets
czech Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
danish
dutch Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
english Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
estonian Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
french Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
german Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
greek Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
hungarian Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
italian Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
japanese Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
korean Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
norwegian Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
norwegian-ny Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
polish Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
portuguese Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
romanian Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
russian Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
serbian
slovak Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
spanish Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
swedish Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
ukrainian Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-06-01 17:29:13 +04:00
.cvsignore
Makefile.am