Fix error messages

mysqltest now also writes failed error messages to log


Docs/manual.texi:
  Applied changes missed in last merge
client/mysqltest.c:
  Write failed error messages to log.
  Remove space from start of line when doing 'eval'
mysql-test/include/master-slave.inc:
  Fixed after adding output of error messages to mysqltest
mysql-test/r/alter_table.result:
  Removed wrong space
mysql-test/r/rpl000001.result:
  Removed wrong space
mysql-test/r/rpl000003.result:
  Fixed after adding output of error messages to mysqltest
mysql-test/r/rpl000015.result:
  Removed wrong space
mysql-test/r/rpl000016.result:
  Removed wrong space
mysql-test/t/drop.test:
  Change error numbers
mysql-test/t/union.test:
  Change error numbers
sql/share/czech/errmsg.txt:
  Fix error messages
sql/share/danish/errmsg.txt:
  Fix error messages
sql/share/english/errmsg.txt:
  Fix error messages
sql/share/french/errmsg.txt:
  Fix error messages
sql/share/german/errmsg.txt:
  Fix error messages
sql/share/greek/errmsg.txt:
  Fix error messages
sql/share/hungarian/errmsg.txt:
  Fix error messages
sql/share/italian/errmsg.txt:
  Fix error messages
sql/share/japanese/errmsg.txt:
  Fix error messages
sql/share/korean/errmsg.txt:
  Fix error messages
sql/share/norwegian-ny/errmsg.txt:
  Fix error messages
sql/share/norwegian/errmsg.txt:
  Fix error messages
sql/share/polish/errmsg.txt:
  Fix error messages
sql/share/portuguese/errmsg.txt:
  Fix error messages
sql/share/romanian/errmsg.txt:
  Fix error messages
sql/share/slovak/errmsg.txt:
  Fix error messages
sql/share/spanish/errmsg.txt:
  Fix error messages
sql/share/swedish/errmsg.txt:
  Fix error messages
sql/share/ukrainian/errmsg.txt:
  Fix error messages

19 files changed, 1 insertions, 20 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index cf63e2fdb49..c78da67f3de 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -236,4 +236,3 @@
 "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 a3e85d83a94..9a7dffb4ae2 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -230,4 +230,3 @@
 "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 034e07516c0..50cc4095038 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -227,4 +227,3 @@
 "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 5cf4f962c0e..11f70c7a997 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -227,4 +227,3 @@
 "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 7f4c505fead..f277a4f08e8 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -230,4 +230,3 @@
 "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 b28930a489a..f36f2db98cf 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -227,4 +227,3 @@
 "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 abf19b405f8..2609e33a419 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -229,4 +229,3 @@
 "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 5227fc19253..df091f9549e 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -227,4 +227,3 @@
 "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 2251e4e73f4..f4d0e6069e4 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -229,4 +229,3 @@
 "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 184c5e1ab06..d58c3db406e 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -227,4 +227,3 @@
 "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 85072824cdc..b96e9a53e10 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -229,4 +229,3 @@
 "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 e1def8c5a2f..bf2afdb1c9b 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -229,4 +229,3 @@
 "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 84e1f14e50b..69a619045e5 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -231,4 +231,3 @@
 "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 8d485b53013..964c399628f 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -227,4 +227,3 @@
 "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 0f69b79654e..9fa6ceebaa4 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -231,4 +231,3 @@
 "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/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 485e9138966..6814a34ef2f 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -235,4 +235,3 @@
 "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 2a296b19ff3..0f2b963b902 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -228,4 +228,3 @@
 "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 193ff96ec30..53ab39f1544 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -227,4 +227,3 @@
 "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 7de980ef89e..b2dfd1c887f 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -220,7 +220,7 @@
 "ëÏÒÉÓÔÕ×ÁÞÕ %-.32s@%-.64s ÎÅ ÄÏÚ×ÏÌÅÎÏ ÓÔ×ÏÒÀ×ÁÔÉ ÎÏ×ÉÈ ËÏÒÉÓÔÕ×ÁÞ¦×",
 "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",
+"÷ÉËÏÒÉÓÔÁÎÉÊ ÔÉÐ ÔÁÂÌÉæ ΊЦÄÔÒÉÍÕ¤ FULLTEXT ¦ÎÄÅËÓ¦×",
 "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",
@@ -232,4 +232,3 @@
 "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 ¦ÎÄÅËÓ¦×",