Merge mysql.com:/home/pz/mysql/mysql-4.1-root

into mysql.com:/home/pz/mysql/mysql-4.1

sql/share/czech/errmsg.txt

@@ -252,4 +252,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/danish/errmsg.txt

@@ -246,4 +246,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/dutch/errmsg.txt

@@ -254,4 +254,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/english/errmsg.txt

@@ -243,4 +243,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/estonian/errmsg.txt

@@ -248,4 +248,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/french/errmsg.txt

@@ -243,4 +243,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/german/errmsg.txt

@@ -246,4 +246,4 @@
 "Subselect return more than 1 field",
 "Subselect return more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/greek/errmsg.txt

@@ -243,4 +243,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/hungarian/errmsg.txt

@@ -245,4 +245,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/italian/errmsg.txt

@@ -243,4 +243,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/japanese/errmsg.txt

@@ -245,4 +245,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/korean/errmsg.txt

@@ -243,4 +243,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/norwegian-ny/errmsg.txt

@@ -245,4 +245,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/norwegian/errmsg.txt

@@ -245,4 +245,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/polish/errmsg.txt

@@ -247,4 +247,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/portuguese/errmsg.txt

@@ -243,4 +243,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/romanian/errmsg.txt

@@ -247,4 +247,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/russian/errmsg.txt

@@ -246,4 +246,4 @@
 "    ",
 "    ",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/serbian/errmsg.txt

@@ -239,4 +239,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/slovak/errmsg.txt

@@ -251,4 +251,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/spanish/errmsg.txt

@@ -244,4 +244,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/swedish/errmsg.txt

@@ -243,4 +243,4 @@
 "Subselect returns more than 1 field",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/share/ukrainian/errmsg.txt

@@ -248,4 +248,4 @@
 "i  i i 1 ",
 "i  i i 1 ",
 "Unknown prepared statement handler (%ld) given to %s",
-"Corrupt or doesn\'t exist help database",
+"Help database is corrupt or does not exists",
\ No newline at end of file

sql/sql_lex.h

@@ -66,7 +66,7 @@ enum enum_sql_command {
   SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_SHOW_NEW_MASTER, SQLCOM_DO,
   SQLCOM_SHOW_WARNS, SQLCOM_EMPTY_QUERY, SQLCOM_SHOW_ERRORS,
   SQLCOM_SHOW_COLUMN_TYPES, SQLCOM_SHOW_TABLE_TYPES, SQLCOM_SHOW_PRIVILEGES,
-  SQLCOM_END, SQLCOM_HELP,
+  SQLCOM_END, SQLCOM_HELP
 };
 
 enum lex_states