summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "MDEV-12 OpenGIS: create required tables: GeometryColumns, related ↵Alexey Botchkov2014-06-262-64/+0
| | | | | | views." This reverts commit 0bf9fd89290e2ebd6eb44c36b2885e9e314499b5.
* Merge branch 'bb-10.1-explain-analyze' into 10.1Sergei Petrunia2014-06-2623-578/+1473
|\
| * Code cleanupSergei Petrunia2014-06-262-19/+0
| |
| * MDEV-406: ANALYZE $stmt: Make multi-table UPDATE/DELETE work, code cleanup.Sergei Petrunia2014-06-265-14/+61
| |
| * MDEV-406: ANALYZE $stmt: fix "explain UPDATE view problem".Sergei Petrunia2014-06-251-0/+20
| |
| * MDEV-406: ANALYZE $stmt: more testcases, fix memory leakSergei Petrunia2014-06-253-0/+43
| |
| * Merge bb-10.1-explain-analyze into 10.1Sergei Petrunia2014-06-2523-550/+1354
| |\
| | * MDEV-406: ANALYZE $stmt: add some tests for joinsSergei Petrunia2014-06-252-3/+52
| | |
| | * MDEV-406: ANALYZE $stmt: add support for BNL join bufferingSergei Petrunia2014-06-258-26/+122
| | |
| | * MDEV-406: ANALYZE $stmt: Scans that never executed will have r_rows=NULLSergei Petrunia2014-06-244-8/+31
| | |
| | * Fix compile on Windows: use rint() instead of round().Sergei Petrunia2014-06-241-1/+1
| | |
| | * MDEV-406: ANALYZE $stmt: fix order_by.testSergei Petrunia2014-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | | In JOIN_TAB::update_explain_data(), take into account that - the table that may have pre-sorted is the first non-const table - Tables that are eliminated by table elimination are marked as const tables, but are not present in the Explain data structures
| | * MDEV-406: ANALYZE $stmt: get ANALYZE work for subqueriesSergei Petrunia2014-06-2413-455/+738
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - "ANALYZE $stmt" should discard select's output, but it should still evaluate the output columns (otherwise, subqueries in select list are not executed) - SHOW EXPLAIN's code practice of calling JOIN::save_explain_data() after JOIN::exec() is disastrous for ANALYZE, because it resets all counters after the first execution. It is stopped = "Late" test_if_skip_sort_order() calls explicitly update their part of the query plan. = Also, I had to rewrite I_S optimization to actually have optimization and execution stages.
| | * Update analyze_stmt.result after the last commitSergei Petrunia2014-06-161-0/+14
| | |
| | * MDEV-406: ANALYZE $stmtSergei Petrunia2014-06-033-3/+19
| | | | | | | | | | | | | | | - Testcase for ANALYZE UNION - Provide r_rows for union result.
| | * MDEV-406: ANALYZE $stmtSergei Petrunia2014-06-036-17/+79
| | | | | | | | | | | | | | | - Support tracking for UNIONs, temporary-table based ORDER BYs, and both.
| | * MDEV-406: ANALYZE $stmtSergei Petrunia2014-05-272-0/+80
| | | | | | | | | | | | -Add analyze_stmt.test/result
| | * Re-commit in git:Sergei Petrunia2014-05-2713-58/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-406: ANALYZE $stmt - Ported the old patch to new explain code - New SQL syntax (ANALYZE $stmt) - ANALYZE UPDATE/DELETE is now supported (because EXPLAIN UPDATE/DELETE is supported) - Basic counters are calculated for basic kinds of queries (still need to see what happens with join buffer, ORDER BY...LIMIT queries, etc)
* | | MDEV-12 OpenGIS: create required tables: GeometryColumns, related views.Alexey Botchkov2014-06-262-0/+64
| | | | | | | | | | | | Scripts added that create OpenGIS-required views and tables they're based upon.
* | | Merge branch '10.1' of github.com:MariaDB/server into 10.1Jan Lindström2014-06-2552-934/+731
|\ \ \ | |/ / | | | | | | | | | Conflicts: storage/xtradb/handler/ha_innodb.cc
| * | MDEV-6248 GUI-friendly cmake options to enable/disable pluginsSergei Golubchik2014-06-2310-149/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce a set of PLUGIN_xxx cmake options with values NO, STATIC, DYNAMIC, AUTO, YES (abort if plugin is not compiled) * Deprecate redundant and ambiguous WITH_xxx, WITH_PLUGIN_xxx, WITH_xxx_STORAGE_ENGINE, WITHOUT_xxx, WITHOUT_PLUGIN_xxx, WITHOUT_xxx_STORAGE_ENGINE * Actually check whether a plugin is disabled (DISABLED keyword was always present, but it was ignored until now). * Support conditionally disabled plugins - keyword ONLY_IF * Use ONLY_IF for conditionally skipping plugins, instead of doing MYSQL_ADD_PLUGIN conditionally as before. Because if MYSQL_ADD_PLUGIN isn't done at all, PLUGIN_xxx=YES cannot work.
| * | cmake GUI cleanupSergei Golubchik2014-06-236-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mark path-related variables (AIO_LIBRARY, ODBC_LIBRARY, ODBC_INCLUDE_DIR, Thrift_LIBS, Thrift_INCLUDE_DIRS, CRYPTO_LIBRARY, OPENSSL_LIBRARIES, OPENSSL_ROOT_DIR, OPENSSL_INCLUDE_DIR) as advanced - paths are automatically discovered by cmake. mark few choice variables (ENABLED_LOCAL_INFILE, WITHOUT_SERVER, DISABLE_SHARED) as not advanced - they are user choices, not automatically configured values. remove unused BACKUP_TEST variable.
| * | MDEV-4549 [PATCH] Clean up code working with ACL tablesSergei Golubchik2014-06-236-423/+261
| | | | | | | | | | | | | | | | | | | | | | | | * enum values to index different ACL tables, instead of hard-coded numbers (even different in diffent functions). * move TABLE_LIST initialization into open_grant_tables() and use it everywhere * change few my_bool's to bool's
| * | 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.
* | | Fix test failure when trying to set compression algorithm to 3bb-10.1-fusionioJan Lindström2014-06-252-9/+0
| | |
* | | MDEV-6361: innodb_compression_algorithm configuration variable canJan Lindström2014-06-2525-29/+1654
|/ / | | | | | | | | | | | | be set to unsupported value. MDEV-6350: Excessive unnecessary memory allocation at InnoDB/XtraDB startup if LZO is installed.
* | 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
| |\ \ \ \ | | |/ / / | |/| | |