summaryrefslogtreecommitdiff
path: root/mysql-test/r/variables.result
Commit message (Collapse)AuthorAgeFilesLines
* Ensure that fields declared with NOT NULL doesn't have DEFAULT values if not ↵Monty2015-08-181-1/+1
| | | | | | | | | | | | | | | | | | specified and if not timestamp or auto_increment In original code, sometimes one got an automatic DEFAULT value in some cases, in other cases not. For example: create table t1 (a int primary key) - No default create table t2 (a int, primary key(a)) - DEFAULT 0 create table t1 SELECT .... - Default for all fields, even if they where defined as NOT NULL ALTER TABLE ... MODIFY could sometimes add an unexpected DEFAULT value. The patch is quite big because we had some many test cases that used CREATE ... SELECT or CREATE ... (...PRIMARY KEY(xxx)) which doesn't have an automatic DEFAULT anymore. Other things: - Removed warnings from InnoDB when waiting from semaphore (got this when testing things with --big)
* - Changed default values of query_prealloc_size and query_alloc_block_sizeMonty2014-12-051-6/+6
| | | | | | so that a simple query with one join would not have to call my_malloc. - Allow lower limites for query_prealloc_size for testing. - Fixed wrong initialization of trans_alloc_block_size
* MDEV-6999 Remove or deprecate unused variablesSergei Golubchik2014-12-041-8/+0
|
* 5.5 mergeSergei Golubchik2014-09-161-0/+9
|\
| * MDEV-6673 I_S.SESSION_VARIABLES shows global valuesSergei Golubchik2014-08-311-0/+9
| | | | | | | | only look at lex->option_type if it's a SHOW command, not a SELECT
* | 5.5.39 mergeSergei Golubchik2014-08-071-0/+4
|\ \ | |/
| * mysql-5.5.39 mergeSergei Golubchik2014-08-021-0/+4
| |\ | | | | | | | | | | | | | | | | | | ~40% bugfixed(*) applied ~40$ bugfixed reverted (incorrect or we're not buggy) ~20% bugfixed applied, despite us being not buggy (*) only changes in the server code, e.g. not cmakefiles
| | * WL#7436: Deprecate and remove timed_mutexes system variable Jon Olav Hauglid2014-06-191-0/+4
| | | | | | | | | | | | | | | | | | This is the 5.5/5.6 version of the patch. Add deprecation warning for timed_mutexes.
* | | MDEV-5851 MySQL WL#5303 Romansh locale for DAYNAME, MONTHNAME, DATE_FORMATAlexander Barkov2014-04-241-5/+5
| | |
* | | Increased back_log to 150, but not more than max_connections.Michael Widenius2013-12-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This was done to get better performance when doing a lot of connections. Ensure that thread_cache_size is not larger than max_connections (trivial optimizations). Fixed that the --host_cache_size=# startup option works mysql-test/r/variables.result: Increase back_log to 150 sql/hostname.cc: Fixed that the --host_cache_size=# startup option works sql/mysqld.cc: Ensure that back_log and thread_cache_size is not set higher than max_connections (as this would not make any sense). sql/sys_vars.cc: Increased back_log to 150
* | | 10.0-base merge.Sergei Golubchik2013-09-211-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Partitioning/InnoDB changes are *not* merged (they'll come from 5.6) TokuDB does not compile (not updated to 10.0 SE API)
| * \ \ merge 5.5 -> 10.0-baseunknown2013-08-201-2/+2
| |\ \ \ | | |/ /
* | | | MDEV-4865 Change related to --log option/variable was merged partiallySergei Golubchik2013-08-131-5/+0
| | | | | | | | | | | | | | | | | | | | Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk (WL#5185 Remove deprecated 5.1 features)
* | | | 10.0-base mergeSergei Golubchik2013-07-181-1/+1
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-07-171-1/+1
| |\ \ \ | | |/ /
| | * | Fixed tests that failed on 32 bit because of my earlier fixes of 32 bit limits.Michael Widenius2013-06-111-1/+1
| | | |
* | | | 10.0-base mergeSergei Golubchik2013-06-061-1/+5
|\ \ \ \ | |/ / / | | | | | | | | (without InnoDB - all InnoDB changes were ignored)
| * | | 5.5 mergeSergei Golubchik2013-06-061-1/+5
| |\ \ \ | | |/ /
| | * | mysql-5.5.31 mergeSergei Golubchik2013-05-071-1/+5
| | |\ \ | | | |/
| | | * Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOTVenkatesh Duggirala2013-01-281-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | PROPERLY QUOTED IN BINLOG FILE Merging fix from mysql-5.1
| | | | * Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOTVenkatesh Duggirala2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PROPERLY QUOTED IN BINLOG FILE Problem: In load data file query, User variables are allowed inside "Into_list" and "Set_list". These user variables used inside these two lists are not properly guarded with backticks while server is writting into binlog. Hence user variable names like a` cannot be used in this context. Fix: Properly quote these variables while writting into binlog mysql-test/r/func_compress.result: changing result file mysql-test/r/variables.result: changing result file mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: changing result file sql/item_func.cc: Quote the user variable items
* | | | | 10.0-base mergeSergei Golubchik2013-04-151-10/+0
|\ \ \ \ \ | |/ / / /
| * | | | create sys_var::val_str(), sys_var::val_int(), sys_var::val_real().Sergei Golubchik2013-04-091-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Item_func_get_system_var::val_xxx functions to use that. mysql-test/t/variables.test: @@GLOBAL.INIT_CONNECT is never NULL anymore. Nor it ever was. It was a bug that empty string system variables appeared as NULL in the *integer context* (but not in a string, real, or decimal context!)
* | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | simplify the handler api - table_type() is no longer abstract, not even virtualSergei Golubchik2012-12-171-2/+2
| |/ / /
* | | | merge with 5.5Sergei Golubchik2012-11-031-2/+2
|\ \ \ \ | |/ / /
| * | | mysql-5.5.28Sergei Golubchik2012-10-161-2/+2
| |\ \ \ | | |/ /
| | * | Bug#14498355: DEPRECATION WARNINGS SHOULD NOT CONTAIN MYSQL VERSIONMartin Hansson2012-08-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NUMBERS If a system variable was declared as deprecated without mention of an alternative, the message would look funny, e.g. for @@delayed_insert_limit: Warning 1287 '@@delayed_insert_limit' is deprecated and will be removed in MySQL . The message was meant to display the version number, but it's not possible to give one when declaring a system variable. The fix does two things: 1) The definition of the message ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT is changed so that it does not display a version number. I.e. in English the message now reads: Warning 1287 The syntax '@@delayed_insert_limit' is deprecated and will be removed in a future version. 2) The message ER_WARN_DEPRECATED_SYNTAX_WITH_VER is discontinued in favor of ER_WARN_DEPRECATED_SYNTAX for system variables. This change was already done in versions 5.6 and above as part of wl#5265. This part is simply back-ported from the worklog.
* | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-141-0/+4
| | | |
* | | | Increased the version number to 10.0Michael Widenius2012-05-311-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed code that was not ready for a major version number > 9 - Fixed test cases that assumed max major version number could be 9 Updated version number for depricated options (will be removed in a later commit) VERSION: Version number 10.0.0 client/mysqlbinlog.cc: Added support for major version numbers > 9 cmake/mysql_version.cmake: Added support for version numbers that is 0 mysql-test/r/comments.result: Modified test to handle version number 100000 mysql-test/r/func_system.result: Modified test to handle version number 100000 mysql-test/r/log_state.result: Updated depricated error message mysql-test/r/sp.result: Modified test to handle version number 100000 mysql-test/r/subselect4.result: Updated depricated error message mysql-test/r/variables.result: Updated depricated error message mysql-test/suite/rpl/r/rpl_conditional_comments.result: Modified test to handle version number 100000 mysql-test/suite/rpl/r/rpl_loaddatalocal.result: Modified test to handle version number 100000 mysql-test/suite/rpl/t/rpl_conditional_comments.test: Modified test to handle version number 100000 mysql-test/suite/rpl/t/rpl_loaddatalocal.test: Modified test to handle version number 100000 mysql-test/suite/sys_vars/r/debug_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/log_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/log_slow_queries_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/multi_range_count_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/sql_big_selects_func.result: Updated depricated error message mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result: Updated depricated error message mysql-test/suite/sys_vars/r/sql_max_join_size_func.result: Updated depricated error message mysql-test/t/comments.test: Modified test to handle version number 100000 mysql-test/t/file_contents.test: Modified test to handle version number 100000 mysql-test/t/func_system.test: Modified test to handle version number 100000 mysql-test/t/parser_not_embedded.test: Modified test to handle version number 100000 mysql-test/t/sp.test: Modified test to handle version number 100000 sql/mysqld.cc: Updated version number for depricated options (will be removed in a later commit) sql/slave.cc: Modified test to handle version number 100000 Better error messages sql/sql_lex.cc: Modified test to handle version number 100000 in comment syntax sql/sys_vars.cc: Updated version number for depricated options (will be removed in a later commit)
* | | pbxt suite is now a main-pbxt overlaySergei Golubchik2012-02-291-4/+4
| | |
* | | 5.3 mergeSergei Golubchik2012-01-131-2/+0
|\ \ \
| * \ \ Merge with 5.2.Michael Widenius2011-12-111-2/+0
| |\ \ \ | | | | | | | | | | | | | | | no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
* | | | | after merge changes:Sergei Golubchik2011-12-121-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rename all debugging related command-line options and variables to start from "debug-", and made them all OFF by default. * replace "MySQL" with "MariaDB" in error messages * "Cast ... converted ... integer to it's ... complement" is now a note, not a warning * @@query_cache_strip_comments now has a session scope, not global.
* | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | Allow one to block an account by using GRANT max_user_connections = -1Michael Widenius2011-09-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One can set @@global.max_user_connections to -1 to block anyone, except SUPER user, to login. If max_user_connection is 0, one can't change it without a restart (needed to get user connections counting to work correctly) mysql-test/r/system_mysql_db.result: Changed max_user_connections to handle negative numbers. mysql-test/r/user_limits-2.result: New test case that one can't change max_user_connection if it was 0 mysql-test/r/user_limits.result: Fixed wrong error messages. mysql-test/r/variables.result: Store / restore max_user_connections (needed as there is now a --master.opt file that changes it) mysql-test/t/subselect_mat_cost-master.opt: Enable slow query log (as this test found some errors in slow query logging) mysql-test/t/user_limits-2.test: New test case that one can't change max_user_connection if it was 0 mysql-test/t/user_limits-master.opt: Set max_user_connections (as one can't change it if it was 0) mysql-test/t/user_limits.test: Test max_user_connections -1 mysql-test/t/variables-master.opt: Set max_user_connections (as one can't change it if it was 0) mysql-test/t/variables.test: Set/restore max_user_connections scripts/Makefile.am: Add a text message to mysql_fix_privilege_tables.sql that it's automaticly generated scripts/mysql_system_tables.sql: Change max_user_connections to signed scripts/mysql_system_tables_fix.sql: Change max_user_connections to signed sql/item_func.cc: Change SHOW_INT to be signed. (Needed for max_user_connections and it's probably a bug that it was not originally signed) sql/log.cc: Remove some code that was not needed (All these variables are reset at start of query) sql/mysql_priv.h: Made max_user_connections signed. Added max_user_connections_checking sql/mysqld.cc: Added max_user_connections_checking so that we know if max_user_connections was 0 at startup (Which means that we will not do connection counting for accounts that don't have user resource limits) Set thd->start_utime at same time as thr_create_utime. (Before start_utime could be < thr_create_utime which lead to wrong query counting) sql/set_var.cc: Don't allow one to change 'max_user_connections' if it was 0 at startup. sql/sql_acl.cc: Change user_connection counting to be negative. sql/sql_connect.cc: If max_user_connections is < 0 then only SUPER user can login. Fixed wrong variable names for error messages. Fixed wrong initial value for questions. Set thd->start_utime and thd->thr_create_utime at startup. Needed to get time_out_user_resource_limits() to work. sql/sql_show.cc: SHOW_INT is now negative sql/sql_yacc.yy: Support negative values for MAX_USER_CONNECTIONS sql/structs.h: Make user connect counting work with signed numbers.
| * | | | Merge with 5.2Michael Widenius2011-09-151-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Increased version numberMichael Widenius2011-09-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give proper error to client on shutdown. configure.in: Increased version number mysql-test/mysql-test-run.pl: Ignore errors that one can get while running with --mysqld=--log-warnings=2 mysql-test/r/variables.result: Remember original value of log_warnings mysql-test/suite/rpl/r/rpl_idempotency.result: Ignore errors that one can get while running with --mysqld=--log-warnings=2 mysql-test/suite/rpl/t/rpl_idempotency.test: Ignore errors that one can get while running with --mysqld=--log-warnings=2 mysql-test/t/variables.test: Remember original value of log_warnings sql/mysqld.cc: Give proper error to close_connection() on shutdown storage/maria/ha_maria.cc: Added missing DBUG_RETURN
* | | | | merge with 5.3Sergei Golubchik2011-10-191-6/+37
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
| * | | | Merge with 5.3 mainMichael Widenius2011-05-161-1/+1
| |\ \ \ \
| * \ \ \ \ Merge with MariaDB 5.2Michael Widenius2011-05-101-0/+52
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-0/+23
| | |\ \ \ | | | | |/ | | | |/| | | | | | Moved some BSD string functions from Unireg
| * | | | Merge with 5.2Michael Widenius2011-03-091-0/+33
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-0/+33
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria" - Fixed wrong assert in Aria Now need to merge with latest xtradb before pushing sql/ha_partition.cc: Ensure that m_ordered_rec_buffer is not freed before close. sql/mysqld.cc: Changed to use opt_stack_trace instead of opt_pstack. Removed references to pstack sql/partition_element.h: Ensure that connect_string is initialized storage/maria/ma_key_recover.c: Fixed wrong assert
| * | | | | MWL #21: "index_merge: non-ROR intersection".Igor Babaev2010-12-011-0/+1
| |/ / / / | | | | | | | | | | | | | | | The second (final) patch.
* | | | | post-merge fixes.Sergei Golubchik2011-07-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | most tests pass. 5.3 merge is next
* | | | | 5.5-mergeSergei Golubchik2011-07-021-0/+77
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | merge mysql-5.1->mysql-5.5Georgi Kodinov2011-03-281-24/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fixed a test failure in embedded because of the fix for BUG#11766769Georgi Kodinov2011-03-281-23/+0
| | | | |
| * | | | 5.1 -> 5.5 mergeSergey Glukhov2011-03-281-0/+16
| |\ \ \ \ | | |/ / /
View Lorry Controller Status