summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Collapse)AuthorAgeFilesLines
* 5.5 mergeSergei Golubchik2013-07-17132-214/+1532
|\
| * Fix for MDEV-4219 A simple select query returns random data (upstream bug#68473)unknown2013-07-172-0/+89
| | | | | | | | | | | | | | | | | | In the case of loose scan used as input for order by, end_send() didn't detect correctly that a loose scan was used, and didn't copy the non-aggregated fields from the temp table used for ORDER BY. The fix uses the fact that the quick select used for sorting is attached to JOIN::pre_sort_join_tab instead of JOIN::join_tab.
| * mysql-5.5.32 mergeSergei Golubchik2013-07-1627-51/+129
| |\
| | * Bug #16632543 - INCORRECT VALUE OF BOGOMIPS IN MYSQLTESTsayantan dutta2013-04-161-2/+2
| | |
| | * BUG#16615117 MYSQLDUMP PRODUCES A CHANGE MASTER STATEMENTVenkatesh Duggirala2013-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WITH A PORT NUMBER ENCLOSED IN QUOTES Problem: mysqldump --dump-slave --include-master-host-port prints the CHANGE MASTER command in the generated logical backup. The PORT number that is generated with this command is a string and should be an integer. Fix: Remove the Enclosed quotes for port number.
| | * Bug #16401597 - MTR V1 RETURNS INCORRECT PATH TO VARIABLE @@BASEDIRsayantan dutta2013-04-041-7/+4
| | |
| | * Bug#11765629 CMAKE: CAN SUPPRESS INSTALLATION OF SQL-BENCH, BUT NOT MYSQL-TESTTor Didriksen2013-04-021-4/+16
| | | | | | | | | | | | | | | | | | Don't try to install anything into INSTALL_MYSQLTESTDIR if it is explicitly set empty on the cmake command line.
| | * Bug#15948818-SEMI-SYNC ENABLED MASTER CRASHES WHEN EVENTVenkatesh Duggirala2013-03-292-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCHEDULER DROPS EVENTS Problem: On a semi sync enabled server (Master/Slave), if event scheduler drops an event after completion, server crashes. Analaysis: If an event is created with "ON COMPLETION NOT PRESERVE" clause, event scheduler deletes the event upon event completion(expiration) and the thread object will be destroyed. In the destructor of the thread object, mysys_var member is set to zero explicitly. Later from the same destructor call(same execution path), incase of semi sync enabled server, while cleanup is called, THD::mysys_var member is accessed by THD::enter_cond() function which causes server to crash. Fix: mysys_var should not be explicitly set to zero and also it is not required. sql/sql_class.cc: mysys_var should not be explicitly set to zero.
| | * Bug #16403186 - MTR ON WINDOWS SHOULD NOT TRY TO START CDB IF RUNNING WITH ↵sayantan dutta2013-03-282-5/+9
| | | | | | | | | | | | PARALLEL
| | * Merge from mysql-5.1 to mysql-5.5Sujatha Sivakumar2013-03-272-2/+2
| | |\
| | | * Bug#11829838: ALTER TABLE NOT BINLOGGED WITHSujatha Sivakumar2013-03-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --BINLOG-IGNORE-DB AND FULLY QUALIFIED TABLE Problem: ======= An ALTER TABLE statement is not written to binlog if server started with "--binlog-ignore-db some database" and 'fully qualified' table names are used in the ALTER TABLE statement altering table different from current database context. Analysis: ======== The above mentioned problem not only affects "ALTER TABLE" statements but also to all kind of statements. Once the current default database becomes "NULL" none of the statements will be binlogged. The current behaviour is such that if the user has specified restrictions on which database needs to be replicated and the default db is not specified, then do not replicate. This means that "NULL" is considered to be equivalent to everything (default db = null implied ignore don't log the statement). Fix: === "NULL" should not be considered as equivalent to everything. Since the filtering criteria is not equal to "NULL" the statement should be logged into binlog. mysql-test/suite/rpl/r/rpl_loaddata_m.result: Earlier when defalut database was "NULL" DROP TABLE was not getting logged. Post this fix it will be logged and the DROP will fail at slave as the table creation was skipped by master as --binlog-ignore-db=test. mysql-test/suite/rpl/t/rpl_loaddata_m.test: Earlier when defalut database was "NULL" DROP TABLE was not getting logged. Post this fix it will be logged and the DROP will fail at slave as the table creation was skipped by master as --binlog-ignore-db=test. sql/rpl_filter.cc: Replaced DBUG_RETURN(0) with DBUG_RETURN(1).
| | * | local merge.Nirbhay Choubey2013-03-222-6/+6
| | |\ \ | | | |/
| | | * Bug#12671635 : Updating embedded tests.Nirbhay Choubey2013-03-222-6/+6
| | | |
| | * | local merge.Nirbhay Choubey2013-03-222-5/+5
| | |\ \ | | | |/
| | | * Bug#12671635 : Fixing test cases.Nirbhay Choubey2013-03-222-5/+5
| | | |
| | | * Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-191-2/+2
| | | |
| | | * Updated/added copyright headers.Murthy Narkedimilli2013-02-258-8/+8
| | | |
| | * | Bug#16500013 : ADD VERSION CHECK TO MYSQL_UPGRADENirbhay Choubey2013-03-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Based on Sinisa's patch) Added a version checking facility to mysql_upgrade. The versions used for checking is the version of the server that mysql_upgrade is going to upgrade and the server version that mysql_upgrade was build/distributed with. Also added an option '--version-check' to enable/disable the version checking.
| | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-193-4/+4
| | | |
| | * | Bug #16076289 : BACKPORT FIX FOR BUG #14786792 TO 5.5Neeraj Bisht2013-03-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Backport the changes for bug#14786792 which is regression of fix for bug#11761854.So backported both changes.
| * | | Automatic mergeSergey Petrunya2013-07-164-0/+95
| |\ \ \
| | * | | MDEV-4782: Valgrind warnings (Conditional jump or move depends on ↵Sergey Petrunya2013-07-164-0/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uninitialised value) with InnoDB, semijoin - in sub_select(): don't call table->file->position() when reading the first record produced an error.
| * | | | Update test results after the last cset.Sergey Petrunya2013-07-161-4/+13
| |/ / /
| * | | MDEV-4778: Incorrect results from Aria/MyISAM SELECT using index with prefix ↵Sergey Petrunya2013-07-167-14/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | length on TEXT column Backport the fix olav.sandstaa@sun.com-20101102184747-qfuntqwj021imy9r: "Fix for Bug#52660 Perf. regr. using ICP for MyISAM on range queries on an index containing TEXT" (together with further fixes in that code) into MyISAM and Aria.
| * | | mdev-4173: Wrong result (extra row) with semijoin=on, joins in outer query, ↵Sergey Petrunya2013-07-163-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LEFT JOIN in the subquery Apply the patch from Patryk Pomykalski: - create_internal_tmp_table_from_heap() will now return information whether the last row that we tried to write was a duplicate row. (mysql-5.6 also has this change)
| * | | MDEV-4042: Assertion `table->key_read == 0' fails in close_thread_table on ↵Sergey Petrunya2013-07-112-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | EXPLAIN MDEV-4536: ...sql/sql_base.cc:1598: bool close_thread_table(THD*, TABLE**): Assertion - Make JOIN::cleanup(full=true) always free join optimization tabs.
| * | | MDEV-4556 Server crashes in SEL_ARG::rb_insert with ↵Sergey Petrunya2013-07-112-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index_merge+index_merge_sort_union, FORCE INDEX - merge_same_index_scans() may put the same SEL_ARG tree in multiple result plans. make it call incr_refs() on the SEL_ARG trees that it does key_or() on, because key_or(sel_arg_tree_1, sel_arg_tree_2) call may invalidate SEL_ARG trees pointed by sel_arg_tree_1 and sel_arg_tree_2.
| * | | Merge from 5.3Alexander Barkov2013-07-108-0/+70
| |\ \ \
| | * \ \ Merge from 5.2Alexander Barkov2013-07-092-0/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: mysql-test/suite/plugins/r/fulltext_plugin.result mysql-test/suite/plugins/t/fulltext_plugin.test plugin/fulltext/plugin_example.c sql/sql_show.cc pending merges: Alexander Barkov 2013-07-09 [merge] Merge from 5.1 Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninst... Sergei Golubchik 2013-05-24 MDEV-4575 MySQL client doesn't strip off...
| | | * \ \ Merge from 5.1Alexander Barkov2013-07-092-0/+8
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: mysql-test/suite/plugins/r/fulltext_plugin.result mysql-test/suite/plugins/t/fulltext_plugin.test plugin/fulltext/plugin_example.c sql/sql_show.cc pending merges: Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninstall ... Sergei Golubchik 2013-05-24 MDEV-4575 MySQL client doesn't strip off...
| | | | * | | Bug #69682 - mysqld crashes after uninstall of plugin with "first" status varSergei Golubchik2013-07-062-0/+8
| | | | | | |
| | * | | | | MDEV-4610 SQL query crashes MariaDB with derived_with_keysSergei Golubchik2013-07-052-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-4643 MariaDB crashes consistently when trying a SELECT on VIEW with a UNION and an additional JOIN in SELECT open derived temp tables *before* trying QUICK_SELECT for them, handler::multi_range_read_info() needs an open table.
| | * | | | | MDEV-4665 crash when referencing missing function in a subquerySergei Golubchik2013-07-052-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | don't ignore the return value fix_fields()
| | * | | | | MDEV-4257 Assertion `!table || (!table->read_set || ↵Sergei Golubchik2013-07-052-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitmap_is_set(table->read_set, field_index))' fails on FROM subquery with fulltext search, derived_merge=on remove emtpty Item_func_match::update_used_tables() method
| * | | | | | Merging from 5.3Alexander Barkov2013-07-0813-37/+58
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: include/my_time.h libmysql/libmysql.c mysql-test/r/adddate_454.result mysql-test/r/cast.result mysql-test/r/date_formats.result mysql-test/r/func_sapdb.result mysql-test/r/func_time.result mysql-test/r/mdev316.result mysql-test/r/parser.result mysql-test/r/partition_datatype.result mysql-test/r/partition_pruning.result mysql-test/r/type_date.result mysql-test/r/type_datetime.result mysql-test/suite/vcol/r/vcol_misc.result mysql-test/t/cast.test sql-common/my_time.c sql/field.cc sql/field_conv.cc sql/filesort.cc sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_func.cc sql/item_strfunc.cc sql/item_timefunc.cc sql/sql_time.cc pending merges: Sergei Golubchik 2013-07-03 MDEV-4667 DATE('string') incompability betwe...
| | * | | | | MDEV-4667 DATE('string') incompability between mysql and mariadbSergei Golubchik2013-07-0311-36/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup: remove TIME_FUZZY_DATE. Introduce TIME_FUZZY_DATES which means "very fuzzy, the resulting value is only used for comparison. It can be invalid date, fine, as long as it can be compared". Updated many tests results (they're better now).
| * | | | | | MDEV-4752: Segfault during parsing of illegal queryunknown2013-07-042-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix of nested join parsing of illegal query.
| * | | | | | MDEV-4718 Test "outfile_loaddata" fails on bigendian arches (ppc64)Sergei Golubchik2013-07-011-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | for field terminators, uchar was compared with char
| * | | | | | MDEV-4683 query start_time not reset when going to sleepSergei Golubchik2013-07-012-0/+19
| | | | | | |
| * | | | | | Merge from 5.3Alexander Barkov2013-06-286-0/+53
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: mysql-test/r/type_date.result mysql-test/r/type_datetime.result mysql-test/r/type_time.result mysql-test/t/type_date.test mysql-test/t/type_datetime.test mysql-test/t/type_time.test sql/item_func.cc sql/item_timefunc.cc sql/sql_time.cc sql/sql_time.h pending merges: Alexander Barkov 2013-06-28 MDEV-4634 Crash in CONVERT_TZ
| | * | | | | MDEV-4634 Crash in CONVERT_TZAlexander Barkov2013-06-286-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Item_func_min_max::get_date() did not check the returned value against the fuzzy_date flags, so it could return a bad value to the caller that expects a good date (e.h. CONVERT_TZ). modified: mysql-test/r/type_date.result mysql-test/r/type_datetime.result mysql-test/r/type_time.result mysql-test/t/type_date.test mysql-test/t/type_datetime.test mysql-test/t/type_time.test sql/item_func.cc sql/item_timefunc.cc sql/mysql_priv.h sql/time.cc
| * | | | | | Merging MDEV-4635 from 5.3.Alexander Barkov2013-06-184-9/+27
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, fixing a bug in STR_TO_DATE(). It erroneously returned error in strict mode for dates like '0000-01-01' (zero year, but non-zero month and day). According to the manual: - NO_ZERO_DATE disallows 0000-00-00 (all date parts are zeros) - NO_ZERO_IN_DATE disallows zero month (YYYY-00-DD) or day (YYYY-MM-00). 0000-01-01 is a valid date, even in strict mode. modified: mysql-test/r/func_time.result mysql-test/r/strict.result mysql-test/t/func_time.test mysql-test/t/strict.test sql/item_timefunc.cc sql/sql_time.h pending merges: Alexander Barkov 2013-06-17 MDEV-4635 Crash in UNIX_TIMESTAMP(STR_TO_DAT...
| | * | | | | MDEV-4635 Crash in UNIX_TIMESTAMP(STR_TO_DATE('2020','%Y'))Alexander Barkov2013-06-172-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: mysql-test/r/func_time.result mysql-test/t/func_time.test sql/item_timefunc.cc sql/mysql_priv.h
| * | | | | | 5.3 -> 5.5 Mergeunknown2013-06-174-0/+47
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-4651 Crash in my_decimal2decimal in a ORDER BY queryAlexander Barkov2013-06-177-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: mysql-test/r/ps_2myisam.result mysql-test/r/ps_3innodb.result mysql-test/r/ps_4heap.result mysql-test/r/ps_5merge.result mysql-test/r/type_datetime_hires.result mysql-test/suite/maria/r/ps_maria.result mysql-test/t/type_datetime_hires.test sql/item_timefunc.h
| | * | | | | MDEV-4593: p_s: crash in simplify_joins with delete using subselect from viewunknown2013-06-062-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql_derived_merge_for_insert() should not be called for views or derived tables which are not put (directly or via other views) in main SELECT_LEX "join list".
| * | | | | | MDEV-4578 information_schema.processlist reports incorrect value for Time ↵Sergei Golubchik2013-06-132-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (2147483647) SHOW PROCESSLIST might see a thread that started executing a query *after* processlist has started. Don't show a negative or huge wrapped-around query execution time.
| * | | | | | MDEV-4529 Assertion `tmp->state == 4' fails on mix of INSTALL SONAME / ↵Sergei Golubchik2013-06-132-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UNINSTALL PLUGIN fix incorrect assert
| * | | | | | MDEV-4519 SHOW EVENTS and SHOW PROCEDURE STATUS truncate long user namesSergei Golubchik2013-06-1310-38/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fix I_S table definitions in sql_show.cc
| * | | | | | MDEV-4515 Long user names are truncated to 48 symbols in error messagesSergei Golubchik2013-06-132-2/+18
| | | | | | |
View Lorry Controller Status