summaryrefslogtreecommitdiff
path: root/sql/share/norwegian-ny
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-11-03 21:33:11 +0200
committerunknown <monty@hundin.mysql.fi>2001-11-03 21:33:11 +0200
commit8b91ed2c39add003ebc56d520c902fd092f1f741 (patch)
treea20ca6b4d7423d135752caf32d8b09358147421e /sql/share/norwegian-ny
parentb3a974963dee53187668e9f467310069b4a67fcc (diff)
downloadmariadb-git-8b91ed2c39add003ebc56d520c902fd092f1f741.tar.gz
Added STDCALL to mysql_sever and mysql_thread variables
Merged error messages with 3.23.44 Fixed bug with DATA DIRECTORY on windows Docs/internals.texi: Update coding policies Docs/manual.texi: Minor general corrections acinclude.m4: Fixed wrong cpu-test configure.in: Remove CPU test, because this makes unportable binaries. include/mysql.h: Added STDCALL to mysql_sever and mysql_thread variables include/mysqld_error.h: Merged error messages with 3.23.44 libmysql/libmysql.c: Added STDCALL to mysql_sever and mysql_thread variables libmysqld/lib_sql.cc: Added STDCALL to mysql_sever and mysql_thread variables sql-bench/limits/db2.cfg: New limits file sql-bench/test-select.sh: Fixed bug in cache test sql/share/czech/errmsg.txt: Merged error messages with 3.23.44 sql/share/danish/errmsg.txt: Merged error messages with 3.23.44 sql/share/dutch/errmsg.txt: Merged error messages with 3.23.44 sql/share/english/errmsg.txt: Merged error messages with 3.23.44 sql/share/estonian/errmsg.txt: Merged error messages with 3.23.44 sql/share/french/errmsg.txt: Merged error messages with 3.23.44 sql/share/german/errmsg.txt: Merged error messages with 3.23.44 sql/share/greek/errmsg.txt: Merged error messages with 3.23.44 sql/share/hungarian/errmsg.txt: Merged error messages with 3.23.44 sql/share/italian/errmsg.txt: Merged error messages with 3.23.44 sql/share/japanese/errmsg.txt: Merged error messages with 3.23.44 sql/share/korean/errmsg.txt: Merged error messages with 3.23.44 sql/share/norwegian-ny/errmsg.txt: Merged error messages with 3.23.44 sql/share/norwegian/errmsg.txt: Merged error messages with 3.23.44 sql/share/polish/errmsg.txt: Merged error messages with 3.23.44 sql/share/portuguese/errmsg.txt: Merged error messages with 3.23.44 sql/share/romanian/errmsg.txt: Merged error messages with 3.23.44 sql/share/russian/errmsg.txt: Merged error messages with 3.23.44 sql/share/slovak/errmsg.txt: Merged error messages with 3.23.44 sql/share/spanish/errmsg.txt: Merged error messages with 3.23.44 sql/share/swedish/errmsg.txt: Merged error messages with 3.23.44 sql/share/ukrainian/errmsg.txt: Merged error messages with 3.23.44 sql/sql_parse.cc: Fix bug with DATA DIRECTORY on windows. sql/sql_select.cc: Cleanup
Diffstat (limited to 'sql/share/norwegian-ny')
-rw-r--r--sql/share/norwegian-ny/errmsg.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index bbdf23e4056..b96e9a53e10 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/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",