diff options
| author | unknown <wax@kishkin.ru> | 2003-04-02 19:16:19 +0600 |
|---|---|---|
| committer | unknown <wax@kishkin.ru> | 2003-04-02 19:16:19 +0600 |
| commit | 6adb27c65a67db47d91600455f0994772a74f1e1 (patch) | |
| tree | 643f418f7f7ee95d9a5ffb9bbec2ba4ccc5dd11b /sql/share/english | |
| parent | aee0d02abdae17a6c24dd2aa0fe9a82bafc78fd8 (diff) | |
| download | mariadb-git-6adb27c65a67db47d91600455f0994772a74f1e1.tar.gz | |
resolve new updates group_concat
include/mysqld_error.h:
resolve error message
sql/mysqld.cc:
resolve option
sql/set_var.cc:
resolve variable
sql/share/english/errmsg.txt:
resolve error message
sql/sql_class.h:
resolve
Diffstat (limited to 'sql/share/english')
| -rw-r--r-- | sql/share/english/errmsg.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 1b5d4a23601..8e097b9a44a 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -166,7 +166,7 @@ "Result string is longer than max_allowed_packet", "The used table type doesn't support BLOB/TEXT columns", "The used table type doesn't support AUTO_INCREMENT columns", -"INSERT DELAYED can't be used with table '%-.64s', because it is locked with LOCK TABLES", +"INSERT DELAYED can't be used with table '%-.64s' because it is locked with LOCK TABLES", "Incorrect column name '%-.100s'", "The used table handler can't index column '%-.64s'", "All tables in the MERGE table are not identically defined", @@ -198,7 +198,7 @@ "Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Some non-transactional changed tables couldn't be rolled back", -"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again', +"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again", "This operation cannot be performed with a running slave, run STOP SLAVE first", "This operation requires a running slave, configure slave and do START SLAVE", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO", @@ -250,5 +250,9 @@ "Every derived table must have it's own alias", "Select %u was reduced during optimisation", "Table '%-.64s' from one of SELECT's can not be used in %-.32s" -"Client does not support authentication protocol requested by server. Consider upgrading MySQL client", +"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" +"All parts of a SPATIAL KEY must be NOT NULL" +"COLLATION '%s' is not valid for CHARACTER SET '%s'" +"The slave was already running" +"The slave was already stopped" "%d line(s) was(were) cut by group_concat()" |