summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysql.test
Commit message (Collapse)AuthorAgeFilesLines
* Updated mtr files to support different compiled in optionsMonty2019-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows one to run the test suite even if any of the following options are changed: - character-set-server - collation-server - join-cache-level - log-basename - max-allowed-packet - optimizer-switch - query-cache-size and query-cache-type - skip-name-resolve - table-definition-cache - table-open-cache - Some innodb options etc Changes: - Don't print out the value of system variables as one can't depend on them to being constants. - Don't set global variables to 'default' as the default may not be the same as the test was started with if there was an additional option file. Instead save original value and reset it at end of test. - Test that depends on the latin1 character set should include default_charset.inc or set the character set to latin1 - Test that depends on the original optimizer switch, should include default_optimizer_switch.inc - Test that depends on the value of a specific system variable should set it in the test (like optimizer_use_condition_selectivity) - Split subselect3.test into subselect3.test and subselect3.inc to make it easier to set and reset system variables. - Added .opt files for test that required specfic options that could be changed by external configuration files. - Fixed result files in rockdsb & tokudb that had not been updated for a while.
* Merge 10.1 into 10.2Marko Mäkelä2019-03-271-0/+6
|\
| * Merge 10.0 into 10.1Marko Mäkelä2019-03-271-0/+6
| |\
| | * Merge 5.5 into 10.0bb-10.0-mergeMarko Mäkelä2019-03-261-0/+6
| | |\
| | | * Fix for MDEV-15538, '-N' Produce html output wrongchriscalender2019-03-221-0/+6
| | | |
* | | | C/C 3.0.9Sergei Golubchik2019-02-061-9/+8
| | | |
* | | | Merge 10.1 into 10.2Marko Mäkelä2019-02-031-0/+23
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Temporarily disable a test for commit 2175bfce3e9da8332f10ab0e0286dc93915533a2 because fixing it in 10.2 requires updating libmariadb.
| * | | Merge 10.1 into 10.1Marko Mäkelä2019-02-021-0/+22
| |\ \ \ |/ / / / | | _ / | | / This is joint work with Oleksandr Byelkin.
| * | Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-0/+22
| |\ \ | | |/
| | * Crude "auto-load-data-local-infile" modemariadb-5.5.63Sergei Golubchik2019-01-271-0/+22
| | | | | | | | | | | | | | | | | | | | | Disable LOAD DATA LOCAL INFILE suport by default and auto-enable it for the duration of one query, if the query string starts with the word "load". In all other cases the application should enable LOAD DATA LOCAL INFILE support explicitly.
* | | MDEV-16220 Do not pass UTF8 to mysql in command line parameters, on WindowsVladislav Vaintroub2018-08-141-4/+1
| | | | | | | | | | | | Moved parts of mysql.test to mysql_not_windows.test
* | | Merge branch '10.0' into 10.1Sergei Golubchik2018-05-191-4/+12
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2018-05-191-4/+12
| |\ \ | | |/
| | * MDEV-16220 MTR - do not pass UTF8 on the command line for mysql client.Vladislav Vaintroub2018-05-181-4/+12
| | | | | | | | | | | | | | | | | | | | | It should work ok on all Unixes, but on Windows ,only worked by accident in the past, with client not being Unicode safe. It stopped working with Visual Studio 2017 15.7 update now.
* | | Merge branch '10.0' into 10.1Sergei Golubchik2017-06-301-0/+30
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2017-06-281-0/+30
| |\ \ | | |/
| | * MDEV-13187 incorrect backslash parsing in clientsSergei Golubchik2017-06-271-0/+15
| | | | | | | | | | | | cover ANSI_QUOTES and NO_BACKSLASH_ESCAPES in mysqltest
| | * MDEV-13187 incorrect backslash parsing in clientsSergei Golubchik2017-06-271-0/+15
| | | | | | | | | | | | don't do backslash escapes inside backticks
* | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-021-0/+8
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2016-10-251-0/+8
| |\ \ | | |/
| | * mysql cli: fix USE command quotingSergei Golubchik2016-10-131-0/+8
| | | | | | | | | | | | | | | | | | * use proper sql quoting rules for USE, while preserving as much of historical behavior as possible * short commands (\u) behave as before
* | | MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be ↵Oleksandr Byelkin2015-09-041-0/+3
| | | | | | | | | | | | stopped with no-zero size)
* | | MDEV-6572 "USE dbname" with a bad sequence erroneously connects to a wrong ↵Alexander Barkov2015-03-161-0/+24
|/ / | | | | | | database
* | merge 5.5 -> 10.0-baseunknown2013-08-201-0/+5
|\ \ | |/
| * mysql --skip-column-names flag should not affect alignment of field values,Sergei Golubchik2013-08-081-0/+5
| | | | | | | | | | | | set num_flag[] unconditionally, not under "if (column_names)" http://ronaldbradford.com/blog/unexplained-trivial-mysql-behavior-2013-08-02/
| * 5.3 merge.Sergei Golubchik2013-05-201-1/+1
| |\ | | | | | | | | | change maria.distinct to use a function that doesn't require ssl-enabled builds
| | * 5.2 mergeSergei Golubchik2013-05-201-1/+1
| | |\
| | | * MDEV-4280: Assertion `empty_size == empty_size_on_page' failure in ↵Michael Widenius2013-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ma_blockrec.c or ER_NOT_KEYFILE on query with DISTINCT and GROUP BY This could happen when using Aria for internal temporary files (default case) and using DISTINCT. _ma_scan_restore_block_record() didn't work correctly if there was rows inserted, updated or deleted on the handler between calls to _ma_scan_remember_block_record() and _ma_scan_restore_block_record(). The effect was that some DISTINCT queries that used remove_dup_with_compare() could fail. .bzrignore: Ignore sql_yacc.hh mysql-test/suite/maria/r/distinct.result: Test case for MDEV-4280 mysql-test/suite/maria/t/distinct.test: Test case for MDEV-4280 mysql-test/t/mysql.test: Fixed test suite (we could get error -1 in some cases) sql/sql_select.cc: Break loop if restart_rnd_next() gives an error storage/maria/ha_maria.cc: scan_restore_pos() can return disk fault error. storage/maria/ma_blockrec.c: _ma_scan_remember_block_record() did incorrectly update scan.dir instead of scan_save.dir . _ma_scan_restore_block_record() didn't work correctly if there was rows inserted,updated or deleted on the handler between calls to _ma_scan_remember_block_record() and _ma_scan_restore_block_record(). Fixed by adding counters for row changes and reading the current scan page if changes had been made. storage/maria/ma_blockrec.h: scan_restore_pos() can return disk fault error. storage/maria/ma_delete.c: Increment row_changes storage/maria/ma_scan.c: scan_restore_pos() can return disk fault error. storage/maria/ma_update.c: Increment row_changes storage/maria/ma_write.c: Increment row_changes storage/maria/maria_def.h: scan_restore_pos() can return disk fault error.
* | | | 5.5 mergeSergei Golubchik2013-03-271-0/+9
|\ \ \ \ | |/ / /
| * | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-0/+9
| |\ \ \
* | \ \ \ 5.5 mergeSergei Golubchik2013-01-291-0/+12
|\ \ \ \ \ | |/ / / /
| * | | | 5.3 mergeSergei Golubchik2013-01-151-0/+12
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 5.2->5.3 mergeSergei Golubchik2013-01-101-0/+12
| | |\ \ \ | | | | |/ | | | |/|
| | | * | mysql-5.1.67 mergeSergei Golubchik2013-01-091-0/+12
| | | |\ \
* | | | | | Fixed build failures found by buildbotMichael Widenius2012-06-051-6/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added suppression of warnings - Fixed some test cases BUILD/FINISH.sh: Added AM_EXTRA_MAKEFLAGS BUILD/SETUP.sh: Added option --extra-makeflags client/mysqldump.c: Added suppression mysql-test/r/mysql.result: Updated results mysql-test/r/mysql_upgrade.result: Updated results mysql-test/r/partition_innodb_plugin.result: Updated results mysql-test/r/partition_open_files_limit.result: Updated results mysql-test/r/symlink.result: Updated results mysql-test/suite/innodb/r/innodb-create-options.result: Updated results mysql-test/suite/innodb/t/innodb-create-options.test: Don't print error message (as it's varies on different system) mysql-test/t/mysql.test: Don't print error message (as it's varies on different system) mysql-test/t/mysql_upgrade.test: Fixed checking of error number mysql-test/t/partition_innodb_plugin.test: Don't print error message (as it's varies on different system) plugin/semisync/semisync_master.cc: Added suppression sql/ha_partition.cc: Added suppression sql/item_subselect.cc: Added suppression sql/multi_range_read.cc: Added suppression sql/sql_parse.cc: Added suppression sql/sql_select.cc: Added suppression storage/innobase/handler/ha_innodb.cc: Removed not used variable storage/maria/ma_delete.c: Added suppression storage/maria/ma_key_recover.c: Added suppression storage/maria/ma_write.c: Added suppression strings/ctype-ucs2.c: Added suppression support-files/compiler_warnings.supp: Added suppressions unittest/mysys/my_vsnprintf-t.c: Fixed test case with %M to also work on Solaris
* | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+8
|\ \ \ \ \ | |/ / / /
| * | | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with ↵Michael Widenius2011-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | derived_with_keys=on" Honor unique/not unique when creating keys for internal tempory tables. Added new variables to be used to limit how keys are created for internal temporary tables. include/maria.h: Added maria_max_key_length() and maria_max_key_segments() include/myisam.h: Added myisam_max_key_length() and myisam_max_key_segments() mysql-test/r/mysql.result: Drop all used tables mysql-test/r/subselect4.result: Added test case for lp:879939 mysql-test/t/mysql.test: Drop all used tables mysql-test/t/subselect4.test: Added test case for lp:879939 sql/mysql_priv.h: Added internal_tmp_table_max_key_length and internal_tmp_table_max_key_segments to be used to limit how keys for derived tables are created. sql/mysqld.cc: Added internal_tmp_table_max_key_length and internal_tmp_table_max_key_segments to be used to limit how keys for derived tables are created. sql/share/errmsg.txt: Added new error message for internal errors sql/sql_select.cc: Give error if we try to create a wrong key (this error should never happen) Honor unique/not unique when creating keys for internal tempory tables. storage/maria/ha_maria.cc: Added change_table_ptr() to ensure that external_ref points always to the correct table. (Not having this caused an assert in the included test) storage/maria/ha_maria.h: Added change_table_ptr() to ensure that external_ref points always to the correct table. storage/maria/ma_check.c: Fixed bug in Duplicate key error printing (now row position is printed correctly) storage/maria/ma_create.c: maria_max_key_length() -> _ma_max_key_length() storage/maria/ma_info.c: Added extern function maria_max_key_length() to calculate the max key length based on current block size. storage/maria/ma_open.c: maria_max_key_length() -> _ma_max_key_length() storage/maria/maria_def.h: maria_max_key_length() -> _ma_max_key_length() storage/myisam/ha_myisam.cc: Added change_table_ptr() to ensure that external_ref points always to the correct table. (Not having this caused an assert in the included test) storage/myisam/ha_myisam.h: Added change_table_ptr() to ensure that external_ref points always to the correct table.
| * | | | Added MariaDB executable comment syntax: /*M!##### */Michael Widenius2011-08-291-0/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Don't remove MariaDB executable comments. mysql-test/r/comments.result: Test MariaDB executable comments. mysql-test/r/mysql.result: Test MariaDB executable comments. mysql-test/t/comments.test: Test MariaDB executable comments. mysql-test/t/mysql.test: Test MariaDB executable comments. sql/sql_cache.cc: Don't delete MariaDB executable comments. sql/sql_lex.cc: Handle MariaDB executable comments
| * | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-0/+6
| |\ \ \ | | |/ / | | | | | | | | Moved some BSD string functions from Unireg
| * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-0/+143
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | \ \ \ 5.5-mergeSergei Golubchik2011-07-021-0/+149
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Auto-merge from mysql-5.1 for bug#57450.Dmitry Shulga2011-02-051-0/+6
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fixed bug#57450 - mysql client enter in an infinite loopDmitry Shulga2011-02-051-0/+6
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the standard input is a directory. The problem is that mysql monitor try to read from stdin without checking input source type. The solution is to stop reading data from standard input if a call to read(2) failed. A new test case was added into mysql.test. client/my_readline.h: Data members error and truncated was added to LINE_BUFFER structure. These data members used instead of out parameters in functions batch_readline, intern_read_line. client/mysql.cc: read_and_execute() was modified: set status.exit_status to 1 when the error occured while reading the next command line in non-interactive mode. Also the value of the truncated attribute of structure LINE_BUFF is taken into account only for non-iteractive mode. client/readline.cc: intern_read_line() was modified: cancel reading from input if fill_buffer() returns -1, e.g. if call to read failed. batch_readline was modified: set the error data member of LINE_BUFFER structure to value of my_errno when system error happened during call to my_read/my_realloc. mysql-test/t/mysql.test: Test for bug#57450 was added.
| * | | Merging from mysql-5.1-bugteamNirbhay Choubey2010-12-011-15/+14
| |\ \ \ | | |/ /
| | * | Additional fix for bug#54899Nirbhay Choubey2010-12-011-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the testcase to use the database name as connected_db instead of 'test' database. mysql-test/r/mysql.result: Additional fix in the test for bug#54899. mysql-test/t/mysql.test: Additional fix in the test for bug#54899.
| * | | Merging from mysql-5.1-bugteamAlexander Barkov2010-11-261-0/+144
| |\ \ \ | | |/ /
| | * | Bug #54899 : --one-database option cannot handle DROP/CREATE DATABASE commandsNirbhay Choubey2010-11-261-0/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After dropping and recreating the database specified along with --one-database option at command line, mysql client keeps filtering the statements even after the execution of a 'USE' command on the same database. --one-database option enables the filtering of statements when the current database is not the one specified at the command line. However, when the same database is dropped and recreated the variable (current_db) that holds the inital database name gets altered. This bug exploits the fact that current_db initially gets set to null value (0) when a 'use db_name' follows the recreation of same database db_name (speficied at the command line) and hence skip_updates gets set to 1, which inturn triggers the further filtering of statements. Fixed by making get_current_db() a no-op function when one_database is set, and hence, under that condition current_db will not get altered. Note, however the value of current_db can change when we execute 'connect' command with a differnet database to reconnect to the server, in which case, the behavior of --one-database will be formulated using this new database. client/mysql.cc: Bug #54899 : --one-database option cannot handle DROP/CREATE DATABASE commands Added an if statement at the beginnning of get_current_db() , which makes it a no-op function if one-database option is specified, and hence current_db remains unchanged. Changed the help message for one-database option to a more appropriate message as specified in mysql documentation. mysql-test/r/mysql.result: Added a test case for bug#54899 and some more test cases to check other one-database option related behaviors. mysql-test/t/mysql.test: Added a test case for bug#54899 and some more test cases to check other one-database option related behaviors.
* | | | merge.Sergei Golubchik2010-11-251-0/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | checkpoint. does not compile.
| * | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-1/+6
| |\ \ \ | | | |/ | | |/|
| * | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-4/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Marked a couple of tests with --big - Fixed xtradb/handler/ha_innodb.cc to call explain_filename() storage/xtradb/handler/ha_innodb.cc: Call explain_filename() to get proper names for partitioned tables
View Lorry Controller Status