summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* More test case fixes.Jan Lindström2016-09-093-0/+6
|
* Fix bunch of test failures and solaris build missing include.Jan Lindström2016-09-0917-34/+737
|
* MDEV-10551 Test innodb.defrag_mdl-9155 hangs on InnoDB 5.7Sergei Golubchik2016-09-082-1/+1
| | | | restore a table_flag lost in a merge
* Merge InnoDB 5.7 from mysql-5.7.14.Jan Lindström2016-09-08244-9069/+15626
| | | | | | | | | | | | Contains also: MDEV-10549 mysqld: sql/handler.cc:2692: int handler::ha_index_first(uchar*): Assertion `table_share->tmp_table != NO_TMP_TABLE || m_lock_type != 2' failed. (branch bb-10.2-jan) Unlike MySQL, InnoDB still uses THR_LOCK in MariaDB MDEV-10548 Some of the debug sync waits do not work with InnoDB 5.7 (branch bb-10.2-jan) enable tests that were fixed in MDEV-10549 MDEV-10548 Some of the debug sync waits do not work with InnoDB 5.7 (branch bb-10.2-jan) fix main.innodb_mysql_sync - re-enable online alter for partitioned innodb tables
* Merge InnoDB 5.7 from mysql-5.7.9.Jan Lindström2016-09-02835-80897/+171191
| | | | | | | | | | | | | | | | | | | | | | | Contains also MDEV-10547: Test multi_update_innodb fails with InnoDB 5.7 The failure happened because 5.7 has changed the signature of the bool handler::primary_key_is_clustered() const virtual function ("const" was added). InnoDB was using the old signature which caused the function not to be used. MDEV-10550: Parallel replication lock waits/deadlock handling does not work with InnoDB 5.7 Fixed mutexing problem on lock_trx_handle_wait. Note that rpl_parallel and rpl_optimistic_parallel tests still fail. MDEV-10156 : Group commit tests fail on 10.2 InnoDB (branch bb-10.2-jan) Reason: incorrect merge MDEV-10550: Parallel replication can't sync with master in InnoDB 5.7 (branch bb-10.2-jan) Reason: incorrect merge
* MDEV-10084: SQL batch united responseOleksandr Byelkin2016-07-041-0/+1
| | | | Reduce number of network send() calls for batch update requests
* bump the VERSIONDaniel Bartholomew2016-07-041-1/+1
|
* Removing duplicate code in double-to-longlong conversion.Alexander Barkov2016-07-0311-119/+118
| | | | | | | | | | Adding Converter_double_to_longlong and reusing it in: 1. Field_longlong::store(double nr) 2. Field_double::val_int() 3. Item::val_int_from_real() 4. Item_dyncol_get::val_int() As a good side efferct, now overflow in conversion in the mentioned val_xxx() methods return exactly the same warning.
* fix ALTER TABLE .. DROP CONSTRAINT IF NOT EXISTSmariadb-10.2.1Sergei Golubchik2016-07-023-1/+5
|
* clarify ER_CANT_DROP_FIELD_OR_KEYSergei Golubchik2016-07-0217-56/+54
| | | | include the dropped object type
* Post-commit text fix for embedded: 12d75e6121 - new thread stack sizeElena Stepanova2016-07-021-2/+2
|
* Post-commit test fixesElena Stepanova2016-07-0224-2428/+2427
| | | | | | | - 12d75e6121 - new thread stack size - 99e48cb1d9 - warning text changed - 6c173324ff - default values for BLOBs - c87e002bbb - don't return a negative zero
* don't save vcol flags in frmSergei Golubchik2016-07-013-11/+6
| | | | | | this is useless now, flags are recalculated on load anyway. But storing flags on disk means we cannot easily change (add, remove, or renumber) them in the new MariaDB version.
* cannot use item->const_item() in open_table_from_share()Sergei Golubchik2016-07-012-2/+6
| | | | | because table->map is set much later. Use check_vcol_func_processor() to detect fields too.
* increase stack size for labradorSergei Golubchik2016-07-011-1/+1
|
* Removing the "thd" argument from Item::create_field_for_create_select().Alexander Barkov2016-07-017-12/+11
| | | | "thd" is available through the "table" argument, as table->in_use.
* 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
| | |\ \ \ \ \
View Lorry Controller Status