summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2001-10-23 10:52:51 +0200
committerunknown <serg@serg.mysql.com>2001-10-23 10:52:51 +0200
commit11572916ffb543e5b89db156a46a265d251bf768 (patch)
tree6f045be38734a0b7be25eee3c7755b68e6152904 /sql/share
parent151ffe886b4b21499471658fdf01ea8347287092 (diff)
downloadmariadb-git-11572916ffb543e5b89db156a46a265d251bf768.tar.gz
HA_NO_FULLTEXT_KEY and an appropriate error message
include/mysqld_error.h: New error message added libmysql/violite.c: FreeBSD fix sql/ha_berkeley.h: HA_NO_FULLTEXT_KEY sql/ha_heap.h: HA_NO_FULLTEXT_KEY sql/ha_innobase.h: HA_NO_FULLTEXT_KEY sql/ha_isam.h: HA_NO_FULLTEXT_KEY sql/ha_isammrg.h: HA_NO_FULLTEXT_KEY sql/ha_myisammrg.h: HA_NO_FULLTEXT_KEY sql/share/czech/errmsg.txt: New error message added sql/share/danish/errmsg.txt: New error message added sql/share/dutch/errmsg.txt: New error message added sql/share/english/errmsg.txt: New error message added sql/share/estonian/errmsg.txt: New error message added sql/share/french/errmsg.txt: New error message added sql/share/german/errmsg.txt: New error message added sql/share/greek/errmsg.txt: New error message added sql/share/hungarian/errmsg.txt: New error message added sql/share/italian/errmsg.txt: New error message added sql/share/japanese/errmsg.txt: New error message added sql/share/korean/errmsg.txt: New error message added sql/share/norwegian-ny/errmsg.txt: New error message added sql/share/norwegian/errmsg.txt: New error message added sql/share/polish/errmsg.txt: New error message added sql/share/portuguese/errmsg.txt: New error message added sql/share/romanian/errmsg.txt: New error message added sql/share/russian/errmsg.txt: New error message added sql/share/slovak/errmsg.txt: New error message added sql/share/spanish/errmsg.txt: New error message added sql/share/swedish/errmsg.txt: New error message added sql/share/ukrainian/errmsg.txt: New error message added sql/sql_table.cc: FULLTEXT checks fixed sql/violite.c: FreeBSD fix
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/czech/errmsg.txt1
-rw-r--r--sql/share/danish/errmsg.txt1
-rw-r--r--sql/share/dutch/errmsg.txt1
-rw-r--r--sql/share/english/errmsg.txt1
-rw-r--r--sql/share/estonian/errmsg.txt1
-rw-r--r--sql/share/french/errmsg.txt1
-rw-r--r--sql/share/german/errmsg.txt1
-rw-r--r--sql/share/greek/errmsg.txt1
-rw-r--r--sql/share/hungarian/errmsg.txt1
-rw-r--r--sql/share/italian/errmsg.txt1
-rw-r--r--sql/share/japanese/errmsg.txt1
-rw-r--r--sql/share/korean/errmsg.txt1
-rw-r--r--sql/share/norwegian-ny/errmsg.txt1
-rw-r--r--sql/share/norwegian/errmsg.txt1
-rw-r--r--sql/share/polish/errmsg.txt1
-rw-r--r--sql/share/portuguese/errmsg.txt1
-rw-r--r--sql/share/romanian/errmsg.txt1
-rw-r--r--sql/share/russian/errmsg.txt1
-rw-r--r--sql/share/slovak/errmsg.txt1
-rw-r--r--sql/share/spanish/errmsg.txt1
-rw-r--r--sql/share/swedish/errmsg.txt1
-rw-r--r--sql/share/ukrainian/errmsg.txt1
22 files changed, 22 insertions, 0 deletions
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 9d514d26fce..200eea5f0c4 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -224,3 +224,4 @@
"%-.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",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 4247feb7ed4..4a92507320f 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -218,3 +218,4 @@
"%-.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",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index ff8c729f445..a9d6f3f7e60 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -219,3 +219,4 @@
"%-.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",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index faded099c2d..dbf0e70d5f9 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -215,3 +215,4 @@
"%-.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",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index ee229cec589..59bde38bc01 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -219,3 +219,4 @@
"%-.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",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index a5719da6d30..e84ee4e6f46 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -215,3 +215,4 @@
"%-.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",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 6181ece9e33..47c3b6541c6 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -218,3 +218,4 @@
"%-.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",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index a81608ab1d8..7bd3d57d573 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -215,3 +215,4 @@
"%-.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",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index e6ffe66ca8e..fd8294d6f18 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -217,3 +217,4 @@
"%-.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",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 9c31c70a733..31f5423c596 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -215,3 +215,4 @@
"%-.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",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index fbf92c0837a..b559f7a715e 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -217,3 +217,4 @@
"%-.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",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index c83aaad8235..99ac9735ff9 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -215,3 +215,4 @@
"%-.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",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index a4f45dcb12a..342bb61a347 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -217,3 +217,4 @@
"%-.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",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index a4ef04c0b1a..808a241a60c 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -217,3 +217,4 @@
"%-.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",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 81a574fdf49..3a22aad3bc3 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -219,3 +219,4 @@
"%-.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",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 46b72025f1e..d869a36c2a1 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -215,3 +215,4 @@
"Não é permitido a %-.32s@%-.64s criar novos usuários",
"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",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 0b2b172811e..379de97401c 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -219,3 +219,4 @@
"%-.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",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 3ab9c76aa6f..037e63a6c32 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -218,3 +218,4 @@
"%-.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",
+"ôÁÂÌÉÃÁ ÄÁÎÎÏÇÏ ÔÉÐÁ ÎÅ ÍÏÖÅÔ ÉÍÅÔØ FULLTEXT ÉÎÄÅËÓÁ",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index d700398c2dc..a1da3d3189d 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -223,3 +223,4 @@
"%-.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",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index c786ccb9ece..c61c3a80ee1 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -216,3 +216,4 @@
"%-.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",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 9286aba66e4..b0f5471764d 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -215,3 +215,4 @@
"%-.32s@%-.64s har inte rättigheter att skapa nya användare",
"Felaktig tabell definition: Alla tabeller i en MERGE tabell måste vara i samma databas",
"Fick 'DEADLOCK' vid låsförsök av block/rad; Försök att starta om transaktionen",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 000f3114cda..1a2eb0b0d4b 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -220,3 +220,4 @@
"ëÏÒÉÓÔÕ×ÁÞÕ %-.32s@%-.64s ÎÅ ÄÏÚ×ÏÌÅÎÏ ÓÔ×ÏÒÀ×ÁÔÉ ÎÏ×ÉÈ ËÏÒÉÓÔÕ×ÁÞ¦×",
"Incorrect table definition; All MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
+"÷ÉËÏÒÉÓÔÁÎÉÊ ÔÉÐ ÔÁÂÌÉæ ΊЦÄÔÒÉÍÕ¤ FULLTEXT ¦ÎÄÅËÓ¦×",