summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge from 5.2Alexander Barkov2013-07-094-4/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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-094-4/+11
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-064-4/+11
| | |
| | * MDEV-4575 MySQL client doesn't strip off 5.5.5- prefix while connecting to ↵Sergei Golubchik2013-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | | 10.x server extend 5.1 client library to read 4 byte capabilities from the first handshake packet. two higher bytes are always zeros for 5.1 servers.
* | | MDEV-4610 SQL query crashes MariaDB with derived_with_keysSergei Golubchik2013-07-053-2/+38
| | | | | | | | | | | | | | | | | | | | | 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-053-5/+22
| | | | | | | | | | | | don't ignore the return value fix_fields()
* | | MDEV-4257 Assertion `!table || (!table->read_set || ↵Sergei Golubchik2013-07-053-1/+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
* | | MDEV-4667 DATE('string') incompability between mysql and mariadbSergei Golubchik2013-07-0324-111/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | A clean-up for MDEV-4634Alexander Barkov2013-06-281-1/+1
| | | | | | | | | | | | | | | | | | modified: sql/time.cc
* | | MDEV-4634 Crash in CONVERT_TZAlexander Barkov2013-06-2810-10/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | MDEV-4635 Crash in UNIX_TIMESTAMP(STR_TO_DATE('2020','%Y'))Alexander Barkov2013-06-174-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | modified: mysql-test/r/func_time.result mysql-test/t/func_time.test sql/item_timefunc.cc sql/mysql_priv.h
* | | MDEV-4651 Crash in my_decimal2decimal in a ORDER BY queryAlexander Barkov2013-06-178-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-063-1/+36
| | | | | | | | | | | | 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".
* | | fixes for buildbotSergei Golubchik2013-05-214-4/+6
| | |
* | | 5.2 mergeSergei Golubchik2013-05-2021-33/+266
|\ \ \ | |/ /
| * | 5.1 mergeSergei Golubchik2013-05-2016-25/+232
| |\ \ | | |/
| | * Fixed compiler failure on solarisMichael Widenius2013-05-111-1/+1
| | |
| | * Fixed compiler warningMichael Widenius2013-05-111-1/+1
| | |
| | * MDEV-4280: Assertion `empty_size == empty_size_on_page' failure in ↵Michael Widenius2013-05-1113-22/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * MDEV-4326 fix.unknown2013-04-092-2/+110
| | | | | | | | | | | | | | | | | | Removed "optimization" which caused preoblems on second execution of PS with string parameter in LIMIT clause. Fixed test_bug43560 to be able to skipp it if connection is UNIX socket.
| * | MDEV-4544 - update MSI to include HeidiSQL 8.0Vladislav Vaintroub2013-05-191-1/+1
| | |
| * | Fix cpack error - safe_process.pl does not exist anymore.Vladislav Vaintroub2013-05-191-1/+1
| | |
| * | MDEV-4462 mysqld gets SIGFPE when mysql.user table is emptySergei Golubchik2013-05-083-0/+32
| | | | | | | | | | | | avoid divison by zero
* | | MDEV-4290:unknown2013-05-036-5/+78
| | | | | | | | | | | | | | | Fix agregate function resolution in derived tables (no name resolution over a derived table border)
* | | MergeSergey Petrunya2013-05-051-1/+1
|\ \ \
| * | | MDEV-4482: main.windows test fails in buildbot with result mismatchSergey Petrunya2013-05-051-1/+1
| | | | | | | | | | | | | | | | - Rollback an earlier patch (was pushed into 5.3 instead of 5.5)
* | | | Fixed bug mdev-4336.Igor Babaev2013-05-034-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When iterating over a list of conditions using List_iterator the function remove_eq_conds should skip all predicates that replace a condition from the list. Otherwise it can come to an infinite recursion.
* | | | Made consistent handling of the predicates of the formIgor Babaev2013-05-033-13/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <non-nullable datatime field> IS NULL in outer joins with that in inner joins. Previously such condition was transformed into the condition <non-nullable datatime field> = 0 unless the field belonged to an inner table of an outer join. In this case the predicate was interpreted as for any other field. Now if the field in the predicate <non-nullable datatime field> IS NULL belongs to an inner table of an outer join the predicate is transformed into the disjunction <non-nullable datatime field> = 0 OR <non-nullable datatime field> IS NULL. This is fully compatible with the semantics of such predicates in 5.5.
* | | | Fixed bug mdev-4274.Igor Babaev2013-04-296-2/+161
|/ / / | | | | | | | | | | | | | | | | | | | | | This bug was the result of incompleteness of the patch for bug mdev-4177. When an OR condition is simplified to a single conjunct it is merged into the embedding AND condition. Multiple equalities are also merged, and any field item involved in those equality should acquire a pointer to a the multiple equality formed by this merge.
* | | 5.2 mergeSergei Golubchik2013-04-118-88/+156
|\ \ \ | |/ /
| * | 5.1 mergeSergei Golubchik2013-04-118-81/+149
| |\ \ | | |/
| | * MDEV-4244 [PATCH] Buffer overruns and use-after-free errorsSergei Golubchik2013-04-065-72/+108
| | | | | | | | | | | | fixes for gcc 4.8 - compilation warnings and -fsanitize=address
| | * MDEV-4088 Replication 10.0 -> 5.5 failsSergei Golubchik2013-04-043-9/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update 5.1 to replicate from 10.0 and to show the server version (as of 10.0) correctly sql-common/client.c: mdev:4088 sql/slave.cc: use the version number, not just the first character of the version string (we want 10 > 4 not "10" < "4").
* | | MDEV-4244 [PATCH] Buffer overruns and use-after-free errorsSergei Golubchik2013-04-062-4/+4
| | | | | | | | | | | | fixes for gcc 4.8 -fsanitize=address
* | | MDEV-4316 MariaDB server crash with signal 11Sergei Golubchik2013-04-065-15/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fulltext search was initialized for all MATCH ... AGAINST items at the end of the JOIN::optimize(). But since 5.3 derived tables are initialized lazily on first use, very late in the sub_select(). Skip Item_func_match::init_search initialization if the corresponding table isn't open yet; repeat fulltext initialization for all not-yet-initialized MATCH ... AGAINST items after creating derived tables.
* | | If a range tree has a branch that is an expensive constant,unknown2013-04-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | currently get_mm_tree skipped the evaluation of this constant and icorrectly proceeded. The correct behavior is to return a NULL subtree, according to the IF branch being fixed - when it evaluates the constant it returns a value, and doesn't continue further.
* | | Update tests results, mysql-test/r/windows.resultSergey Petrunya2013-04-041-1/+1
| | |
* | | MDEV-4240: mariadb 5.3.12 using more memory than MySQL 5.1 for an ↵Sergey Petrunya2013-04-012-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inefficient query - Let index_merge allocate table handlers on quick select's MEM_ROOT, not on statement's MEM_ROOT. This is crucial for big "range checked for each record" queries, where index_merge can be created and deleted many times during query exection. We should not make O(#rows) allocations on statement's MEM_ROOT.
* | | MDEV-4335: Unexpected results when selecting on information_schemaSergey Petrunya2013-03-294-0/+33
| | | | | | | | | | | | | | | - When converting a subquery to a semi-join, propagate OPTION_SCHEMA_TABLE.
* | | Merge.Igor Babaev2013-03-273-4/+498
|\ \ \
| * | | Fixed bug mdev-4318.Igor Babaev2013-03-223-4/+498
| | | | | | | | | | | | | | | | | | | | | | | | In some cases, when using views the optimizer incorrectly determined possible join orders for queries with nested outer and inner joins. This could lead to invalid execution plans for such queries.
* | | | 5.2 mergeSergei Golubchik2013-03-2612-125/+171
|\ \ \ \ | | |/ / | |/| |
| * | | 5.1 mergeSergei Golubchik2013-03-2612-124/+172
| |\ \ \ | | | |/ | | |/|
| | * | add 'plugins' suite - empty, but the lineSergei Golubchik2013-03-200-0/+0
| | | | | | | | | | | | | | | | | | | | ./mtr --suite=main,plugins will work on all branches.
| | * | MDEV-4295 Server crashes in get_point on a query with Area, AsBinary, ↵Alexey Botchkov2013-03-193-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MultiPoint. Need to check if the number of points is 0 for the polygon.
| | * | MDEV-4296 Assertion `n_linear_rings > 0' fails in Gis_polygon::centroid_xy.Alexey Botchkov2013-03-193-4/+13
| | | | | | | | | | | | | | | | | | | | Forgotten DBUG_ASSERT should be replaced with the 'return error'.
| | * | MDEV-4269 fix.unknown2013-03-183-0/+29
| | | | | | | | | | | | | | | | Item_default_value inherited form Item_field so should create temporary table field similary.
| | * | MDEV-4252 geometry query crashes server.Alexey Botchkov2013-03-184-21/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional fixes for possible overflows in length-related calculations in 'spatial' implementations. Checks added to the ::get_data_size() methods. max_n_points decreased to occupy less 2G size. An object of that size is practically inoperable anyway.
| | * | MDEV-4289 Assertion `0' fails in make_sortkey with GROUP_CONCAT, MAKE_SET, ↵Sergei Golubchik2013-03-185-85/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GROUP BY Item_func_make_set wasn't taking into account the first argument when calculating maybe_null. sql/item_strfunc.cc: rewrite Item_func_make_set, removing separate storage of the first argument sql/item_strfunc.h: rewrite Item_func_make_set, removing separate storage of the first argument
| | * | MDEV-4252 geometry query crashes server.Alexey Botchkov2013-03-104-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug was found by Alyssa Milburn. If the number of points of a geometry feature read from binary representation is greater than 0x10000000, then the (uint32) (num_points * 16) will cut the higher byte, which leads to various errors. Fixed by additional check if (num_points > max_n_points).
View Lorry Controller Status