summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | MDEV-6951: Erroneous SET STATEMENT produces two identical errorsOleksandr Byelkin2015-03-113-3/+17
|/ / | | | | | | Double error reporting removed.
* | MDEV-7619: Improve long semaphore wait outputJan Lindström2015-03-112-12/+17
| | | | | | | | Add holder thread_id, file_name and line to output.
* | Check for the openssl-dev so the build doesn't fail without it.Alexey Botchkov2015-03-101-0/+1
| |
* | MDEV-7025 ANALYZE SELECT/INSERT/UPDATE/DELETE from a view does not check ↵Vicențiu Ciorbaru2015-03-107-38/+125
| | | | | | | | | | | | access permissions on the view Added access checking for the ANALYZE statement command.
* | Add more information if page state is not correct.Jan Lindström2015-03-102-0/+13
| |
* | 32bit fixSergei Golubchik2015-03-081-2/+2
| |
* | Merge branch '10.1' into bb-10.1-sergSergei Golubchik2015-03-089-67/+189
|\ \
| * | MDEV-7679: ANALYZE crashes when printing WHERE when no default dbSergei Petrunia2015-03-073-1/+47
| | | | | | | | | | | | Fix Item_ident::print() to work when there is no current database
| * | MDEV-7674: ANALYZE shows r_rows=0Sergei Petrunia2015-03-078-66/+142
| | | | | | | | | | | | Change r_rows to be double
* | | bison warning: clash on default action: <NONE> != <object_ddl_options>Sergei Golubchik2015-03-071-1/+1
| | |
* | | add a test for drop trigger under --read-onlySergei Golubchik2015-03-072-0/+7
| | |
* | | MDEV-6819 st_mysql_show_var::value should be void* not char*Sergei Golubchik2015-03-078-182/+185
| | |
* | | fix a crash of innodb.innodb_mutexes,innodb_pluginSergei Golubchik2015-03-071-0/+1
| | | | | | | | | | | | add forgotten initialization of the mutex name
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-07728-9767/+54939
|\ \ \ | |/ / |/| / | |/
| * fix connect.json_udf test for static buildsSergei Golubchik2015-03-061-0/+3
| |
| * MDEV-7669 tmp_table_count-7586 fails in ps and embeddedSergei Golubchik2015-03-061-0/+3
| | | | | | | | disable a broken test, pending a proper fix
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-03-0621-67/+245
| |\
| | * 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-7148 - Recurring: InnoDB: Failing assertion: !lock->recursiveSergey Vojtovich2015-03-054-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-applied lost in the merge revision: commit ed313e8a92a836422b9ae7b9ecf11c44ed4d5d66 Author: Sergey Vojtovich <svoj@mariadb.org> Date: Mon Dec 1 14:58:29 2014 +0400 MDEV-7148 - Recurring: InnoDB: Failing assertion: !lock->recursive On PPC64 high-loaded server may crash due to assertion failure in InnoDB rwlocks code. This happened because load order between "recursive" and "writer_thread" wasn't properly enforced.
| * | GTID: Add missing test of reconnecting into out-of-order binlog.Kristian Nielsen2015-03-052-2/+72
| | |
| * | Merge MDEV-6589 and MDEV-6403 into 10.0.Kristian Nielsen2015-03-0413-16/+667
| |\ \
| * \ \ Merge remote-tracking branch 'origin/10.0' into 10.0Sergei Golubchik2015-03-0222-143/+711
| |\ \ \
| | * \ \ 10.0-connect mergeSergei Golubchik2015-03-0222-143/+711
| | |\ \ \
| | | * | | - Make json_udf test work on WindowsOlivier Bertrand2015-03-021-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/mysql-test/connect/t/json_udf.inc
| | | * | | - Making json_udf test working on linuxOlivier Bertrand2015-03-013-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added: storage/connect/mysql-test/connect/t/json_udf.inc modified: storage/connect/mysql-test/connect/r/json_udf.result storage/connect/mysql-test/connect/t/json_udf.test
| | | * | | - Remove a signed/unsigned warning.Olivier Bertrand2015-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/jsonudf.cpp
| | | * | | - Fix crash when Json_Value was called without arguments.Olivier Bertrand2015-03-0111-46/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct memory calculation in Serialize. Correct some UDF's messages. Add and modify the json tests removed: storage/connect/mysql-test/connect/std_data/biblio.jsn storage/connect/mysql-test/connect/std_data/expense.jsn storage/connect/mysql-test/connect/std_data/mulexp3.jsn storage/connect/mysql-test/connect/std_data/mulexp4.jsn storage/connect/mysql-test/connect/std_data/mulexp5.jsn added: storage/connect/mysql-test/connect/r/json_udf.result storage/connect/mysql-test/connect/std_data/biblio.json storage/connect/mysql-test/connect/std_data/expense.json storage/connect/mysql-test/connect/std_data/mulexp3.json storage/connect/mysql-test/connect/std_data/mulexp4.json storage/connect/mysql-test/connect/std_data/mulexp5.json storage/connect/mysql-test/connect/t/json_udf.test modified: storage/connect/json.cpp storage/connect/jsonudf.cpp storage/connect/mysql-test/connect/r/json.result storage/connect/mysql-test/connect/t/json.test
| | | * | | - Implement random access to ODBC tablesOlivier Bertrand2015-02-289-74/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/odbconn.cpp storage/connect/odbconn.h - Fix get proper length of ODBC DECIMAL column in discovery modified: storage/connect/ha_connect.cc storage/connect/mysql-test/connect/r/odbc_oracle.result - Implement random access to JSON tables modified: storage/connect/tabjson.cpp storage/connect/tabjson.h - Fix MDEV-7636 modified: storage/connect/tabutil.cpp
| | | * | | - FIX assert failure when sorting JSON tablesOlivier Bertrand2015-02-252-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/tabjson.cpp storage/connect/tabjson.h
| | | * | | - Fix MDEV-7616 by adding SQLCOM_SET_OPTION to the accepted command list.Olivier Bertrand2015-02-245-20/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/ha_connect.cc - Add new JSON UDF functions and JSON functionalities. modified: storage/connect/json.cpp storage/connect/json.h storage/connect/jsonudf.cpp storage/connect/tabjson.cpp
| * | | | | MDEV-6391: GTID binlog state not recovered if mariadb-bin.state is removedKristian Nielsen2015-02-273-8/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the server starts up, check if the master-bin.state file was lost. If it was, recover its contents by scanning the last binlog file, thus avoiding running with a corrupt binlog state.
| * | | | | MDEV-7586: Merged derived tables/VIEWs increment created_tmp_tablesVicențiu Ciorbaru2015-02-265-12/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary table count fix. The number of temporary tables was increased when the table is not actually created. (when do_not_open was passed as TRUE to create_tmp_table).
| * | | | | Merge remote-tracking branch 'origin/10.0' into 10.0mariadb-10.0.17Sergei Golubchik2015-02-2510-3/+96
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-7413: optimizer_use_condition_selectivity > 2 crashes ↵Sergey Petrunya2015-02-252-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10.0.15+maria-1~wheezy Add a testcase. The bug itself was fixed by the fix for MDEV-7316.
| | * | | | MDEV-7629 Regression: Bit and hex string literals changed column names in ↵Alexander Barkov2015-02-258-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | 10.0.14
| * | | | | MDEV-7530 !includedir reads files in random orderSergei Golubchik2015-02-251-1/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/10.0' into 10.0Sergei Golubchik2015-02-2414-23/+245
| |\ \ \ \ \ | | |/ / / /
| | * | | | MergeSergei Golubchik2015-02-248-23/+131
| | |\ \ \ \ | | | |/ / /
| | | * | | - Add new Json UDF's Json_Array_Add, Json_Array_Grp and Json_Object_Grp.Olivier Bertrand2015-02-228-23/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle longjmp's raised during json processing. modified: storage/connect/global.h storage/connect/ha_connect.cc storage/connect/json.cpp storage/connect/jsonudf.cpp - Fix wrong references to the suppressed g->Trace variables. modified: storage/connect/global.h storage/connect/plugutil.c storage/connect/tabjson.cpp storage/connect/tabodbc.cpp
| | * | | | MDEV-7623: Add lock wait time and hold time to every record/table lock in Jan Lindström2015-02-244-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InnoDB transaction lock printout.
| | * | | | MDEV-7620: Transaction lock wait is missing number of lock Jan Lindström2015-02-234-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | waits and total wait time.
| * | | | | MDEV-6703 Add "mysqlbinlog --binlog-row-event-max-size" supportSergei Golubchik2015-02-242-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | partially cherry-pick from mysql/5.6. No test case (mysql/5.6 test case is useless, the correct test case uses too much memory) commit e061985813db54948f99892d89f7e076242473a5 Author: <Dao-Gang.Qu@sun.com> Date: Tue Jun 1 15:02:22 2010 +0800 Bug #49931 Incorrect type in read_log_event error Bug #49932 mysqlbinlog max_allowed_packet hard coded to 1GB
| * | | | | fix mroonga to compile w/o performance schemaSergei Golubchik2015-02-242-20/+29
| | | | | |
View Lorry Controller Status