diff options
author | unknown <monty@mashka.mysql.fi> | 2002-12-20 14:58:27 +0200 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-12-20 14:58:27 +0200 |
commit | 791e9fb37ea10f3e91e56e15c869906d90313c06 (patch) | |
tree | 1cf172e757bfa6aca7ae5af20ed7b0c727016120 /Docs | |
parent | 172d5acb6d2fc29517a70e069ae89ea67951555c (diff) | |
download | mariadb-git-791e9fb37ea10f3e91e56e15c869906d90313c06.tar.gz |
Changed thd variables max_join_size and select_limit to type ha_rows.
This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug
Docs/mysqld_error.txt:
Added new error message
acinclude.m4:
Fix for configure problem on OpenUnix
configure.in:
Fix for OpenUnix
Added C and C++ versions to mysqlbug
mysql-test/r/variables.result:
Update of max_join_size handling
mysql-test/t/variables.test:
Update of max_join_size handling
mysys/Makefile.am:
Removed duplicate row
mysys/my_alloc.c:
Safety fixes (not fatal)
scripts/Makefile.am:
Added C and C++ compiler versions to mysqlbug
scripts/mysqlbug.sh:
Added C and C++ compiler versions to mysqlbug
sql/item_func.cc:
Fixed that user variables that changes are not threated as constants.
sql/item_func.h:
Fixed that user variables that changes are not threated as constants.
sql/mysqld.cc:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/repl_failsafe.cc:
Removed not needed cast
sql/set_var.cc:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/set_var.h:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/slave.cc:
Removed not needed cast
sql/sql_class.h:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/sql_parse.cc:
Removed not needed cast
Fixed security problem with mysql_drop_db()
sql/sql_show.cc:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/structs.h:
Changed thd variables max_join_size and select_limit to type ha_rows
Diffstat (limited to 'Docs')
-rw-r--r-- | Docs/mysqld_error.txt | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/Docs/mysqld_error.txt b/Docs/mysqld_error.txt index db663e3d1f5..aeb3a12c263 100644 --- a/Docs/mysqld_error.txt +++ b/Docs/mysqld_error.txt @@ -300,7 +300,7 @@ #define ER_NOT_ALLOWED_COMMAND 1148 "The used command is not allowed with this MySQL version", #define ER_SYNTAX_ERROR 1149 -"You have an error in your SQL syntax", +"You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use", #define ER_DELAYED_CANT_CHANGE_LOCK 1150 "Delayed insert thread couldn't get requested lock for table %-.64s", #define ER_TOO_MANY_DELAYED_THREADS 1151 @@ -358,7 +358,7 @@ #define ER_CHECK_NO_SUCH_TABLE 1177 "Can't open table", #define ER_CHECK_NOT_IMPLEMENTED 1178 -"The handler for the table doesn't support check/repair", +"The handler for the table doesn't support %s", #define ER_CANT_DO_THIS_DURING_AN_TRANSACTION 1179 "You are not allowed to execute this command in a transaction", #define ER_ERROR_DURING_COMMIT 1180 @@ -454,4 +454,24 @@ #define ER_DUP_ARGUMENT 1225 "Option '%s' used twice in statement", #define ER_USER_LIMIT_REACHED 1226 -"User '%-64s' has exceeded the '%s' resource (current value: %ld)", +"User '%-.64s' has exceeded the '%s' resource (current value: %ld)", +#define ER_SPECIFIC_ACCESS_DENIED_ERROR 1227 +"Access denied. You need the %-.128s privilege for this operation", +#define ER_LOCAL_VARIABLE 1228 +"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL", +#define ER_GLOBAL_VARIABLE 1229 +"Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL", +#define ER_NO_DEFAULT 1230 +"Variable '%-.64s' doesn't have a default value", +#define ER_WRONG_VALUE_FOR_VAR 1231 +"Variable '%-.64s' can't be set to the value of '%-.64s'", +#define ER_WRONG_TYPE_FOR_VAR 1232 +"Wrong argument type to variable '%-.64s'", +#define ER_VAR_CANT_BE_READ 1233 +"Variable '%-.64s' can only be set, not read", +#define ER_CANT_USE_OPTION_HERE 1234 +"Wrong usage/placement of '%s'", +#define 1235 +"This version of MySQL doesn't yet support '%s'", +#define ER_MASTER_FATAL_ERROR_READING_BINLOG 1236 +"Got fatal error %d: '%-.128s' from master when reading data from binary log", |