mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
New error messages for MATCH and UNION
This commit is contained in:
parent
329e5f2f35
commit
a8f2c247ec
22 changed files with 28 additions and 6 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -215,6 +215,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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -213,6 +213,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",
|
||||
|
|
|
|||
|
|
@ -211,6 +211,7 @@
|
|||
"I lock di aggiornamento non possono essere acquisiti durante una transazione 'READ UNCOMMITTED'",
|
||||
"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",
|
||||
|
|
|
|||
|
|
@ -213,6 +213,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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -213,6 +213,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",
|
||||
|
|
|
|||
|
|
@ -213,6 +213,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",
|
||||
|
|
|
|||
|
|
@ -215,6 +215,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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -215,6 +215,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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -219,6 +219,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",
|
||||
|
|
|
|||
|
|
@ -212,6 +212,7 @@
|
|||
"Bloqueos de actualización no pueden ser adqueridos durante una transición READ UNCOMMITTED",
|
||||
"DROP DATABASE no permitido mientras un thread está ejerciendo un bloqueo de lectura global",
|
||||
"CREATE DATABASE no permitido mientras un thread está ejerciendo un bloqueo de lectura global",
|
||||
"Wrong arguments to %s",
|
||||
"Error de coneccion a master: %-128s",
|
||||
"Error executando el query en master: %-128%",
|
||||
"Error de %s: %-128%",
|
||||
|
|
|
|||
|
|
@ -211,6 +211,7 @@
|
|||
"Updaterings-lås kan inte göras när man använder READ UNCOMMITTED",
|
||||
"DROP DATABASE är inte tillåtet när man har ett globalt läs-lås",
|
||||
"CREATE DATABASE är inte tillåtet när man har ett globalt läs-lås",
|
||||
"Felaktiga argument till %s",
|
||||
"Fick fel vid anslutning till master: %-.128s",
|
||||
"Fick fel vid utförande av command på mastern: %-.128s",
|
||||
"Fick fel vid utförande av %s: %-.128s",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue