merged

BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/russian/errmsg.txt:
  merged (partially translated)

22 files changed, 29 insertions, 7 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 8d9fda437a5..bd941e9368e 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -232,3 +232,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 81d44de6a87..d4db2409d45 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -226,3 +226,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 68e20deb257..cd37e9c9937 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -229,3 +229,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 5d057c30a0e..e8ca6fa5f57 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -223,3 +223,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 3f9d15c2e4d..c46234a987f 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -227,3 +227,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 7d9c6202c5f..a88e4dc0f1e 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -223,3 +223,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 14bd0f8a042..a0aa5804959 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -226,3 +226,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"Der verwendete Tabellentyp unterstЭtzt keine FULLTEXT-Indexe",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index ab1103a56b4..62c9fb1b010 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -223,3 +223,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 33d51cb0e60..c170ae172ff 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -225,3 +225,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 127a33bbb28..131d4a5e25c 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -223,3 +223,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index e345f462f2a..ba355c03e13 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -225,3 +225,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index dd1d92adf64..39176b1fa13 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -223,3 +223,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"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 bbdf23e4056..d491c138acf 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -225,3 +225,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 6139b1bb700..84e146a78c2 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -225,3 +225,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 39ff72acba1..2eb601c1673 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -227,3 +227,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index a522e792750..c0154648b5e 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -223,3 +223,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 0177ff942a0..f50009f3ad2 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -227,3 +227,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index c6b5c324cad..7d6ac176906 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -208,21 +208,22 @@
 "Не получилось инициализировать структуру master info, проверте persmissions на файле master.info",
 "Не могу создать процесс SLAVE, проверьте системные ресурсы",
 "User %-.64s has already more than 'max_user_connections' active connections",
-"You may only use constant expressions with SET",
+"В SET могут использоваться только константные выражения",
 "Lock wait timeout exceeded",
 "The total number of locks exceeds the lock table size",
 "Update locks cannot be acquired during a READ UNCOMMITTED transaction",
 "DROP DATABASE not allowed while thread is holding global read lock",
 "CREATE DATABASE not allowed while thread is holding global read lock",
-"Wrong arguments to %s",
-"%-.32s@%-.64s is not allowed to create new users",
-"Incorrect table definition; All MERGE tables must be in the same database",
+"Неверный аргумент для %s",
+"%-.32s@%-.64s не имеет права создавать пользователей",
+"Неверное определение таблицы; Все таблицы в MERGE должнв быть из одной базы",
 "Deadlock found when trying to get lock; Try restarting transaction",
 "Error connecting to master: %-.128s",
 "Error running query on master: %-.128s",
-"Error when executing command %s: %-.128s",
-"Wrong usage of %s and %s",
-"The used SELECT statements have a different number of columns",
+"Ошибка во время выполнения %s: %-.128s",
+"Неверное использование %s и %s",
+"Использованные SELECT'ы имеюь разное количество столбцов",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"Таблица данного типа не может иметь FULLTEXT индекса",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 26ca2881212..d01e2db7165 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -231,3 +231,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 8bbf04c9a3d..6e2b238b91a 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -224,3 +224,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index b4303de8619..ee504036d8a 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -223,3 +223,4 @@
 "Kan inte utfЖra kommandot emedan du har ett READ lЕs",
 "Blandning av transaktionella och icke-transaktionella tabeller Дr inaktiverat",
 "Option '%s' anvДndes tvЕ gЕnger",
+"The used table type doesn't support FULLTEXT indexes",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 80c2bcc06fb..2bd3d656ed3 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -228,3 +228,4 @@
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
 "Option '%s' used twice in statement",
+"Використаний тип таблиц╕ не п╕дтриму╓ FULLTEXT ╕ндекс╕в",