Commit graph

17736 commits

Author SHA1 Message Date
Sergei Petrunia
b3fc7c7fed Update test results part #3. 2016-06-02 17:31:56 +03:00
Sergei Petrunia
3fd2521f24 Update test results 2016-06-02 13:35:21 +03:00
Jan Lindström
66dd9fa397 Merge pull request #174 from Cona19/10.1
MDEV-10154 - Remove some unnecessary parentheses
2016-06-02 11:46:35 +03:00
Daniel Black
a0b11b9033 Remove btr_search_n_succ and btr_search_n_hash_fail counters 2016-06-02 17:03:31 +10:00
Vladislav Vaintroub
3a7bc23a16 MDEV-9154 : Remove workarounds (mainly dynamic function loading)
for running obsolete versions of Windows
2016-06-01 20:29:10 +02:00
Jan Lindström
e0e374783a MDEV-9865: Test encryption.innodb-log-encrypt-crash takes too long on debug build
Add big_test and not_debug requirements to avoid timeouts.
2016-06-01 13:06:14 +03:00
Hyeonseok Oh
500b03fe30 Fix spelling: shhould -> should 2016-06-01 06:09:13 +00:00
Nirbhay Choubey
de7eafc7ce MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqno
- Validate the specified wsrep_start_position value by also
checking the return status of wsrep->sst_received. This also
ensures that changes in wsrep_start_position is not allowed
when the node is not in JOINING state.
- Do not allow decrease in seqno within same UUID.
- The initial checkpoint in SEs should be [0...:-1].
2016-05-31 20:37:00 -04:00
Elena Stepanova
f9d453e893 Follow-up for commit 38b89a61c3
Altering a comment or a default field's value needs "NO_LOCK", not EXCLUSIVE -
storage_engine test result updated
2016-05-28 13:11:09 +03:00
Olivier Bertrand
ead4147b13 - Reconize the JDBC type -7 (BIT)
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
2016-05-26 18:48:47 +02:00
Hyeonseok Oh
389c51f4bd Remove some unnecessary parentheses 2016-05-26 10:33:17 +00:00
Olivier Bertrand
afa4657fd3 - Fix failing json_udf_bin test when --ps
modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/mysql-test/connect/disabled.def
2016-05-24 23:57:06 +02:00
Olivier Bertrand
809422838d - Alternative versions of the java JdbcInterface
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'
2016-05-24 11:29:12 +02:00
Olivier Bertrand
e905abf91b - New version of the java JdbcInterface
modified:   storage/connect/JdbcInterface.class
  modified:   storage/connect/JdbcInterface.java

- Ignore *.tlog and .res files
  modified:   .gitignore
2016-05-23 15:17:43 +02:00
Olivier Bertrand
0dae2932f4 - New version of the java JdbcInterface
modified:   storage/connect/JdbcInterface.class
  modified:   storage/connect/JdbcInterface.java

- Ignore *.tlog and .res files
  modified:   .gitignore
2016-05-23 15:08:51 +02:00
Olivier Bertrand
f8bc587c1a Merge branch '10.1' of https://github.com/MariaDB/server into ob-10.1 2016-05-22 14:49:14 +02:00
Olivier Bertrand
9a5c586024 Merge branch '10.0' of https://github.com/MariaDB/server into 10.0 2016-05-22 11:13:10 +02:00
Olivier Bertrand
d25fd437c4 - Fix wrong return from ExecuteQuery
modified:   storage/connect/jdbconn.cpp

- Suppress GCC warning
  modified:   storage/connect/tabjdbc.cpp
2016-05-21 14:56:47 +02:00
Olivier Bertrand
77dd5ece06 - Fix wrong return from ExecuteQuery
modified:   storage/connect/jdbconn.cpp

- Suppress GCC warning
  modified:   storage/connect/tabjdbc.cpp
2016-05-21 14:28:21 +02:00
Olivier Bertrand
c92f2606ea Commit changes made from 10.1 2016-05-21 12:11:27 +02:00
Olivier Bertrand
a982f59b9b - JDBC using separate jmethodID for data types
Some DEBUG tests
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jdbconn.h
2016-05-21 11:56:59 +02:00
Olivier Bertrand
2f2797e52f - JDBC tables can be connected via foreign server wrapper
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
2016-05-20 00:18:29 +02:00
Alexander Barkov
e7ff281d2e MDEV-6353 my_ismbchar() and my_mbcharlen() refactoring 2016-05-17 15:27:10 +04:00
Olivier Bertrand
4a1ffc3853 Add forgotten changes made on 10.1 2016-05-12 23:26:40 +02:00
Olivier Bertrand
5af076e564 Add all changes made on 10.1 2016-05-12 23:08:22 +02:00
Olivier Bertrand
7972a45b43 - Remove REQUIRED option that caused compilation to fail
Remove JVM_LIBRARY (is now dynamically loaded at run time)
  modified:   storage/connect/CMakeLists.txt
2016-05-12 17:22:45 +02:00
Olivier Bertrand
0f5ced1dd5 - Fix some typo ... causing crash!
modified:   storage/connect/jdbconn.cpp
2016-05-12 15:41:21 +02:00
Olivier Bertrand
6aa163bce8 - Continue working on the JDBC table type
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
2016-05-12 12:20:52 +02:00
Olivier Bertrand
2323cf0033 - Make the JVM lib dynamically loaded
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
2016-05-09 17:26:50 +02:00
Jan Lindström
5534d81430 Merged following change from MySQL 5.6 to MariaDB 10.1 XtraDB
including the test case:

