Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/mysql_src/mysql-4.1-clean

include/mysqld_error.h

@@ -319,5 +319,4 @@
 #define ER_INVALID_CHARACTER_STRING 1300
 #define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301
 #define ER_CONFLICTING_DECLARATIONS 1302
-#define ER_NO_CONS_READ_ENGINE 1303
-#define ER_ERROR_MESSAGES 304
+#define ER_ERROR_MESSAGES 303

sql/handler.cc

@@ -786,8 +786,9 @@ int ha_start_consistent_snapshot(THD *thd)
     Same idea as when one wants to CREATE TABLE in one engine which does not
     exist:
   */
-  push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
-               ER_NO_CONS_READ_ENGINE, ER(ER_NO_CONS_READ_ENGINE));
+  push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR,
+               "This MySQL server does not support any "
+               "consistent-read capable storage engine");
   return 0;
 }
 

sql/share/czech/errmsg.txt

@@ -331,4 +331,3 @@ character-set=latin2
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/danish/errmsg.txt

@@ -322,4 +322,3 @@ character-set=latin1
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/dutch/errmsg.txt

@@ -331,4 +331,3 @@ character-set=latin1
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/english/errmsg.txt

@@ -319,4 +319,3 @@ character-set=latin1
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/estonian/errmsg.txt

@@ -324,4 +324,3 @@ character-set=latin7
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/french/errmsg.txt

@@ -319,4 +319,3 @@ character-set=latin1
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/german/errmsg.txt

@@ -332,4 +332,3 @@ character-set=latin1
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/greek/errmsg.txt

@@ -319,4 +319,3 @@ character-set=greek
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/hungarian/errmsg.txt

@@ -324,4 +324,3 @@ character-set=latin2
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/italian/errmsg.txt

@@ -319,4 +319,3 @@ character-set=latin1
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/japanese/errmsg.txt

@@ -323,4 +323,3 @@ character-set=ujis
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/korean/errmsg.txt

@@ -319,4 +319,3 @@ character-set=euckr
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/norwegian-ny/errmsg.txt

@@ -321,4 +321,3 @@ character-set=latin1
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/norwegian/errmsg.txt

@@ -321,4 +321,3 @@ character-set=latin1
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/polish/errmsg.txt

@@ -324,4 +324,3 @@ character-set=latin2
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/portuguese/errmsg.txt

@@ -321,4 +321,3 @@ character-set=latin1
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/romanian/errmsg.txt

@@ -324,4 +324,3 @@ character-set=latin2
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/russian/errmsg.txt

@@ -324,4 +324,3 @@ character-set=koi8r
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/serbian/errmsg.txt

@@ -312,4 +312,3 @@ character-set=cp1250
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/slovak/errmsg.txt

@@ -327,4 +327,3 @@ character-set=latin2
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/spanish/errmsg.txt

@@ -323,4 +323,3 @@ character-set=latin1
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/swedish/errmsg.txt

@@ -319,4 +319,3 @@ character-set=latin1
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"

sql/share/ukrainian/errmsg.txt

@@ -325,4 +325,3 @@ character-set=koi8u
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
 "Conflicting declarations: '%s%s' and '%s%s'"
-"This MySQL server does not support any consistent-read capable storage engine"