summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-08-25381-3894/+5154
|\
| * MDEV-10604 Create a list of unstable MTR tests to be disabled in ↵mariadb-10.0.27Elena Stepanova2016-08-242-3/+274
| | | | | | | | | | | | | | | | | | | | distribution builds - mysql-test/unstable-tests list is created, it includes = tests identified as unstable by Debian; = tests which failed in buildbot on 10.0 over the last ~6 months and were not fixed; = tests which have been recently modified or newly added - '*' wildcard is now supported in skip lists
| * MDEV-10341: InnoDB: Failing assertion: mutex_own(mutex) - mutex_exit_funcVicențiu Ciorbaru2016-08-232-18/+2
| | | | | | | | | | | | | | Followup from 5.5 patch. Removing memory barriers on intel is wrong as this doesn't prevent the compiler and/or processor from reorganizing reads before the mutex release. Forcing a memory barrier before reading the waiters will guarantee that no speculative reading takes place.
| * MDEV-10563 Crash during shutdown in Master_info_index::any_slave_sql_runningVicențiu Ciorbaru2016-08-235-19/+26
| | | | | | | | | | | | | | | | | | In well defined C code, the "this" pointer is never NULL. Currently, we were potentially dereferencing a NULL pointer (master_info_index). GCC v6 removes any "if (!this)" conditions as it assumes this is always a non-null pointer. In order to prevent undefined behaviour, check the pointer before dereferencing and remove the check within member functions.
| * Fixed compiler error and some warnings on windowsMonty2016-08-236-7/+7
| |
| * Minor cleanupsMonty2016-08-222-3/+1
| | | | | | | | | | - Remove impossible test in test_quick_select - Ensure that is_fatal_error is set if we run out of stack space
| * MDEV-10630 rpl.rpl_mdev6020 fails in buildbot with timeoutMonty2016-08-225-10/+29
| | | | | | | | | | | | | | | | | | | | The issue was that when running with valgrind the wait for master_pos_Wait() was not long enough. This patch also fixes two other failures that could affect rpl_mdev6020: - check_if_conflicting_replication_locks() didn't properly check domains - 'did_mark_start_commit' was after signals to other threads was sent which could get the variable read too early.
| * Fixed "Packets out of order" warning message on stdout in clients,Monty2016-08-216-36/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compiled for debugging, when the server goes down This happens in the following scenario: - Server gets a shutdown message - Servers sends error ER_CONNECTION_KILLED to the clients connection - The client sends a query to the server, before the server has time to close the connection to the client - Client reads the ER_CONNECTION_KILLED error message In the above case, the packet number for the reply is one less than what the client expected and the client prints "Packets out of order". Fixed the following way: - The client accepts now error packages with a packet number one less than expected. - To ensure that this issue can be detected early in my_real_read(), error messages sent to the client are not compressed, even when compressed protocol is used.
| * Added new status variables to make it easier to debug certain problems:Monty2016-08-2148-99/+329
| | | | | | | | | | | | - Handler_read_retry - Update_scan - Delete_scan
| * Cleanups and minor fixesMonty2016-08-217-23/+42
| | | | | | | | | | | | | | | | - Fixed typos - Added --core-on-failure to mysql-test-run - More DBUG_PRINT in viosocket.c - Don't forget CLIENT_REMEMBER_OPTIONS for compressed slave protocol - Removed not used stage variables
| * MDEV-10559: main.mysql_client_test_nonblock crashes in buildbot on 10.0Oleksandr Byelkin2016-08-163-5/+10
| | | | | | | | fix for async operations
| * MDEV-10559: main.mysql_client_test_nonblock crashes in buildbot on 10.0Oleksandr Byelkin2016-08-151-4/+5
| | | | | | | | Fix tests which possibly fail connects in non_blocking mode.
| * Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2016-08-14291-3643/+4158
| |\
| | * after merge fixesSergei Golubchik2016-08-101-0/+56
| | |
| | * Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-08-1034-1708/+962
| | |\ | | | | | | | | | | | | 1.04.0008
| | | * - JdbcInterface: change return type of ...Field functionOlivier Bertrand2016-08-107-33/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/JdbcInterface.java - Change Version number and date modified: storage/connect/ha_connect.cc - Implement the test on connect_type_conv YES/NO modified: storage/connect/jdbconn.cpp modified: storage/connect/odbconn.cpp - Fix MDEV-10520. Local schema was confused with remote schema modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabodbc.cpp - Fix crash when using mapped indices. Was trying to write in a mapped file declared as read only. modified: storage/connect/xindex.cpp
| | | * Change jdbc test to reflect girls.txt LF endingOlivier Bertrand2016-07-152-2/+2
| | | |
| | | * All changes made on 10.1 for last 11 commitsOlivier Bertrand2016-07-1433-1677/+910
| | | |
| | * | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-08-1035-79/+153
| | |\ \ | | | | | | | | | | | | | | | 5.6.31-77.0
| | | * | 5.6.31-77.0Sergei Golubchik2016-08-1035-79/+153
| | | | |
| | * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-10147-1555/+1623
| | |\ \ \ | | | | | | | | | | | | | | | | | | 5.6.31-77.0
| | | * | | 5.6.31-77.0Sergei Golubchik2016-08-10149-1564/+1631
| | | | | |
| | * | | | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2016-08-102-6/+12
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 5.6.32
| | | * | | | 5.6.32Sergei Golubchik2016-08-101-5/+11
| | | | | | |
| | * | | | | Merge branch 'merge/merge-innodb-5.6' into 10.0Sergei Golubchik2016-08-108-22/+108
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5.6.32
| | | * | | | | 5.6.32Sergei Golubchik2016-08-107-21/+107
| | | | | | | |
| | * | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-08-1064-273/+1244
| | |\ \ \ \ \ \
| | | * | | | | | MDEV-10341: InnoDB: Failing assertion: mutex_own(mutex) - mutex_exit_funcmariadb-5.5.51Vicențiu Ciorbaru2016-08-094-18/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix memory barrier issues on releasing mutexes. We must have a full memory barrier between releasing a mutex lock and reading its waiters. This prevents us from missing to release waiters due to reading the number of waiters speculatively before releasing the lock. If threads try and wait between us reading the waiters count and releasing the lock, those threads might stall indefinitely. Also, we must use proper ACQUIRE/RELEASE semantics for atomic operations, not ACQUIRE/ACQUIRE.
| | | * | | | | | MDEV-10465 general_log_file can be abusedSergei Golubchik2016-08-095-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows!
| | | * | | | | | MDEV-6128:[PATCH] mysqlcheck wrongly escapes '.' in table namesSergei Golubchik2016-08-083-44/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a correct fix: * store properly quoted table names in tables4repair/etc lists * tell handle_request_for_tables whether the name is aalready properly quoted * test cases for all uses of fix_table_name()
| | | * | | | | | MDEV-10465 general_log_file can be abusedSergei Golubchik2016-08-085-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | followup
| | | * | | | | | MDEV-9304: MariaDB crash with specific queryVicențiu Ciorbaru2016-08-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tmp_join may get its tables freed twice during JOIN cleanup. Set them to NULL when the tmp_join is different than the current join.
| | | * | | | | | MDEV-10468 Assertion `nr >= 0.0' failed in Item_sum_std::val_real()Alexander Barkov2016-08-083-0/+20
| | | | | | | | |
| | | * | | | | | MDEV-10500 CASE/IF Statement returns multiple values and shifts further ↵Alexander Barkov2016-08-083-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | result values to the next column We assume all around the code that null_value==true is in sync with NULL value returned by val_str()/val_decimal(). Item_sum_sum::val_decimal() erroneously returned a non-NULL value together with null_value set to true. Fixing to return NULL instead.
| | | * | | | | | MDEV-10506 Protocol::end_statement(): Assertion `0' failed upon ALTER TABLESergei Golubchik2016-08-073-1/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thd->clear_error() destroyed already existing error status
| | | * | | | | | MDEV-9946: main.xtradb_mrr fails sporadicallySergei Petrunia2016-08-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the testcase stable by adding FORCE INDEX
| | | * | | | | | Merge branch 'bb-5.5-serg' into 5.5Sergei Golubchik2016-08-0428-100/+474
| | | |\ \ \ \ \ \
| | | | * | | | | | MDEV-10465 general_log_file can be abusedSergei Golubchik2016-08-035-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue was discovered by Dawid Golunski (http://legalhackers.com)
| | | | * | | | | | trivial cleanupSergei Golubchik2016-08-031-4/+6
| | | | | | | | | |
| | | | * | | | | | MDEV-10350 "./mtr --report-features" doesn't workSergei Golubchik2016-08-032-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed
| | | | * | | | | | MDEV-7329 plugins.pam_cleartext fails sporadically in buildbotSergei Golubchik2016-08-032-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wait until the failed connection thread completely dies before uninstalling pam plugin
| | | | * | | | | | improve pam_cleartext.test a bitSergei Golubchik2016-08-032-2/+15
| | | | | | | | | |
| | | | * | | | | | Merge branch 'merge/merge-xtradb-5.5' into 5.5Sergei Golubchik2016-08-034-21/+35
| | | | |\ \ \ \ \ \
| | | | | * | | | | | 5.5.50-38.0Sergei Golubchik2016-08-034-21/+35
| | | | | | | | | | |
| | | | * | | | | | | MDEV-6581 Writing to TEMPORARY TABLE not possible in read-onlySergei Golubchik2016-08-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't mark transactions read-write if no real storage engine is affected (only binlog writes).
| | | | * | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-08-0313-41/+373
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without a fix for Bug#12818255 (MDEV-6581)
| | | | | * | | | | | | Bug#23736787 - YUM UPDATE FAIL FROM 5.5.51(COMUNITY/COMMERCIAL) TO ↵mysql-5.5.51Balasubramanian Kandasamy2016-07-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5.6.32(COMUNITY/COMMERCIAL) Remove mysql_config from client sub-package (cherry picked from commit 45c4bfa0f3f1c70756591f48710bb3e76ffde9bc)
| | | | | * | | | | | | BUG#23080148 - BACKPORT BUG 14653594 AND BUG 20683959 TOThayumanavar S2016-06-204-30/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MYSQL-5.5 The bug asks for a backport of bug#1463594 and bug#20682959. This is required because of the fact that if replication is enabled, master transaction can commit whereas slave can't commit due to not exact 'enviroment'. This manifestation is seen in bug#22024200.
| | | | | * | | | | | | BUG#17903583 MYSQL-COMMUNITY-SERVER SHOULD NOT DEPEND ON ↵Terje Rosten2016-06-172-45/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MYSQL-COMMUNITY-CLIENT (#70985) Fix is a backport of BUG#18518216/72230 to MySQL 5.5 and 5.6. Will also resolve: BUG#23605713/81384 LIBMYSQLCLIENT.SO.18 MISSING FROM MYSQL 5.7 as mysql-community-libs-5.5 or mysql-community-libs-5.6 can installed on EL6 system with libmysqlclient.16 (from MySQL 5.1) libmysqlclient.20 (from MySQL 5.7) by doing: $ rpm --oldpackage -ivh mysql-community-libs-5.5.50-2.el6.x86_64.rpm Providing a way to have several versions of libmysqlclient installed on the same system. and help: BUG#23088014/80981 LIBS-COMPAT RPMS SHOULD BE INDEPENDENT OF ALL OTHER SUBPACKAGES due to less strict coupling between -libs-compat and -common package.
| | | | | * | | | | | | Bug#23498283 - BUFFER OVERFLOWShishir Jaiswal2016-06-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DESCRIPTION =========== Buffer overflow is reported in Regex library. This can be triggered when the data corresponding to argv[1] is >= 512 bytes resutling in abnormal behaviour. ANALYSIS ======== Its a straight forward case of SEGFAULT where the target buffer is smaller than the source string to be copied. A simple pre-copy validation should do. FIX === A check is added before doing strcpy() to ensure that the target buffer is big enough to hold the to-be copied data. If the check fails, the program aborts.