https://github.com/mysql/mysql-server/commit/520aedfe
INNODB: "DATA DIRECTORY" OPTION OF CREATE TABLE FAILS WITH PWRITE() OS
ERROR 22
Fix for version mysql-5.6
PROBLEM
========
For version mysql-5.6.27 onwards InnoDB fails to create a table
with explicit 'data directory' option when Innodb_flush_method
is set to O_DIRECT.While creating link file we get a  a pwrite
error 22 due to the alignment restrictions imposed by O_DIRECT
flag  which is being set for the link file created.

FIX
===
Fixed the above issue by making use of file IO functions while
creating the link file that wouldn't let the O_DIRECT flag
restrictions arise.

Reviewed-by: Kevin Lewis <kevin.lewis@oracle.com>
Reviewed-by: Shaohua Wang <shaohua.wang@oracle.com>
RB: 11387
2016-05-06 13:56:25 +03:00
Olivier Bertrand
025decfc38 - Remove gcc compiling errors and warnings
modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/tabjdbc.h
2016-05-06 01:07:14 +02:00
Sergei Golubchik
46973bb3ad Merge branch 'bb-10.1-merge' into 10.1 2016-05-05 08:47:17 +02:00
Sergei Golubchik
153259874b MDEV-9155 Enabling Defragmenting in 10.1.8 still causes OPTIMIZE TABLE to take metadatalocks
take MDL_SHARED_WRITE instead of MDL_SHARED_NO_READ_WRITE
for OPTIMIZE TABLE. For engines that need a stronger
lock (like MyISAM), reopen the table with
MDL_SHARED_NO_READ_WRITE.
2016-05-05 01:05:05 +02:00
Sergei Golubchik
92e47c393f test for group by pushdown with a view 2016-05-05 01:05:05 +02:00
Sergei Golubchik
ea195d372b MDEV-9949 Connect Engine: long SRCDEF leads to broken table
Two bugs here:
* the server could create an frm (with a long attribute
  value) that it could not read back
* Connect engine opened files from inside DROP TABLE
  and was ignoring the error (correctly) but was not
  hiding it from the server (incorrectly). This caused
  a crash later when DROP TABLE was finishing successfully
  while stmt_da already have seen an error.

Also added a text case for
  MDEV-7935 CREATE TABLE ... AS SELECT ... can cause a Server crash (Assertion `0' in Protocol::end_statement)
because Connect stopped clearing the error status
in stmt_da as a fix for MDEV-7935
2016-05-05 01:05:05 +02:00
Sergei Golubchik
357f4d832b Merge branch 'connect/10.1' into 10.1 2016-05-05 01:04:05 +02:00
Olivier Bertrand
80a204f27e - Try to fix MDEV-9950 (not tested yet)
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
2016-05-05 01:03:26 +02:00
Sergei Golubchik
87e3e67f43 Merge branch '10.0' into 10.1 2016-05-04 15:23:26 +02:00
Jan Lindström
5dd0c77e92 MDEV-9362: InnoDB tables using DATA_DIRECTORY created using
MySQL 5.6 do not work with MariaDB 10.1

Analysis: Problem is that tablespace flags bit DATA_DIR
is on different position on MySQL 5.6 compared to
MariaDB 10.1.

Fix: If we detect that there is difference between dictionary
flags and tablespace flags we remove DATA_DIR flag and compare
again. Remote tablespace is tried to locate even in case
when DATA_DIR flag is not set.
2016-05-03 21:35:41 +03:00
Sergei Golubchik
80da57cc4f remove the forgotten PARENT_SCOPE 2016-05-03 20:13:58 +02:00
Vladislav Vaintroub
67723e9618 Move MYSQL_ADD_PLUGIN outside of IF(OQGRAPH_OK) condition,
otherwise the plugin does not get compiled if
cmake is called multiple times.
2016-05-03 15:23:34 +02:00
Vladislav Vaintroub
673efd0648 MDEV-10015 Fix oqgraph compilation on Windows 2016-05-03 15:18:55 +02:00
Nirbhay Choubey
8a1efa1bdd Merge branch '10.0' into 10.0-galera 2016-04-29 16:50:58 -04:00
Jan Lindström
037b78e5ec MDEV-9242: Innodb reports Assertion failure in file buf0dblwr.cc line 579
Analysis: When pages in doublewrite buffer are analyzed compressed
pages do not have correct checksum.

Fix: Decompress page before checksum is compared. If decompression
fails we still check checksum and corrupted pages are found.
If decompression succeeds, page now contains the original
checksum.
2016-04-29 13:47:49 +03:00
Monty
32d3d9f7df Fixed compiler warning 2016-04-28 16:59:53 +03:00
Monty
9c846373f0 Merge commit 'd5822a3ad0657040114cdc185c6387b9eb3a12b2' into 10.2 2016-04-28 16:59:33 +03:00
Jan Lindström
ea83c1d7c6 MDEV-9977: Crash when accessing large (>4G) InnoDB table on
MariaDB 10.1.x 32-bit binaries.

Problem was the fact that tablespace size was incorrectly
rounded to next extent size (1M).
2016-04-28 15:22:27 +03:00
Vladislav Vaintroub
e5810727a9 Fix msxml6 search in Connect engine on Windows,
as it fails on new builders.

msxml6 is found on all Windows we support, thus there is no reason to
search for it.
2016-04-27 18:16:03 +02:00
Olivier Bertrand
bbdeb911b8 - Add the JdbcInterface.java to the project
added:   storage/connect/JdbcInterface.java

- Add *.java to be handled
  modified:   .gitattributes
2016-04-27 12:57:27 +02:00
Olivier Bertrand
7b7414c0ef - Add the JDBC table type compilation for CMAKE.
modified:   storage/connect/CMakeLists.txt

- Fix MDEV-9993
  modified:   storage/connect/jsonudf.cpp
2016-04-27 12:36:55 +02:00