Commit 7e2d4d8f authored by monty@tik.mysql.fi's avatar monty@tik.mysql.fi
Browse files

New error messages for MATCH and UNION

parent b13d453d
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -210,9 +210,10 @@
#define ER_READ_ONLY_TRANSACTION 1207
#define ER_DROP_DB_WITH_READ_LOCK 1208
#define ER_CREATE_DB_WITH_READ_LOCK 1209
#define ER_CONNECT_TO_MASTER 1210
#define ER_QUERY_ON_MASTER 1211
#define ER_ERROR_WHEN_EXECUTING_COMMAND 1212
#define ER_WRONG_USAGE 1213
#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1214
#define ER_ERROR_MESSAGES 215
#define ER_WRONG_ARGUMENTS 1210
#define ER_CONNECT_TO_MASTER 1211
#define ER_QUERY_ON_MASTER 1212
#define ER_ERROR_WHEN_EXECUTING_COMMAND 1213
#define ER_WRONG_USAGE 1214
#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1215
#define ER_ERROR_MESSAGES 216
+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@
"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",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
"Error when executing command %s: %-.128s",
+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@
"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",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
"Error when executing command %s: %-.128s",
+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@
"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",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
"Error when executing command %s: %-.128s",
+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@
"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",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
"Error when executing command %s: %-.128s",
Loading