summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/10.1' into 10.1bb-10.1-vicentiu-galeraVicențiu Ciorbaru2017-01-1669-2035/+2030
|\ | | | | | | Extra merge due to more extra commits during merge process
| * MDEV-11623 follow-up: Adjust tests.Marko Mäkelä2017-01-163-6/+8
| | | | | | | | | | | | | | | | | | innodb.doublewrite: Similar to what was done to innodb.101_compatibility, add an explicit $_ parameter to the Perl unpack function. Also, fix some diagnostic messages in the Perl code. innodb.innodb-wl5522-debug: Adjust for the changed error codes and messages on fault injection.
| * 101_compatibility test fails on CentOS 5Elena Stepanova2017-01-161-1/+1
| | | | | | | | | | | | Apparently, in older versions of Perl unpack does not have a logic for using $_ as a default value for the second argument. Fixed by specifying it explicitly
| * Updated list of unstable tests for 10.1.21Elena Stepanova2017-01-161-55/+89
| |
| * MDEV-11623 MariaDB 10.1 fails to start datadir created withMarko Mäkelä2017-01-1539-1497/+1483
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MariaDB 10.0/MySQL 5.6 using innodb-page-size!=16K The storage format of FSP_SPACE_FLAGS was accidentally broken already in MariaDB 10.1.0. This fix is bringing the format in line with other MySQL and MariaDB release series. Please refer to the comments that were added to fsp0fsp.h for details. This is an INCOMPATIBLE CHANGE that affects users of page_compression and non-default innodb_page_size. Upgrading to this release will correct the flags in the data files. If you want to downgrade to earlier MariaDB 10.1.x, please refer to the test innodb.101_compatibility how to reset the FSP_SPACE_FLAGS in the files. NOTE: MariaDB 10.1.0 to 10.1.20 can misinterpret uncompressed data files with innodb_page_size=4k or 64k as compressed innodb_page_size=16k files, and then probably fail when trying to access the pages. See the comments in the function fsp_flags_convert_from_101() for detailed analysis. Move PAGE_COMPRESSION to FSP_SPACE_FLAGS bit position 16. In this way, compressed innodb_page_size=16k tablespaces will not be mistaken for uncompressed ones by MariaDB 10.1.0 to 10.1.20. Derive PAGE_COMPRESSION_LEVEL, ATOMIC_WRITES and DATA_DIR from the dict_table_t::flags when the table is available, in fil_space_for_table_exists_in_mem() or fil_open_single_table_tablespace(). During crash recovery, fil_load_single_table_tablespace() will use innodb_compression_level for the PAGE_COMPRESSION_LEVEL. FSP_FLAGS_MEM_MASK: A bitmap of the memory-only fil_space_t::flags that are not to be written to FSP_SPACE_FLAGS. Currently, these will include PAGE_COMPRESSION_LEVEL, ATOMIC_WRITES and DATA_DIR. Introduce the macro FSP_FLAGS_PAGE_SSIZE(). We only support one innodb_page_size for the whole instance. When creating a dummy tablespace for the redo log, use fil_space_t::flags=0. The flags are never written to the redo log files. Remove many FSP_FLAGS_SET_ macros. dict_tf_verify_flags(): Remove. This is basically only duplicating the logic of dict_tf_to_fsp_flags(), used in a debug assertion. fil_space_t::mark: Remove. This flag was not used for anything. fil_space_for_table_exists_in_mem(): Remove the unnecessary parameter mark_space, and add a parameter for table flags. Check that fil_space_t::flags match the table flags, and adjust the (memory-only) flags based on the table flags. fil_node_open_file(): Remove some redundant or unreachable conditions, do not use stderr for output, and avoid unnecessary server aborts. fil_user_tablespace_restore_page(): Convert the flags, so that the correct page_size will be used when restoring a page from the doublewrite buffer. fil_space_get_page_compressed(), fsp_flags_is_page_compressed(): Remove. It suffices to have fil_space_is_page_compressed(). FSP_FLAGS_WIDTH_DATA_DIR, FSP_FLAGS_WIDTH_PAGE_COMPRESSION_LEVEL, FSP_FLAGS_WIDTH_ATOMIC_WRITES: Remove, because these flags do not exist in the FSP_SPACE_FLAGS but only in memory. fsp_flags_try_adjust(): New function, to adjust the FSP_SPACE_FLAGS in page 0. Called by fil_open_single_table_tablespace(), fil_space_for_table_exists_in_mem(), innobase_start_or_create_for_mysql() except if --innodb-read-only is active. fsp_flags_is_valid(ulint): Reimplement from the scratch, with accurate comments. Do not display any details of detected inconsistencies, because the output could be confusing when dealing with MariaDB 10.1.x data files. fsp_flags_convert_from_101(ulint): Convert flags from buggy MariaDB 10.1.x format, or return ULINT_UNDEFINED if the flags cannot be in MariaDB 10.1.x format. fsp_flags_match(): Check the flags when probing files. Implemented based on fsp_flags_is_valid() and fsp_flags_convert_from_101(). dict_check_tablespaces_and_store_max_id(): Do not access the page after committing the mini-transaction. IMPORT TABLESPACE fixes: AbstractCallback::init(): Convert the flags. FetchIndexRootPages::operator(): Check that the tablespace flags match the table flags. Do not attempt to convert tablespace flags to table flags, because the conversion would necessarily be lossy. PageConverter::update_header(): Write back the correct flags. This takes care of the flags in IMPORT TABLESPACE.
| * MDEV-11799 InnoDB can abort if the doublewrite bufferMarko Mäkelä2017-01-1514-295/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | contains a bad and a good copy Clean up the InnoDB doublewrite buffer code. buf_dblwr_init_or_load_pages(): Do not add empty pages to the buffer. buf_dblwr_process(): Do consider changes to pages that are all zero. Do not abort when finding a corrupted copy of a page in the doublewrite buffer, because there could be multiple copies in the doublewrite buffer, and only one of them needs to be good.
| * MDEV-8139: Disable a randomly failing test until the code is fixed.Marko Mäkelä2017-01-151-1/+2
| |
| * MDEV-11551 Server crashes in Field::is_real_nullSergei Golubchik2017-01-153-1/+25
| | | | | | | | sometimes table->s->stored_fields is less than table->s->null_fields
| * max_session_mem_used server variableSergei Golubchik2017-01-159-174/+226
| |
| * bugfix: mutex order violation in embeddedSergei Golubchik2017-01-151-1/+1
| | | | | | | | | | | | | | safe_mutex: Found wrong usage of mutex 'LOCK_thread_count' and 'LOCK_status' Mutex currently locked (in reverse order): LOCK_status sql/sql_class.h line 3873 LOCK_thread_count libmysqld/lib_sql.cc line 432
| * cleanup: make malloc_size_cb_func always definedSergei Golubchik2017-01-152-10/+10
| |
* | Merge remote-tracking branch '10.0-galera' into 10.1Vicențiu Ciorbaru2017-01-165-8/+15
|\ \
| * | Fix for post-merge build failure.mariadb-galera-10.0.29Nirbhay Choubey2017-01-131-13/+2
| | |
| * | Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-13344-5710/+13090
| |\ \
| * | | MDEV-11636 Extra persistent columns on slave always gets NULL in RBRSachin Setiya2016-12-284-0/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem:- In replication if slave has extra persistent column then these column are not computed while applying write-set from master. Solution:- While applying row events from server, we will generate values for extra persistent columns.
| * | | MDEV-11490 Galera_3nodes test suite does not suppress Warnings.Sachin Setiya2016-12-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem:- While running individual tests of Galera_3nodes , We get warnings like '[Warning] WSREP: Could not open state file for reading: '. And because of this individual tests fails. Solution:- We change suite.pm of Galera_3nodes to supress these warnings.
| * | | MDEV-11479 Improved wsrep_dirty_readsSachin Setiya2016-12-149-9/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tasks:- Changes in wsrep_dirty_reads variable 1.) Global + Session scope (Current: session-only) 2.) Can be set using command line. 3.) Allow all commands that do not change data (besides SELECT) 4.) Allow prepared Statements that do not change data 5.) Works with wsrep_sync_wait enabled
| * | | Revert "MDEV-11016 wsrep_node_is_ready() check is too strict"Sachin Setiya2016-12-143-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 52ea5ad865b4f6b4b37176296a3be0a716c5109a. # Conflicts: # mysql-test/suite/galera/r/galera_var_dirty_reads.result # mysql-test/suite/galera/t/galera_var_dirty_reads.test # sql/sql_parse.cc
| * | | Fix failing tests.Nirbhay Choubey2016-12-097-84/+60
| | | |
| * | | Fix build failure.Nirbhay Choubey2016-12-051-1/+1
| | | |
| * | | MDEV-11016 wsrep_node_is_ready() check is too strictSachinSetiya2016-12-013-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem:- The condition that checks for node readiness is too strict as it does not allow SELECTs even if these selects do not access any tables. For example,if we run SELECT 1; OR SELECT @@max_allowed_packet; Solution:- We need not to report this error when all_tables(lex->query_tables) is NULL:
| * | | bump the VERSIONDaniel Bartholomew2016-11-071-1/+1
| | | |
| * | | Disable unstable galera_concurrent_ctas test.mariadb-galera-10.0.28Nirbhay Choubey2016-11-021-0/+1
| | | |
| * | | Fix a build failure noticed on Yakkety.Nirbhay Choubey2016-11-022-4/+4
| | | |
* | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-16180-2460/+10539
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-01-1412-38/+58
| |\ \ \
| | * | | MDEV-11527 Virtual columns do not get along well with NO_ZERO_DATESergei Golubchik2017-01-123-1/+19
| | | | | | | | | | | | | | | | | | | | don't check defaults for vcols
| | * | | MDEV-11706 Assertion `is_stat_field || !table || (!table->write_set || ↵Sergei Golubchik2017-01-119-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitmap_is_set(table->write_set, field_index) || (table->vcol_set && bitmap_is_set(table->vcol_set, field_index)))' failed in Field_time::store_TIME_with_warning vcols and triggers. Revert 094f4cf77890c5a747a57cf2bed149b0b6933507, backport the correct fix (Table_triggers_list::mark_fields_used() not marking vcols) from 10.2.
| * | | | bump the VERSIONDaniel Bartholomew2017-01-131-1/+1
| | |_|/ | |/| |
| * | | Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.29Vicențiu Ciorbaru2017-01-12168-2428/+10266
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Extra merge commit due to intermediate commits pushed to 10.0 while merge was done.
| | * \ \ Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-01-1215-5/+116
| | |\ \ \ | | | |/ /
| | | * | MDEV-11685: sql_mode can't be set with non-ascii connection charsetNirbhay Choubey2017-01-117-1/+57
| | | | | | | | | | | | | | | | | | | | | | | | | The supplied sql_mode(s) should be converted to ASCII first, before comparing it with the sql_mode set.
| | | * | MDEV-11676 Starting service with mysqld_safe_helper fails in SELINUX ↵Sergei Golubchik2017-01-117-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "enforcing" mode compile, and install selinux policy for mysqld_safe_helper on centos6. the policy was created as described in https://mariadb.com/kb/en/mariadb/what-to-do-if-mariadb-doesnt-start/#other-selinux-changes
| | | * | mysqld_safe: don't close stdout if set -xSergei Golubchik2017-01-101-2/+7
| | | | |
| | * | | Update mysql_secure_installation man pageiangilfillan2017-01-101-4/+68
| | | | |
| | * | | Fix unit test after merge from mysql 5.5.35 perfschemaVicențiu Ciorbaru2017-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem in MariaDB is introduced by this merge commit: c33db2cdc0ab70a874060d58710895f6dac3dea3 The merge comes from mysql and the original author comes from this commit from MySQL: ------------------------------------------------ commit 160b823d146288d66638e4a740d6d2da72f9a689 Author: Marc Alff <marc.alff@oracle.com> Date: Tue Aug 30 12:14:07 2016 +0200 Bug#22551677 SIGNAL 11 IN LF_PINBOX_PUT_PINS Backport to 5.6 ------------------------------------------------ The breaking change is in start_socket_wait_v1 where instead of using m_thread_owner, we make use of my_pthread_getspecific_ptr to fetch a thread local storage value. Unfortunately this invalidates the "m_thread_owner" member when a socket is created. The internals of the socket structure have m_thread_owner set to NULL, but when checking for ownership we actually look at the current thread's key store. This seems incorrect however it is not immediately apparent why. To not diverge from MySQL's reasoning as it is not described what the actual problem was that this commit is trying to fix, I have adjusted the unittest to account for this new behaviour. We destroy the current thread in the unit test, such that the newly created socket actually has no thread owner. The m_thread_owner is untouched in all this.
| | * | | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-01-104-0/+38
| | |\ \ \ | | | |/ /
| | | * | Adding LOAD DATA tests for MDEV-11079 and MDEV-11631Alexander Barkov2017-01-094-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3cf7f47f0f4a1ec314001aaf0c3d9c1c1f62097 reverted the patch for BUG#24487120. After merging the reverting patch from MySQL to MariaDB the problems described in MDEV-11079 and MDEV-11631 disappeared. Adding test cases only.
| | * | | Fix problems from 5.5 mergeVicențiu Ciorbaru2017-01-104-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update mysqld_safe script to remove duplicated parameter --crash-script * Make --core-file-size accept underscores as well as dashes correctly. * Add mysqld_safe_helper to Debian and Ubuntu files. * Update innodb minor version to 35
| | * | | Merge remote-tracking branch 'merge/merge-perfschema-5.6' into 10.0Vicențiu Ciorbaru2017-01-105-64/+129
| | |\ \ \
| | | * | | 5.6.35Vicențiu Ciorbaru2017-01-075-64/+129
| | | | | |
| | | * | | 5.6.34Sergei Golubchik2016-10-250-0/+0
| | | | | |
| | * | | | Merge remote-tracking branch 'merge/merge-innodb-5.6' into 10.0vicentiu2017-01-1012-60/+188
| | |\ \ \ \
| | | * | | | 5.6.35vicentiu2017-01-0712-60/+188
| | | | | | |
| | | * | | | 5.6.34Sergei Golubchik2016-10-250-0/+0
| | | | | | |
| | * | | | | Merge remote-tracking branch 'connect/10.0' into bb-10.0-vicentiuvicentiu2017-01-0655-1866/+8797
| | |\ \ \ \ \
| | | * | | | | Modified version numberOlivier Bertrand2016-12-251-1/+1
| | | | | | | |
| | | * | | | | Merge branch '10.0' of https://github.com/MariaDB/server into ob-10.0Olivier Bertrand2016-12-24429-5418/+12770
| | | |\ \ \ \ \
| | | * | | | | | Fix some XML table type bugs:Olivier Bertrand2016-12-2317-278/+604
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - in DOMNODELIST::DropItem if (Listp == NULL || Listp->length <= n) return true; is wrong, should be: if (Listp == NULL || Listp->length < n) return true; - Crash in discovery with libxml2 in XMLColumns because: if (!tdp->Usedom) // nl was destroyed vp->nl = vp->pn->GetChildElements(g); is executed with vp->pn uninitialized. Fixed by adding: vp->pn = node; line 264. -In discovery with libxml2 some columns are not found. Because list was not recovered properly, nodes being modified and not reallocated. Fixed lines 214 and 277. modified: storage/connect/domdoc.cpp modified: storage/connect/tabxml.cpp Add support for zipped table files modified: storage/connect/domdoc.cpp modified: storage/connect/domdoc.h modified: storage/connect/filamap.cpp modified: storage/connect/filamap.h modified: storage/connect/filamzip.cpp modified: storage/connect/filamzip.h modified: storage/connect/ha_connect.cc modified: storage/connect/libdoc.cpp modified: storage/connect/plgdbutl.cpp modified: storage/connect/plgxml.cpp modified: storage/connect/plgxml.h modified: storage/connect/tabdos.cpp modified: storage/connect/tabdos.h modified: storage/connect/tabfmt.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabxml.cpp
| | | * | | | | | - MDEV-11295: developing handling files contained in ZIP file.Olivier Bertrand2016-12-1410-97/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable using multiple zip files modified: storage/connect/filamzip.cpp modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h modified: storage/connect/mycat.h modified: storage/connect/tabdos.cpp modified: storage/connect/tabdos.h modified: storage/connect/tabfmt.cpp modified: storage/connect/tabjson.cpp
View Lorry Controller Status