summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* archive: open ARZ files in external_lock, not in rnd_init/index_initbb-10.1-rediscoverSergei Golubchik2014-06-216-25/+60
|
* better error message for TABLE_DEF_CHANGED and CRASHED_ON_USAGE in external_lockSergei Golubchik2014-06-211-0/+6
|
* archive: don't forget to set frmver_length=0 for old ARZ versionsSergei Golubchik2014-06-211-7/+4
|
* archive: check frm version every time ARZ file is openedSergei Golubchik2014-06-213-3/+55
|
* main.temp_table_frm failure on fulltest (--embedded, when TMPDIR=/tmp)Sergei Golubchik2014-06-211-1/+1
| | | | use more restrictive --list_files to hide the usual /tmp garbage
* MDEV-4260 Don't create frm files for temporary tablesSergei Golubchik2014-06-207-75/+55
| | | | | | | * Don't write frm for tmp tables * pass frm image down to open_table_uncached, when possible * don't use truncate-by-recreate for temp tables - cannot recreate without frm, and delete_all_rows is faster anyway
* remove HTON_FLUSH_AFTER_RENAME (BDB-ism, unused for years)Sergei Golubchik2014-06-202-19/+0
|
* Fix CMakeLists.txt for cmake Ninja generatorSergei Golubchik2014-06-203-3/+3
|
* MDEV-6137 better help for SET/ENUM sysvarsSergei Golubchik2014-06-1922-260/+263
| | | | | | | | Auto-generate the allowed list of values for enum/set/flagset options in --help output. But don't do that when the help text already has them. Also, remove lists of values from help strings of various options, where they were simply listed without any additional information.
* update sys_vars.innodb_compression_algorithm_basic to passSergei Golubchik2014-06-182-19/+12
| | | | | | | | | | it checked that the default is lz4. Which only worked on systems that had lz4 and did not have lzo. Now it checks for the default to be zlib, which works on systems that has neither lz4 or lzo. Like our package builders in buildbot. This is intentional, we don't want introduce additional dependencies (lz4, lzo) for our packages just yet. This can (and will) be reconsidered, and this test can (and will) be updated again.
* Merge branch '10.1' of github.com:MariaDB/server into 10.1Jan Lindström2014-06-1718-72/+522
|\
| * MDEV-6107 merge default_tmp_storage_engineSergei Golubchik2014-06-1517-68/+516
| | | | | | | | | | | | | | Adapt default_tmp_storage_engine implementation from mysql-5.6 New feature (as compared to 5.6), default_tmp_storage_engine=NULL means that temporary tables will use default_storage_engine value. This makes the behavior backward compatible.
| * .gitignore ninja filesSergei Golubchik2014-06-151-0/+2
| |
| * fix bison warnings (clash <NONE> != <>)Sergei Golubchik2014-06-141-4/+4
| |
* | Fixed test failure introduced by adding a new dynamicJan Lindström2014-06-174-8/+109
|/ | | | | | configuration variable innodb_compression_algorithm. Removed unnecessary test for removed configuration variable.
* Merge branch '10.0' into 10.1Sergei Golubchik2014-06-13358-8266/+15189
|\ | | | | | | | | | | | | | | Conflicts: CMakeLists.txt VERSION Modified: .gitignore
| * promote server_audit and sequence plugins to stableSergei Golubchik2014-06-132-2/+2
| |
| * valgrind warning. initialize found_rows earlier, before any "goto err".mariadb-10.0.12Sergei Golubchik2014-06-121-1/+4
| |
| * avoid uppercase table aliases tests - they're not portableSergei Golubchik2014-06-112-34/+34
| |
| * MDEV-5995 MySQL Bug#12750920: EMBEDDED SERVER START/STOP.Alexey Botchkov2014-06-113-11/+183
| | | | | | | | | | | | Some variables weren't cleared properly so consequitive embedded server start/stop failed. Cleanups added. Also mysql_client_test.c extended to test that (taken from Mattias Johnson's patch)
| * MDEV-6253 MySQL Users Break when Migrating from MySQL 5.1 to MariaDB 10.0.10Sergei Golubchik2014-06-113-8/+48
| | | | | | | | | | | | | | When plugin=mysql_native_password (or mysql_old_password) take the password from *either* password *or* authentication_string, whichever is set. This makes no sense, but alas, that's what MySQL-5.6 does.
| * MDEV-6065 MySQL Bug#13623473 "MISSING ROWS ON SELECT AND JOIN WITH ↵Sergei Golubchik2014-06-111-2/+5
| | | | | | | | | | | | | | TIME/DATETIME COMPARE fix for ranges like "indexed_datetime OP time" (test case is in the previous revision)
| * MDEV-6065 MySQL Bug#13623473 "MISSING ROWS ON SELECT AND JOIN WITH ↵Sergei Golubchik2014-06-116-5/+2553
| | | | | | | | | | | | TIME/DATETIME COMPARE" fix for ref like "indexed_time = datetime"
| * cleanup: remove special case from store_key::store_key(), add ↵Sergei Golubchik2014-06-095-40/+42
| | | | | | | | | | | | Field_blob::new_key_field (prep for MDEV-6065)
| * MDEV-6249 mark P_S STABLE and disable it by defaultSergei Golubchik2014-06-093-23/+22
| |
| * MergeIgor Babaev2014-06-108-24/+91
| |\
| | * Merge.Igor Babaev2014-06-108-24/+91
| | |\
| | | * Fixed bug mdev-6071.Igor Babaev2014-06-108-24/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method JOIN_CACHE::init may fail (return 1) if some conditions on the used join buffer is not satisfied. For example it fails if join_buffer_size is greater than join_buffer_space_limit. The conditions should be checked when running the EXPLAIN command for the query. That's why the method JOIN_CACHE::init has to be called for EXPLAIN commands as well.
| * | | MergeSergey Petrunya2014-06-103-13/+75
| |\ \ \ | | |/ / | |/| |
| | * | MergeSergey Petrunya2014-06-103-13/+75
| | |\ \
| | | * | MDEV-5985: EITS: selectivity estimates look illogical for join and non-key ↵Sergey Petrunya2014-06-103-13/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | equalities Part#1. table_cond_selectivity() should discount selectivity of table' conditions only when ity counts that selectivity to begin with. For non-ref-based access methods (ALL/range/index_merge/etc), we start with sel=1.0 and hence do not need to discount any selectivities.
| * | | | MDEV-4440 IF NOT EXISTS in multi-action ALTER does not work when the problem ↵Alexey Botchkov2014-06-103-29/+116
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | is created by a previous part of the ALTER. Loops added to the handle_if_exists_option() to check the CREATE/DROP lists for duplicates.
| * | | Merge spider fixes.Sergey Vojtovich2014-06-095-60/+61
| |\ \ \
| | * | | fix wrong result for Spider testKentoku SHIBA2014-06-101-49/+44
| | | | |
| | * | | fix for Spider build error by abort_loop on windowsKentoku SHIBA2014-06-103-10/+17
| | | | |
| * | | | 10.0-connectSergei Golubchik2014-06-0918-510/+539
| |\ \ \ \
| | * | | | - Eliminate virtual columns from CSV and FMT table fieldsOlivier Bertrand2014-05-306-36/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/colblk.h storage/connect/reldef.h storage/connect/tabfmt.cpp - Fix length specification and writing (when using FIELD_FORMAT) of DECIMAL columns modified: storage/connect/ha_connect.cc storage/connect/tabdos.cpp - Add the D field_format option (specifying the decimal separator character) modified: storage/connect/tabdos.cpp storage/connect/tabdos.h storage/connect/tabfmt.cpp
| | * | | | - Fix a bug causing the tabname option to be ignored when the connectionOlivier Bertrand2014-05-272-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string was not an URL but a server name. Also make the dbname option to be recignized in create (was only seached in option_list) modified: storage/connect/ha_connect.cc storage/connect/tabmysql.cpp
| | * | | | - Fix writing header of void CONNECT DBF tables on first insert. An errorOlivier Bertrand2014-05-1211-463/+465
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | occured when the table definition had a special column that was not skipped from the header. modified: storage/connect/filamdbf.cpp - Update some test cases to reflect a change of error message generated when trying to update or delete a read only table. modified: storage/connect/mysql-test/connect/r/csv.result storage/connect/mysql-test/connect/r/dbf.result storage/connect/mysql-test/connect/r/fix.result storage/connect/mysql-test/connect/r/ini.result storage/connect/mysql-test/connect/r/vec.result storage/connect/mysql-test/connect/t/csv.test storage/connect/mysql-test/connect/t/dbf.test storage/connect/mysql-test/connect/t/fix.test storage/connect/mysql-test/connect/t/ini.test storage/connect/mysql-test/connect/t/vec.test
| | * | | | - Fix wrong error "Invalid offset for CVS table" when a specialOlivier Bertrand2014-05-093-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | column is defined in a CSV table (MDEV-6187) modified: storage/connect/ha_connect.cc storage/connect/reldef.h storage/connect/tabfmt.cpp
| * | | | | MDEV-6320 - disable spider.spider_fixesSergei Golubchik2014-06-091-0/+1
| | | | | |
| * | | | | bzr ignore 'pcre/test*grep'Sergei Golubchik2014-06-091-0/+1
| | | | | |
| * | | | | merge of MDEV-6047unknown2014-06-0924-183/+189
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | MDEV-6047: Make exists_to_in optimization ON by defaultunknown2014-06-0924-183/+189
| | | | | |
| * | | | | merge Spider 3.2.4Kentoku SHIBA2014-06-0822-325/+1295
| | |_|/ / | |/| | |
| * | | | MergeSergey Petrunya2014-06-073-0/+57
| |\ \ \ \
| | * | | | MDEV-6308: Server crashes in table_multi_eq_cond_selectivity with ...Sergey Petrunya2014-06-073-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | - In table_cond_selectivity(), reset keyuse variable between the loops.
| * | | | | MDEV-5976: TokuDB: Wrong query result using mrr=onSergey Petrunya2014-06-063-1/+201
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | - Key_value_records_iterator::get_next() should pass pointer to the key to handler->ha_index_next_same(). Because of a typo bug, pointer-to-pointer was passed instead in certain cases.
| * | | | MDEV-6102 Comparison between TIME and DATETIME does not use CURRENT_DATEAlexander Barkov2014-06-0610-22/+151
| | | | | | | | | | | | | | | | | | | | | | | | | MDEV-6101 Hybrid functions do not add CURRENT_DATE when converting TIME to DATETIME
| * | | | revert tokudb changes that caused crashesSergei Golubchik2014-06-064-15/+14
| | | | |