summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Collapse)AuthorAgeFilesLines
* Dependency of tests from ulong size removed.unknown2012-04-192-30/+0
|
* MDEV-220 MariaDB server 5.5 GA candidate has default storage engine MyISAMSergei Golubchik2012-04-191-0/+2
|
* mysql 5.5.23 mergeSergei Golubchik2012-04-102-13/+28
|\
| * merge from mysql-5.1Mattias Jonsson2012-02-291-13/+25
| |\
| | * merge into mysql-5.1Mattias Jonsson2012-02-291-13/+25
| | |\
| | | * Bug#11761296: 53775: QUERY ON PARTITIONED TABLE RETURNS CACHEDMattias Jonsson2012-02-201-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RESULT FROM PREVIOUS TRANSACTION The current Query Cache API is not fully compatible with the partitioning engine. There is no good way to implement support for QC due to: 1) a static callback for ha_partition would need to have access to all partition names and call the underlying callback for each [sub]partition with the correct name. 2) pruning would be impossible, even if one used the ulonglong engine_data due to if engine_data is changed, the table is invalidated by the QC. So the only viable solution to avoid incorrect data is to not allow caching of queries using partitioned tables. (There are some extra changes, due to removal of \r as line break)
| * | | BUG#13333431 - INCORRECT DEFAULT PORT IN 'SHOW SLAVE HOSTS' OUTPUTManish Kumar2012-02-281-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem - The default port number shown in SHOW SLAVE HOSTS is always 3306 though the slave is actually listening on a different port number. This is a problem as the user can not be sure whether this port value can be trusted and so client trying to read replication topology can get confused. Fix - 3306 ceases to be the default value of report-port. Moreover report-port does not have a static default any longer. Instead we initialize report-port to 0 as the new default value and change it based on two checks : 1) If report_port is not set, the slave reports the port number its listening on. (i.e. if report-port is not set we get the actual value of the slave's port number). 2) If report-port is set, we show the value report-port is set to, as the slave's port number. mysql-test/include/show_slave_hosts.inc: A .inc file is added to use show slave hosts in the new test added. mysql-test/r/mysqld--help-notwin.result: Updated the result file to show the default value passed for report-port. mysql-test/suite/rpl/r/rpl_report_port.result: The result file for the new test that is added. mysql-test/suite/rpl/r/rpl_show_slave_hosts.result: Updated the result file to show the default value passed for report-port. mysql-test/suite/rpl/t/rpl_report_port-slave.opt: Option file for the new test added. mysql-test/suite/rpl/t/rpl_report_port.test: Added a test to check the correct functionality of report-port. We check this by running the replication twice. In the first run we do not set the value of report-port through the opt file and get the actual port number of the slave's port. We then restart the server with report-port set to some value (in this case 9000) and check the value reported for the slave's port number. mysql-test/suite/sys_vars/t/report_port_basic.test: Update the test file to show the value for report-port. It is replaced with SLAVE_PORT as the actual value of the report-port will change with each run. sql/mysqld.cc: Changed the value reported by report port : 1. If the value for report-port is not set we assign report-port to be the actual port number of the slave (mysqld_port). 2. If report-port is set we get the value set for the report-port. sql/sys_vars.cc: Passed 0 as the default value of the report-port.
| | * | | BUG#12969301 : mysql_plugin: enable is ignored if plugin existsunknown2011-12-151-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the mechanism by which the client enables a plugin. Instead of using INSERT IGNORE to reload a plugin library, it now uses REPLACE INTO. This allows users to load a library multiple times replacing the existing values in the mysql.plugin table. This allows users to replace the symbol reference to a different dl name in the table. Thus permitting enabling of multiple versions of the same library without first disabling the old version. A regression test was added to ensure this feature works.
* | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-282-1/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/innodb/t/group_commit_crash.test: remove autoincrement to avoid rbr being used for insert ... select mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test: remove autoincrement to avoid rbr being used for insert ... select mysys/my_addr_resolve.c: a pointer to a buffer is returned to the caller -> the buffer cannot be on the stack mysys/stacktrace.c: my_vsnprintf() is ok here, in 5.5
| * | | | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Updated/added copyright headersKent Boortz2012-02-151-1/+1
| | |\ \ \ | | | |_|/ | | |/| |
| * | | | BUG#11754145: Failing test cases. Patch to correct the test case.Ashish Agarwal2012-02-051-4/+4
| | | | |
| * | | | BUG#11754145: One of the test was failing. Patch to fix the testAshish Agarwal2012-02-032-8/+8
| | | | |
* | | | | merge with mysql-5.5.21Sergei Golubchik2012-03-094-27/+56
|\ \ \ \ \ | |/ / / /
| * | | | Merge with main for BUG#12969301unknown2012-01-307-31/+51
| |\ \ \ \
| | * | | | BUG#12364404 - UNDETERMINISTIC WAIT LOOP IN WAIT_FOR_NDB_TO_BINLOG.INCNuno Carvalho2012-01-231-27/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wait_for_ndb_to_binlog.inc include file used by the blow rpl_tests common for rpl and rpl_ndb suite is simply doing a "sleep 5", this is not deterministic and wastes lot of test time uneccessarily. The test should be rewritten to check if the condition it wait for has been reached or not. For NDB engine all events will be added by NDB injector so tests only can continue after injector is ready, this test waits for proper injector thread state.
| | * | | | Addendum to the fix for bug #11754014Georgi Kodinov2012-01-204-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed the checks to properly check for plugin_dir containing a trailing slash or backslash. - Fixed a under-configuration in udf_skip_grants that was preventing the test from running even when there was a udf plugin.
| | * | | | BUG#13050593 - BACKSLASH SWALLOWED BY INCLUDE/SHOW_SLAVE_STATUS.INCNuno Carvalho2012-01-192-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an error message contains '\' backslash it is displayed correctly through show-slave-status or query_get_value(SHOW SLAVE STATUS, Last_IO_Error, 1);. But when SELECT REPLACE(...) is applied backslash is escaped resulting in a different test output. Disabled backslash escape on show_slave_status.inc and replaced '\' for '/' using replace_regex function in order to achieve the same test output when different path separators are used.
| | * | | | Followup after 13055685:Bjorn Munch2012-01-042-0/+10
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Use new syntax to mask different error output in affected tests
| * | | | BUG#12969301 : mysql_plugin: enable is ignored if plugin existsunknown2012-01-241-0/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the mechanism by which the client enables a plugin. Instead of using INSERT IGNORE to reload a plugin library, it now uses REPLACE INTO. This allows users to load a library multiple times replacing the existing values in the mysql.plugin table. This allows users to replace the symbol reference to a different dl name in the table. Thus permitting enabling of multiple versions of the same library without first disabling the old version. A regression test was added to ensure this feature works.
* | | | updates after writing https://kb.askmonty.org/en/mysql-test-auxiliary-filesSergei Golubchik2012-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/README.suites: removed. it was turned into a manual, eventually mysql-test/include/default_mysqld.cnf: use normal environment variables instead of magic @OPT.vardir mysql-test/lib/My/ConfigFactory.pm: use normal environment variables instead of magic @OPT.vardir mysql-test/mysql-test-run.pl: initialize environment variables before parsing the first my.cnf template - it may refer to them mysql-test/suite/sphinx/my.cnf: use normal environment variables instead of magic @OPT.vardir
* | | | MergeIgor Babaev2012-03-021-0/+4
|\ \ \ \
| * | | | misc test/result fixesSergei Golubchik2012-03-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/include/rpl_udf.inc: supppression should be added after master-slave.inc to affect both a master and a slave mysql-test/suite/rpl/t/rpl_udf.test: supppression should be added after master-slave.inc to affect both a master and a slave
* | | | | Merge MWL #247 from mariadb 5.3 -> mariadb 5.5.Igor Babaev2012-03-021-0/+8997
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge.Igor Babaev2012-02-223-2/+24
| |\ \ \ \
| * \ \ \ \ Merged MWL#247 into the latest 5.3.Igor Babaev2011-12-311-0/+8997
| |\ \ \ \ \
| | * | | | | Implementation of the MWL#247: Make the optimizer use extended keys.Igor Babaev2011-12-311-0/+8997
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main patch. .
* | | | | | | misc test/result fixesSergei Golubchik2012-03-012-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/include/have_xtradb.combinations: xtradb tests need this I_S table mysql-test/lib/mtr_cases.pm: fix for .deb and .rpm installations
* | | | | | | pbxt suite is now a main-pbxt overlaySergei Golubchik2012-02-293-5/+3
| | | | | | |
* | | | | | | instead of having win/notwin tests that only differ in results,Sergei Golubchik2012-02-233-58/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use one test with two combinations (win/unix), where only one is enabled. Apply this technique to mysqld--help.
* | | | | | | don't even try to run xtradb-only tests with innodb, use ↵Sergei Golubchik2012-02-233-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | have_xtradb.combinations.
* | | | | | | remove few .require files and one duplicate have_*inc file.Sergei Golubchik2012-02-233-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | move variable tests from main to sys-vars
* | | | | | | overlay support for mysql-test-run and mysqltestSergei Golubchik2012-02-239-8/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test-run auto-disables all optional plugins. mysql-test/include/default_client.cnf: no @OPT.plugindir anymore mysql-test/include/default_mysqld.cnf: don't disable plugins manually - mtr can do it better mysql-test/suite/innodb/t/innodb_bug47167.test: mtr now uses suite-dir as an include path mysql-test/suite/innodb/t/innodb_file_format.test: mtr now uses suite-dir as an include path mysql-test/t/partition_binlog.test: this test uses partitions storage/example/mysql-test/mtr/t/source.result: update results. as mysqltest includes the correct overlayed include storage/innobase/handler/ha_innodb.cc: the assert is wrong
* | | | | | | allow suite.pm to skip combinations that originate from test/include files.Sergei Golubchik2012-02-073-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage/innobase/handler/handler0alter.cc: for NEWDATE key_type says unsigned, thus col->prtype says unsigned, but field->flags says signed. Use the same flag for value retrieval that was used for value storage.
* | | | | | | per-file combinationsSergei Golubchik2012-02-061-0/+8
| | | | | | |
* | | | | | | move --secure-file-priv from hardcoded to a template. remove redundant suite.optSergei Golubchik2012-02-061-0/+1
| | | | | | |
* | | | | | | remove few obscure, unused, or misused mtr featuresSergei Golubchik2012-02-064-50/+0
| | | | | | |
* | | | | | | merge 5.5Vladislav Vaintroub2012-02-271-0/+22
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 5.3 mergeSergei Golubchik2012-02-241-3/+3
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Changed names of statistic variables and counting matches instaed of ↵unknown2012-02-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rejected rows.
| * | | | | | | 5.3 mergeSergei Golubchik2012-02-211-0/+22
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Counters for Index Condition Pushdown added (MDEV-130).unknown2012-02-161-0/+22
| | | | | | | |
* | | | | | | | merge from 5.5Vladislav Vaintroub2012-02-161-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 5.3.4 mergeSergei Golubchik2012-02-151-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.Igor Babaev2012-02-012-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Fixed compiler and test failures found by buildbotMichael Widenius2012-01-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Added testing of STRNDUP (not found on solaris) mysql-test/include/wait_until_connected_again.inc: Also test for error 2005 (can happen on windows) mysql-test/include/wait_until_disconnected.inc: Also test for error 2005 (can happen on windows) mysql-test/suite/innodb_plugin/r/innodb_bug30423.result: Number of rows is not stable (found difference on Solaris) mysql-test/suite/innodb_plugin/t/innodb_bug30423.test: Number of rows is not stable (found difference on Solaris) plugin/auth_pam/auth_pam.c: Use internal strndup if it doesn't exist on system (solaris) Changed code so that it should also compile on solaris.
* | | | | | | | mergeVladislav Vaintroub2012-01-262-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix a few failing tests on win2008r2-vs2010-amd64-debugVladislav Vaintroub2012-01-261-1/+1
| | | | | | | |
| * | | | | | | Don't crash with: UPDATE performance_schema.setup_instruments SET ENABLED="NO";Michael Widenius2012-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't log updates to performance schema in replication log. Ensure that we don't call ha_update after ha_index_or_rnd_end() is called on slave. .bzrignore: Ignore some generated files mysql-test/include/show_slave_status.inc: Ensure that ./ is removed from file names mysql-test/suite/perfschema/r/binlog_mix.result: Updated results mysql-test/suite/perfschema/r/binlog_row.result: Updated results mysql-test/suite/perfschema/r/binlog_stmt.result: Updated results mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result: Updated results mysql-test/suite/rpl/r/rpl_performance_schema.result: Ensure that we don't crash slave when we update performance schema mysql-test/suite/rpl/t/rpl_performance_schema.test: Ensure that we don't crash slave when we update performance schema sql/log_event.cc: Ensure that we don't call ha_update after ha_index_or_rnd_end() is called. Remove old code that is not needed anymore (like restarting read loop over all rows if no matcing row is found) Simplify code sql/log_event_old.cc: Ensure that we don't call ha_update after ha_index_or_rnd_end() is called. storage/myisam/ha_myisam.cc: More DBUG_PRINT storage/perfschema/ha_perfschema.h: Don't log updates to performance schema in replication log.
* | | | | | | | further reduce diffs to 5.5, monty reviewVladislav Vaintroub2012-01-241-1/+1
| | | | | | | |
View Lorry Controller Status