summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysql.test
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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 '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
* | 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
| * | | | MBug#443092: test cases mysql and mysql_upgrade fails with wildcard DNSunknown2009-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When DNS is not working and returns some address even for non-existing host names, some test cases fail with wrong error. Fix by disabling these tests on such systems.
* | | | | mysql.test fixed.Alexey Botchkov2010-08-251-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parts that aren't supposed to work on Windows moved to the separate mysql_not_windows.test.
* | | | | Bug#54466 client 5.5 built from source lacks "pager" supportAlexey Botchkov2010-08-191-0/+6
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #ifdef THREAD removed from mysql.cc. No reason was found for this limitation to persist. per-file comments: client/mysql.cc Bug#54466 client 5.5 built from source lacks "pager" support now we have USE_POPEN always if not __WIN__ mysql-test/r/mysql.result Bug#54466 client 5.5 built from source lacks "pager" support result updated. mysql-test/t/mysql.test Bug#54466 client 5.5 built from source lacks "pager" support test case added.
* | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-241-1/+6
|\ \ \ \
| * \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-231-1/+6
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Conflict adding files to server-tools. Created directory. Conflict because server-tools is not versioned, but has versioned children. Versioned directory. Conflict adding files to server-tools/instance-manager. Created directory. Conflict because server-tools/instance-manager is not versioned, but has versioned children. Versioned directory. Contents conflict in server-tools/instance-manager/instance_map.cc Contents conflict in server-tools/instance-manager/listener.cc Contents conflict in server-tools/instance-manager/options.cc Contents conflict in server-tools/instance-manager/user_map.cc
| | * | | Merge approved bug fixJim Winstead2009-12-171-1/+6
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | The mysql command line client ignored the --skip-column-names optionJim Winstead2009-09-211-0/+5
| | | |/ | | | | | | | | | | | | | | | | | | | | when used in conjunction with --vertical. (Bug #47147, patch by Harrison Fisk)
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-4/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - extra/comp_err.c - mysql-test/collections/default.experimental - mysql-test/r/archive.result - mysql-test/r/select.result - mysql-test/suite/binlog/r/binlog_unsafe.result - mysql-test/suite/binlog/t/binlog_unsafe.test - mysql-test/suite/rpl/t/disabled.def - mysql-test/t/archive.test - mysql-test/t/select.test - sql/item.cc - sql/item.h - sql/item_timefunc.cc - sql/sql_base.cc - sql/sql_delete.cc - sql/sql_load.cc - sql/sql_partition.cc - sql/sql_table.cc - storage/innobase/handler/ha_innodb.cc - vio/vio.c
| * | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-0/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - client/mysqltest.cc - mysql-test/collections/default.experimental - mysql-test/suite/rpl/t/disabled.def - sql/mysqld.cc - sql/opt_range.cc - sql/sp.cc - sql/sql_acl.cc - sql/sql_partition.cc - sql/sql_table.cc
| * | | mergeGeorgi Kodinov2009-11-271-3/+6
| |\ \ \
| | * | | added the missing remove of the temp fileGeorgi Kodinov2009-11-271-0/+1
| | | | |
| * | | | mergeGeorgi Kodinov2009-11-271-1/+4
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Addendum to Bug #27884: fixed test incompatibility on windows.Georgi Kodinov2009-11-271-1/+4
| | | |
| | * | Backport fix for Bug #27884.Jim Winstead2009-11-231-0/+6
| | | |
* | | | Bug#26780: automatic vertical output for wide resultsMagne Mahre2009-11-041-0/+8
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature from Eric Bergen, CLA signed 2007-06-27. Adds new mysql client option "--auto-vertical-output", which causes the client to test whether a result table is too wide for the current window (where available) and emit vertical results in that case. Otherwise, it sends normal tabular results. client/client_priv.h: Add another enum value to client options, for automatic vertical output. client/mysql.cc: Add another command-line option, "auto-vertical-output". Add functions to get the terminal width and functions to get the widths of fields. Use them together to emit vertical output when some output table is too wide to fit in the terminal. If the terminal doesn't support reading its width, then assume 80-positions wide. mysql-test/r/mysql.result: Show that various select statements do work as expected. Wide tables become vertical and narrow ones do not. mysql-test/t/mysql.test: Show that various select statements do work as expected. These should be suitable for a wide range of window capabilities and sizes. Under extreme circumstances, the results could be arbitrary.
* | | WL#751 Error message construction, backportSergey Glukhov2009-10-151-0/+5
|/ /
View Lorry Controller Status