summaryrefslogtreecommitdiff
path: root/storage/myisammrg
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.2' into 10.3Oleksandr Byelkin2020-08-031-1/+1
|\
| * Merge branch '10.1' into 10.2Oleksandr Byelkin2020-08-021-1/+1
| |\
| | * MDEV-18496 Crash when Aria encryption is enabled but plugin not availableSergei Golubchik2020-07-291-1/+1
| | | | | | | | | | | | wait_while_table_is_used() should return an error if handler::extra() fails
| | * imporve clang buildEugene Kosov2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug Maintainer mode makes all warnings errors. This patch fix warnings. Mostly about deprecated `register` keyword. Too much warnings came from Mroonga and I gave up on it.
* | | Merge 10.2 into 10.3Marko Mäkelä2020-03-131-5/+8
|\ \ \ | |/ /
| * | Fix GCC 10.0 -Wstringop-overflowMarko Mäkelä2020-03-131-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | myrg_open(): Reduce the scope of the variable 'end' and simplify the code. For some reason, I got no warning for this code in the 10.2 branch, only 10.3 or later. The ENGINE=MERGE is covered by the tests main.merge, main.merge_debug, and main.merge-big.
* | | Merge 10.2 into 10.3Marko Mäkelä2019-05-1426-26/+26
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2019-05-1326-26/+26
| |\ \ | | |/
| | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-1126-26/+26
| | |\
| | | * Update FSF AddressVicențiu Ciorbaru2019-05-1126-26/+26
| | | | | | | | | | | | | | | | * Update wrong zip-code
* | | | MDEV-19236 Improve error message for ↵Eugene Kosov2019-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_COLUMN_TYPE remove a sometimes misleading word INPLACE from error message
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-03-271-8/+8
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-03-271-8/+8
| |\ \ \ | | |/ /
| | * | Merge 10.0 into 10.1Marko Mäkelä2019-03-271-8/+8
| | |\ \
| | | * \ Merge 5.5 into 10.0bb-10.0-mergeMarko Mäkelä2019-03-261-8/+8
| | | |\ \ | | | | |/
| | | | * Fix for MDEV-17449, typo in error message (#1146)Chris Calender2019-03-241-8/+8
| | | | |
* | | | | Merge branch '10.2' into 10.3Sergei Golubchik2019-03-171-24/+19
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2019-03-151-26/+21
| |\ \ \ \ | | |/ / /
| | * | | fix gcc 8 compiler warningsSergei Golubchik2019-03-141-26/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two newly enabled warnings: 1. cast for a function pointers. Affected sql_analyse.h, mi_write.c and ma_write.cc, mf_iocache-t.cc, mysqlbinlog.cc, encryption.cc, etc 2. memcpy/memset of nontrivial structures. Fixed as: * the warning disabled for InnoDB * TABLE, TABLE_SHARE, and TABLE_LIST got a new method reset() which does the bzero(), which is safe for these classes, but any other bzero() will still cause a warning * Table_scope_and_contents_source_st uses `TABLE_LIST *` (trivial) instead of `SQL_I_List<TABLE_LIST>` (not trivial) so it's safe to bzero now. * added casts in debug_sync.cc and sql_select.cc (for JOIN) * move assignment method for MDL_request instead of memcpy() * PARTIAL_INDEX_INTERSECT_INFO::init() instead of bzero() * remove constructor from READ_RECORD() to make it trivial * replace some memcpy() with c++ copy assignments
* | | | | Merge 10.2 into 10.3Marko Mäkelä2018-11-061-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | main.derived_cond_pushdown: Move all 10.3 tests to the end, trim trailing white space, and add an "End of 10.3 tests" marker. Add --sorted_result to tests where the ordering is not deterministic. main.win_percentile: Add --sorted_result to tests where the ordering is no longer deterministic.
| * | | | Merge 10.1 into 10.2Marko Mäkelä2018-11-061-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-0/+2
| | |\ \ \ | | | |/ /
| | | * | Disabled storage engine tests using LOCK with MERGE engineElena Stepanova2018-10-131-0/+2
| | | | | | | | | | | | | | | | | | | | Tests fail due to MDEV-17145
* | | | | Follow-up for be6ae0bb6baa8a - fix test resultsElena Stepanova2018-05-192-7/+2
| | | | | | | | | | | | | | | | | | | | Duplicate warnings have been removed
* | | | | Follow up for 9a8498066865b5 - adjustments to storage_engine testsElena Stepanova2018-05-032-5/+7
| | | | |
* | | | | Merge 10.2 into 10.3Marko Mäkelä2018-04-241-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Remove most 'register' use in C++Marko Mäkelä2018-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modern compilers (such as GCC 8) emit warnings that the 'register' keyword is deprecated and not valid C++17. Let us remove most use of the 'register' keyword. Code in 'extra/' is not touched.
* | | | | Adjust test results to reflect the new system tableElena Stepanova2018-02-241-4/+13
| | | | |
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-02-192-27/+27
|\ \ \ \ \
| * | | | | Follow-up for 54db0be3be59 (Added Max_index_length and Temporary)Elena Stepanova2018-02-152-27/+27
| | | | | |
* | | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ↵Vladislav Vaintroub2018-02-062-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'size_t' to 'type', possible loss of data) Handle string length as size_t, consistently (almost always:)) Change function prototypes to accept size_t, where in the past ulong or uint were used. change local/member variables to size_t when appropriate. This fix excludes rocksdb, spider,spider, sphinx and connect for now.
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2018-02-041-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Added name to MEM_ROOT for esier debuggingMonty2018-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to how memory allocation is done when debugging with either DBUG or gdb. Will especially help when debugging stored procedures Main change is a name argument as second argument to init_alloc_root() init_sql_alloc() Other things: - Added DBUG_ENTER/EXIT to some Virtual_tmp_table functions
* | | | | | Changed database, tablename and alias to be LEX_CSTRINGMonty2018-01-301-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done in, among other things: - thd->db and thd->db_length - TABLE_LIST tablename, db, alias and schema_name - Audit plugin database name - lex->db - All db and table names in Alter_table_ctx - st_select_lex db Other things: - Changed a lot of functions to take const LEX_CSTRING* as argument for db, table_name and alias. See init_one_table() as an example. - Changed some function arguments from LEX_CSTRING to const LEX_CSTRING - Changed some lists from LEX_STRING to LEX_CSTRING - threads_mysql.result changed because process list_db wasn't always correctly updated - New append_identifier() function that takes LEX_CSTRING* as arguments - Added new element tmp_buff to Alter_table_ctx to separate temp name handling from temporary space - Ensure we store the length after my_casedn_str() of table/db names - Removed not used version of rename_table_in_stat_tables() - Changed Natural_join_column::table_name and db_name() to never return NULL (used for print) - thd->get_db() now returns db as a printable string (thd->db.str or "")
* | | | | | MDEV 7701 extra() calls for VP engineMonty2017-12-031-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Spider patches: 003_mariadb-10.0.15.vp.diff 060_mariadb-10.2.0.partition_reset_top_table_fields.diff - Support HA_EXTRA_ADD_CHILDREN_LIST,HA_EXTRA_ATTACH_CHILDREN, HA_EXTRA_IS_ATTACHED_CHILDREN and HA_EXTRA_DETACH_CHILDREN in partition handler for handlers that has HA_CAN_MULTISTEPL_MERGE flag - Added HA_CAN_MULTISTEPL_MERGE to MERGE handler. - Added handler::get_child_handlers() - Change m_num_lock to contain total number of locks. This was needed as we now adjust number of locks when extra(HA_EXTRA_ATTACH_CHILDREN) is called.
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-021-11/+11
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-281-1/+1
| | | | |
| * | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix win64 pointer truncation warnings (usually coming from misusing 0x%lx and long cast in DBUG) - Also fix printf-format warnings Make the above mentioned warnings fatal. - fix pthread_join on Windows to set return value.
* | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-011-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Fix results for parts/repair_table test after enabling it for MyISAMElena Stepanova2017-08-281-4/+4
| | | | |
* | | | | Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-252-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-172-6/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-082-6/+6
| | |\ \ \ | | | |/ /
| | | * | MDEV-12915 ST_Centroid does not return the same result than MySQLElena Stepanova2017-08-012-6/+6
| | | | | | | | | | | | | | | | | | | | Fix storage_engine test results
* | | | | Postfix for MDEV-12619 - test results adjustedElena Stepanova2017-07-181-1/+1
| | | | |
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-121-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Follow-up for MDEV-13089 (identifier quoting in partitioning)mariadb-10.2.7Elena Stepanova2017-07-101-4/+4
| | | | | | | | | | | | | | | | | | | | Adjust results for storage_engine tests
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-159-38/+76
|\ \ \ \ \ | |/ / / /
| * | | | Adjust storage_engine suite according to server changes in 10.2Elena Stepanova2017-06-039-38/+76
| | | | |
* | | | | Improved warning "xxx is not BASE TABLE/SEQUENCE"Monty2017-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | - Changed warning to "'%-.192s.%-.192s' is not of type '%s'" to make the english a bit more correct
View Lorry Controller Status