diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-03 22:28:16 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-03 22:28:16 +0200 |
| commit | 29bae7b7b7c2aec02fe5789f3fc6a0fb918c0814 (patch) | |
| tree | 0a2390d862862624034715894ef105522aed276b /sql/share/japanese | |
| parent | 36a4cc178fc574dd9996c620eca609fe456d8c58 (diff) | |
| parent | 8b91ed2c39add003ebc56d520c902fd092f1f741 (diff) | |
| download | mariadb-git-29bae7b7b7c2aec02fe5789f3fc6a0fb918c0814.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
acinclude.m4:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/english/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/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
Docs/manual.texi:
Bad merge.
include/mysqld_error.h:
Merge with 3.23
Diffstat (limited to 'sql/share/japanese')
| -rw-r--r-- | sql/share/japanese/errmsg.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index ba355c03e13..2251e4e73f4 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -217,6 +217,10 @@ "%-.32s@%-.64s is not allowed to create new users", "Incorrect table definition; All MERGE tables must be in the same database", "Deadlock found when trying to get lock; Try restarting transaction", +"The used table type doesn't support FULLTEXT indexes", +"Cannot add foreign key constraint", +"Cannot add a child row: a foreign key constraint fails", +"Cannot delete a parent row: a foreign key constraint fails", "Error connecting to master: %-.128s", "Error running query on master: %-.128s", "Error when executing command %s: %-.128s", |