summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix failing test cases for MDEV-7912 patch.bb-5.5-mdev-7912Vicentiu Ciorbaru2015-04-293-17/+11
|
* MDEV-7912 multitable delete with wrongly set sort_buffer_size crashes in ↵Vicentiu Ciorbaru2015-04-283-6/+45
| | | | | | | | merge_buffers Fixed overflow error that caused fewer bites to be allocated than necessary on Windows 64 bit. This is due to ulong being 32 bit on 64 bit Windows and 64 bit on 64 bit Linux.
* Merge remote-tracking branch 'openquery/MDEV-8060-shm-path' into 5.5Sergei Golubchik2015-04-271-2/+2
|\
| * /run/shm is the general replacement for /dev/shm in newer distrosDaniel Black2015-04-271-2/+2
| |
* | MDEV-7434 XtraDB does not build on SolarisSergei Golubchik2015-04-271-1/+1
| |
* | MDEV-7938 MariaDB Crashes Suddenly while writing binlogsSergei Golubchik2015-04-273-1/+26
| | | | | | | | | | | | | | on disconnect THD must clean user_var_events array before dropping temporary tables. Otherwise when binlogging a DROP, it'll access user_var_events, but they were allocated in the already freed memroot.
* | MDEV-7883 Segmentation failure when running mysqladmin -u root -pSergei Golubchik2015-04-272-0/+9
| | | | | | | | | | take into account that argc can be 0 (if there were no commands on the command line)
* | MDEV-7859 SSL hostname verification fails for long subject namesSergei Golubchik2015-04-2711-537/+439
| | | | | | | | | | | | | | | | Don't use a fixed buffer for X509_NAME_oneline() in the client. Do as the server does - allocate it dynamically. For a test - regenerate certificates to have the server cert with a long subject.
* | MDEV-7585 Assertion `thd->is_error() || kill_errno || thd->killed == ↵Sergei Golubchik2015-04-273-0/+25
| | | | | | | | | | | | | | | | ABORT_QUERY' failed in ha_rows filesort if we clear the error status (in THD::clear_error()) make sure to clear the thd->killed == KILL_BAD_DATA too, because it was caused by the error that we're clearing.
* | MDEV-6870 Not possible to use FIFO file as a general_log fileSergei Golubchik2015-04-273-14/+21
| | | | | | | | | | | | | | Remove the too restrictive bugfix for bug#67088. FIFO can be used for general/slow logs, but lseek() and fsync() on FIFO fail. And open() needs to be non-blocking, in case the other end isn't reading.
* | bug: crash when sync() or close() of a log file fails on shutdownSergei Golubchik2015-04-271-2/+2
| | | | | | | | because current_thd is NULL and ER() causes sigsegv
* | bug: debug assert crash when seek on log file failsSergei Golubchik2015-04-271-5/+9
| |
* | MDEV-8058: funcs_1.innodb_views and funcs_1.memory_views failOleksandr Byelkin2015-04-271-3/+5
|/ | | | The double call of ref used tables fixed.
* MDEV-7126 replication slave - deadlock in terminate_slave_thread with stop ↵Sergei Golubchik2015-04-263-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slave and show variables of replication filters and show global status Three-way deadlock: T1: SHOW GLOBAL STATUS -> acquire LOCK_status T2: STOP SLAVE -> acquire LOCK_active_mi -> terminate_slave_thread() -> -> cond_timedwait for handle_slave_sql to stop T3: sql slave thread (same applies to io thread) -> handle_slave_sql(), when exiting -> -> THD::add_status_to_global() -> -> -> wait for LOCK_status... T1: SHOW GLOBAL STATUS -> for "Slave_heartbeat_period" status variable -> -> show_heartbeat_period() -> -> -> wait for LOCK_active_mi cherry-pick from 5.6: commit fc8b395898f40387b3468122bd0dae31e29a6fde Author: Venkatesh Duggirala <venkatesh.duggirala@oracle.com> Date: Wed Jun 12 21:41:05 2013 +0530 BUG#16904035-SHOW STATUS - EXCESSIVE LOCKING ON LOCK_ACTIVE_MI AND ACTIVE_MI->RLI->DATA_LOCK Problem: Excessive locking on lock_active_mi and rli->data_lock while executing any `show status like 'X'` command. Analysis: SHOW_FUNCs for Slave_running, Slave_retried_transactions, Slave_heartbeat_period, Slave_received_heartbeats, Slave_last_heartbeat are acquiring lock_active_mi and rli->data_lock to show their variable value. It is ok to show stale data while showing the status variables i.e., even if they miss one update, it will not cause any great trouble. Fix: Remove the locks from the above mentioned SHOW_FUNC functions. Add a test case
* Merge pull request #39 from ↵Kristian Nielsen2015-04-241-0/+4
|\ | | | | | | | | openquery/MDEV-7977-mutex-unlock_LOCK_log-in-MYSQL_BIN_LOG_write_incident MDEV-7977 MYSQL_BIN_LOG::write_incident failing to release LOCK_log
| * MDEV-7977 MYSQL_BIN_LOG::write_incident failing to release LOCK_logDaniel Black2015-04-111-0/+4
| | | | | | | | This adds a unlock(LOCK_log) for the unlikely(!is_open()) branch
* | MDEV-7649 wrong result when comparing utf8 column with an invalid literalAlexander Barkov2015-04-248-1/+1431
| |
* | Testcase for: MDEV-7893 table_elimination works wrong ...Sergei Petrunia2015-04-232-0/+63
| |
* | MDEV-6892: WHERE does not applyOleksandr Byelkin2015-04-235-35/+83
| | | | | | | | | | | | | | | | Taking into account implicit dependence of constant view field from nullable table of left join added. Fixed finding real table to check if it turned to NULL (materialized view & derived taken into account) Removed incorrect uninitialization.
* | MDEV-8018: main.multi_update fails with --ps-protocolOleksandr Byelkin2015-04-227-11/+47
| | | | | | | | | | | | save_prep_leaf_tables() made recursive to work with underlying view Arena restoiring fixed in case of EOM.
* | MDEV-7911: crash in Item_cond::eval_not_null_tablesSergei Petrunia2015-04-214-9/+56
| | | | | | | | | | | | convert_subq_to_sj() must check the results of in_equality->fix_fields() call. It can fail in a meaningful way when e.g. we're trying to compare columns with incompatible collations.
* | tokuftdump: Install to ${INSTALL_BINDIR} instead of binSergei Golubchik2015-04-201-1/+1
| | | | | | | | | | Cherry-picking https://github.com/olesalscheider/server/commit/fc4df415049271ef625783c31f2999e7d1bdc816 (it was a 10.1 pull request, we want it in 5.5)
* | Increase the version numberElena Stepanova2015-04-191-1/+1
| |
* | Merge pull request #41 from MariaDB/5.5-MDEV-7820Vicențiu-Marian Ciorbaru2015-04-153-1/+31
|\ \ | | | | | | MDEV-7820 Server crashes in in my_strcasecmp_utf8 on subquery in ORDER B...
| * | MDEV-7820 Server crashes in in my_strcasecmp_utf8 on subquery in ORDER BY ↵5.5-MDEV-7820Vicențiu Ciorbaru2015-04-153-1/+31
| |/ | | | | | | | | | | | | | | | | clause of GROUP_CONCAT It is possible for Item_field to have a NULL field_name. This is true if the Item_field is created based on a field in a temporary table that has no name. It is thus necessary to do a null check before attempting a strcmp.
* | MDEV-7814 Assertion `args[0]->fixed' fails in ↵Alexander Barkov2015-04-153-1/+16
| | | | | | | | | | | | Item_func_conv_charset::Item_func_conv_charset Removing a wrong assertion.
* | MDEV-7613: MariaDB 5.5.40 server crash on update table left join with a viewOleksandr Byelkin2015-04-153-3/+390
|/ | | | Multi-update do not need full list of leaf tables. It also do not use it on prepare (mysql_multi_update_prepare()).
* MDEV-7596 audit plugin - record full query / document line length / make ↵Alexey Botchkov2015-03-313-28/+166
| | | | | | | buffer configurable. The serve_audit_query_log_limit variable implemented. Also QUERY_DCL filter added.
* MDEV-7858: main.subselect_sj2_jcl6 fails in buildbotSergei Petrunia2015-03-301-0/+9
| | | | Update test results after the patch for MDEV-7474.
* MDEV-7301: Unknown column quoted with backticks in HAVING clauseJan Lindström2015-03-233-1/+67
| | | | | | | | when using function. Merged upstream fix to Bug#16221433 MYSQL REJECTS QUERY DUE TO BAD RESOLUTION OF NAMES IN HAVING; VIEW UNREADABLE authored by Guilhem Bichot <guilhem.bichot@oracle.com>.
* MDEV-7682 Incorrect use of SPATIAL KEY for query planVicențiu Ciorbaru2015-03-202-2/+10
| | | | | | | If the spatial key is used within an equality comparison, the comparison does not produce relevant results generally as identical geometry can be stored differently. Still, we want to support the operation. In order to allow a hash join plan, we must define a key_length for Field_geom.
* MDEV-7641 Server crash on set global server_audit_incl_users=null.Alexey Botchkov2015-03-193-7/+16
| | | | | plugin_variable_update() can get NULL as a value for a string parameter. Needs to be checked and handled properly.
* MDEV-7474: Semi-Join's DuplicateWeedout strategy skipped ...Sergei Petrunia2015-03-178-16/+341
| | | | | | | | | | JOIN::cur_dups_producing_tables was not maintained correctly in the cases of greedy optimization (search_depth < n_tables). Moved it to POSITION structure where it will be maintained automatically. Removed POSITION::prefix_dups_producing_tables since its value can now be calculated.
* MDEV-7692 MariaDB - mysql-test - SUITE:percona - percona.innodb_sys_index ↵Elena Stepanova2015-03-122-4/+0
| | | | | | | | 'xtradb' fails - @@version_comment The test checked version_comment which is not helpful, and it would cause the mismatch on any build apart from default source builds. Fixed by removing the check
* MDEV-7643 MTR creates nested links when tests are run with --memElena Stepanova2015-03-091-18/+6
| | | | | | | | 1) fix 5.5.42 vs 5.5.41 problem, nested links; 2) fix older MariaDB vs MySQL problem, var_auto_** dirs were not removed from the tmpfs location. Both problems were caused by vardir being expanded to real path too early, in two different places in the script code
* after innodb/xtradb merge: use the correct visibility for internal functionsSergei Golubchik2015-03-062-2/+2
| | | | | otherwise innodb plugin might invoke xtradb function with the same name, and that might crash (./mtr --emb innodb.strict_mode)
* MDEV-6838 Using too big key for internal temp tablesSergei Golubchik2015-03-066-29/+29
| | | | update test results after the fix
* MDEV-7659 buildbot may leave stale mysqldSergei Golubchik2015-03-061-5/+13
| | | | | | | | | | | | | | | safe_process puts its children (mysqld, in this case) into a separate process group, to be able to kill it all at once. buildslave kills mtr's process group when it loses connection to the master. result? buildslave kills mtr and safe_process, but leaves stale mysqld processes in their own process groups. fix: put safe_process itself into a separate process group, then buildslave won't kill it and safe_process will kill mysqld'd and itself when it will notice that the parent mtr no longer exists.
* MDEV-7672: Crash creating an InnoDB table with foreign keysJan Lindström2015-03-064-12/+96
| | | | | | | | | Analysis: after a red-black-tree lookup we use node withouth checking did lookup succeed or not. This lead to situation where NULL-pointer was used. Fix: Add additional check that found node from red-back-tree is valid.
* MDEV-7578 :Slave is ~10x slower to execute set of statements compared to ↵Jan Lindström2015-03-052-12/+22
| | | | | | | | | | | | | | master when using RBR Analysis: On master when executing (single/multi) row INSERTs/REPLACEs InnoDB fallback to old style autoinc locks (table locks) only if another transaction has already acquired the AUTOINC lock. Instead on slave as we are executing log_events and sql_command is not correctly set, InnoDB does not use new style autoinc locks when it could. Fix: Use new style autoinc locks also when thd_sql_command(user_thd) == SQLCOM_END i.e. this is RBR event.
* MDEV-6838: Using too big key for internal temp tablesVicențiu Ciorbaru2015-02-286-12/+62
| | | | | | | | | | | This bug manifests due to wrong computation and evaluation of keyinfo->key_length. The issues were: * Using table->file->max_key_length() as an absolute value that must not be reached for a key, while it represents the maximum number of bytes possible for a table key. * Incorrectly computing the keyinfo->key_length size during KEY_PART_INFO creation. The metadata information regarding the key such the field length (for strings) was added twice.
* update tokudb version after mergeSergei Golubchik2015-02-271-1/+1
|
* MDEV-7310: last_commit_pos_offset set to wrong value after binlog rotate in ↵bb-5.5-knielsenKristian Nielsen2015-02-233-2/+44
| | | | | | | | | | group commit When the binlog was rotated due to @@max_binlog_size, the values of the binlog_shapshot_file and binlog_snapshot_position were inconsistent in case of non-transactional DML. The position was refering to the old file, while the filename was of the new file after rotation. This patch makes them consistent by making sure the position is also refering to the new file.
* MDEV-7419 Function cli_safe_read not exportedmariadb-5.5.42Sergei Golubchik2015-02-134-0/+28
| | | | | | Start the client API for low-level protocol access: * unsigned long mysql_net_read_packet(MYSQL *mysql); * unsigned long mysql_net_field_length(unsigned char **packet);
* Merge remote-tracking branch 'bzr/5.5' into bb-5.5-mergeSergei Golubchik2015-02-1243-78/+1447
|\
| * XtraDB 5.5.41-37.0Sergei Golubchik2015-02-1111-18/+128
| |\
| | * percona-server-5.5.41-37.0Sergei Golubchik2015-02-1111-19/+131
| | |
| * | MDEV-7290 please update MSI installer to include HeidiSQL 9.1Sergei Golubchik2015-02-112-2/+28
| | |
| * | restore a cross-compiling bit that was lost in a mergeSergei Golubchik2015-02-101-0/+5
| | |
| * | MDEV-7478 log-basename unpredictable behavior in standalone modeSergei Golubchik2015-02-092-2/+15
| | | | | | | | | | | | | | | * fix /etc/init.d/mysql to use log-basename for pid-filename * fix mysqld_safe not to force logging-to-file when log-basename is specified