summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-8989 ORDER BY optimizer ignores equality propagationSergei Golubchik2016-07-013-9/+36
| | | | Restore the fix from the commit 99cd5a9 that was lost in a merge.
* Post-merge: Update test resultsNirbhay Choubey2016-06-309-15/+26
|
* Merge branch '10.1' into 10.2Sergei Golubchik2016-06-30993-14781/+58981
|\
| * update tests for 32bitSergei Golubchik2016-06-291-2/+2
| |
| * valgrind.supp: fix a typoSergei Golubchik2016-06-291-0/+1
| |
| * MDEV-10054 Secure login fails when CIPHER is requiredSergei Golubchik2016-06-283-0/+13
| | | | | | | | | | SSL: do not require client certificate to exist, if GRANT didn't require that
| * Merge remote-tracking branch 'refs/remotes/github/10.1' into 10.1Sergei Golubchik2016-06-282-0/+28
| |\
| | * Output more information when assertionJan Lindström2016-06-282-0/+28
| | | | | | | | | | | | | | | | | | ut_a(state == BUF_BLOCK_NOT_USED || state == BUF_BLOCK_REMOVE_HASH); is hit.
| * | Merge branch 'connect/10.1' into 10.1Sergei Golubchik2016-06-2814-630/+844
| |\ \
| | * | - Add column pattern and table type argument to catalog tablesOlivier Bertrand2016-06-2011-61/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/ha_connect.cc modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/odbccat.h modified: storage/connect/odbconn.cpp modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjdbc.h modified: storage/connect/tabodbc.cpp modified: storage/connect/tabodbc.h - Avoid longjump in AllocCatInfo functions modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/odbconn.cpp - Change GetColumns error return value from 0 to -1 modified: storage/connect/JdbcInterface.class modified: storage/connect/JdbcInterface.java
| | * | Merge branch '10.1' of https://github.com/MariaDB/server into ob-10.1Olivier Bertrand2016-06-2058-195/+17455
| | |\ \
| | * | | - Possibly fix MDEV-10179 Reset remote tables when re-openingOlivier Bertrand2016-06-137-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/tabtbl.cpp - Add trace and make m_Stmt conditional modified: storage/connect/myconn.cpp modified: storage/connect/myconn.h - Protect trace from null string (for Linux) modified: storage/connect/tabcol.cpp - Record error changes modified: storage/connect/mysql-test/connect/r/jdbc_new.result - Typo modified: storage/connect/jdbconn.cpp modified: storage/connect/jsonudf.cpp
| | * | | - Fix MDEV-10111 Reconize unsigned integers when creating tables via srcdefOlivier Bertrand2016-06-024-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/ha_connect.cc modified: storage/connect/myconn.cpp - Fix MDEV-10136 crash on SELECT jsonget_string(NULL, 'a') modified: storage/connect/jsonudf.cpp - Assert longjmp initialized when suballocating modified: storage/connect/plugutil.c - Avoid crash in MakeRecord when table->vcol_set isnull (trace > 1) modified: storage/connect/ha_connect.cc
| | * | | - Reconize the JDBC type -7 (BIT)Olivier Bertrand2016-05-2623-737/+1153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/jdbconn.cpp - Add the global variable connect_java_wrapper This enables to use different wrappers modified: storage/connect/CMakeLists.txt renamed: storage/connect/java/ap/JdbcInterface.class -> storage/connect/JdbcApacheInterface.class renamed: storage/connect/java/ap/JdbcInterface.java -> storage/connect/JdbcApacheInterface.java renamed: storage/connect/java/ds/JdbcInterface.class -> storage/connect/JdbcDSInterface.class renamed: storage/connect/java/ds/JdbcInterface.java -> storage/connect/JdbcDSInterface.java modified: storage/connect/ha_connect.cc deleted: storage/connect/java/std/JdbcInterface.class deleted: storage/connect/java/std/JdbcInterface.java modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h - Add JDBC tests (disabled) modified: storage/connect/mysql-test/connect/disabled.def new file: storage/connect/mysql-test/connect/r/jdbc.result new file: storage/connect/mysql-test/connect/r/jdbc_new.result new file: storage/connect/mysql-test/connect/r/jdbc_oracle.result new file: storage/connect/mysql-test/connect/r/jdbc_postgresql.result new file: storage/connect/mysql-test/connect/std_data/girls.txt new file: storage/connect/mysql-test/connect/t/jdbc.test new file: storage/connect/mysql-test/connect/t/jdbc_new.test new file: storage/connect/mysql-test/connect/t/jdbc_oracle.test new file: storage/connect/mysql-test/connect/t/jdbc_postgresql.test new file: storage/connect/mysql-test/connect/t/jdbconn.inc new file: storage/connect/mysql-test/connect/t/jdbconn_cleanup.inc - Typo modified: storage/connect/jsonudf.cpp
| | * | | - Fix failing json_udf_bin test when --psOlivier Bertrand2016-05-242-42/+240
| | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/jsonudf.cpp modified: storage/connect/mysql-test/connect/disabled.def
| | * | | - Alternative versions of the java JdbcInterfaceOlivier Bertrand2016-05-246-0/+2164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of them (ap/ds) enable connection to a DataSource added 'storage/connect/java/ap/JdbcInterface.class' added 'storage/connect/java/ap/JdbcInterface.java' added 'storage/connect/java/ds/JdbcInterface.class' added 'storage/connect/java/ds/JdbcInterface.java' added 'storage/connect/java/std/JdbcInterface.class' added 'storage/connect/java/std/JdbcInterface.java'
| | * | | - New version of the java JdbcInterfaceOlivier Bertrand2016-05-233-78/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/JdbcInterface.class modified: storage/connect/JdbcInterface.java - Ignore *.tlog and .res files modified: .gitignore
| | * | | Merge branch '10.1' of https://github.com/MariaDB/server into ob-10.1Olivier Bertrand2016-05-225093-321325/+782186
| | |\ \ \
| | * | | | - Fix wrong return from ExecuteQueryOlivier Bertrand2016-05-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/jdbconn.cpp - Suppress GCC warning modified: storage/connect/tabjdbc.cpp
| | * | | | - JDBC using separate jmethodID for data typesOlivier Bertrand2016-05-212-35/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some DEBUG tests modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h
| | * | | | - JDBC tables can be connected via foreign server wrapperOlivier Bertrand2016-05-205-297/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redesign the handling of errors and exceptions modified: storage/connect/ha_connect.cc modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjdbc.h
| | * | | | - Remove REQUIRED option that caused compilation to failOlivier Bertrand2016-05-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove JVM_LIBRARY (is now dynamically loaded at run time) modified: storage/connect/CMakeLists.txt
| | * | | | - Fix some typo ... causing crash!Olivier Bertrand2016-05-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/jdbconn.cpp
| | * | | | - Continue working on the JDBC table typeOlivier Bertrand2016-05-129-141/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress the jpath option add the connect_jvm_path and connect_class_path global variables modified: storage/connect/ha_connect.cc modified: storage/connect/jdbccat.h modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjdbc.h - Add the envar UDF modified: storage/connect/jsonudf.cpp modified: storage/connect/jsonudf.h - Fix MDEV-9950 modified: storage/connect/ha_connect.cc modified: storage/connect/plgdbutl.cpp
| | * | | | - Make the JVM lib dynamically loadedOlivier Bertrand2016-05-094-112/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the CONNECT storage engine usable when Java JDK is not installed. modified: storage/connect/ha_connect.cc modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h - Typo modified: storage/connect/reldef.cpp
| | * | | | - Remove gcc compiling errors and warningsOlivier Bertrand2016-05-062-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/jdbconn.cpp modified: storage/connect/tabjdbc.h
| | * | | | - Try to fix MDEV-9950 (not tested yet)Olivier Bertrand2016-05-059-81/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/ha_connect.cc modified: storage/connect/plgdbutl.cpp - Fix Mdev-9997 (Sergey Vojtovitch) modified: storage/connect/inihandl.c - Try to have the JDBC type compiled by CMake modified: storage/connect/CMakeLists.txt - Fixing some bugs in the JDBC table type Use the CONNECTION option for the URL modified: storage/connect/ha_connect.cc modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/tabjdbc.cpp - Add the JdbcInterface.class to the project new file: storage/connect/JdbcInterface.class
| | * | | | - Add the JdbcInterface.java to the projectOlivier Bertrand2016-04-272-0/+641
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added: storage/connect/JdbcInterface.java - Add *.java to be handled modified: .gitattributes
| | * | | | - Add the JDBC table type compilation for CMAKE.Olivier Bertrand2016-04-272-55/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/CMakeLists.txt - Fix MDEV-9993 modified: storage/connect/jsonudf.cpp
| * | | | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-06-285-0/+76
| |\ \ \ \ \
| | * | | | | Fix memory leak in XtraDB.Nirbhay Choubey2016-06-273-2/+3
| | | | | | |
| | * | | | | Fix galera,wsrep tests.Nirbhay Choubey2016-06-264-0/+9
| | | | | | |
| | * | | | | Fix build failure.Nirbhay Choubey2016-06-241-1/+1
| | | | | | |
| | * | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2016-06-240-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50Nirbhay Choubey2016-06-23116-977/+1645
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-24673-12629/+35419
| | |\ \ \ \ \ \ \
| | * | | | | | | | MDEV-9083: Slave IO thread does not handle autoreconnect to restarting ↵Nirbhay Choubey2016-06-124-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Galera Cluster node Chery-picked commits from codership/mysql-wsrep. MW-284: Slave I/O retry on ER_COM_UNKNOWN_ERROR Slave would treat ER_COM_UNKNOWN_ERROR as fatal error and stop. The fix here is to treat it as a network error and rely on the built-in mechanism to retry. MW-284: Add an MTR test
| * | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-28654-12380/+30522
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-06-282-42/+50
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | MDEV-10050: Crash in subselectOleksandr Byelkin2016-06-242-42/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thd should not be taken earlier then fix_field and reset on fix_fields if it is needed.
| | | * | | | | | | | MDEV-10083: Orphan ibd file when playing with foreign keysJan Lindström2016-06-2314-32/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analysis: row_drop_table_for_mysql did not allow dropping referenced table even in case when actual creating of the referenced table was not successfull if foreign_key_checks=1. Fix: Allow dropping referenced table even if foreign_key_checks=1 if actual table create returned error.
| | * | | | | | | | | remove incorrect .gitattributesSergei Golubchik2016-06-281-25/+0
| | | | | | | | | | |
| | * | | | | | | | | bump the VERSIONDaniel Bartholomew2016-06-241-1/+1
| | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Fixed testcase check failure after db938.testmariadb-10.0.26Sergey Vojtovich2016-06-232-0/+2
| | | | | | | | | |
| | * | | | | | | | MDEV-9728 - Hard crash in metadata_lock_infoSergey Vojtovich2016-06-236-49/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable output of MDL lock duration since there is no facility to retreive it properly.
| | * | | | | | | | MDEV-9728 - Hard crash in metadata_lock_infoSergey Vojtovich2016-06-232-115/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverted APC based fix. APC subsystem is not ready to serve metadata_lock_info needs.
| | * | | | | | | | Merge following commit from 5.5:Jan Lindström2016-06-2316-42/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit ef92aaf9ece92c873ae0f3448ab2274c958ba3fe Author: Jan Lindström <jan.lindstrom@mariadb.com> Date: Wed Jun 22 22:37:28 2016 +0300 MDEV-10083: Orphan ibd file when playing with foreign keys Analysis: row_drop_table_for_mysql did not allow dropping referenced table even in case when actual creating of the referenced table was not successfull if foreign_key_checks=1. Fix: Allow dropping referenced table even if foreign_key_checks=1 if actual table create returned error.
| | * | | | | | | | compilation failuresSergei Golubchik2016-06-222-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | windows: use GetProcAddress() to access internal server data structures rhel5: CONNECT-JDBC requires at least Java 1.6
| | * | | | | | | | MDEV-9479: Enable OQGRAPH Engine to compile with Boost-1.60+Dimitri John Ledkov2016-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This used to be a compile failure. The defined structure isn't required in the later versions of boost. Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org>
| | * | | | | | | | MDEV-8638: REVOKE ALL PRIVILEGES, GRANT OPTION FROM CURRENT_ROLE breaks ↵Vicențiu Ciorbaru2016-06-223-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replication Fix the replication failure caused by incorect initialization of THD::invoker_host && THD::invoker_user. Breakdown of the failure is this: Query_log_event::host and Query_log_event::user can have their LEX_STRING's set to length 0, but the actual str member points to garbage. Code afterwards copies Query_log_event::host and user to THD::invoker_host and THD::invoker_user. Calling code for these members expects both members to be initialized. Eg. the str member be a NULL terminated string and length have appropriate size.