mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-07 03:33:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
164958 commits 2860 branches 349 tags 1.6 GiB
Commit graph

16609 commits

Author SHA1 Message Date
Sergei Golubchik
c1ebb4a60f compiler warnings in spider 2015-02-19 11:28:03 +01:00
Sergei Golubchik
16c01c7004 after merge: fix mroonga to compile and pass its tests 2015-02-19 10:26:52 +01:00
Sergei Golubchik
da637137ba merge 10.0-mroonga 2015-02-19 09:57:34 +01:00
Sergei Golubchik
56114a416f merge 10.0-connect 2015-02-19 09:37:11 +01:00
Olivier Bertrand
d9175f3822 - Remove GCC warnings 
modified:
  storage/connect/jsonudf.cpp
  storage/connect/tabutil.h
 2015-02-19 01:25:31 +01:00
Olivier Bertrand
564d41faf4 - Work on JSON and JSON UDF's 
modified:
  storage/connect/json.cpp
  storage/connect/jsonudf.cpp
  storage/connect/tabjson.cpp

- CntReadNext: Enable EvalColumns for longjmp
modified:
  storage/connect/connect.cc
 2015-02-19 00:59:02 +01:00
Sergei Golubchik
174bccd3ff xtradb 5.6.22-72.0 2015-02-18 20:31:40 +01:00
Sergei Golubchik
6b05688f6d innodb 5.6.23 2015-02-18 17:59:21 +01:00
Sergei Golubchik
d7e7862364 Merge branch '5.5' into 10.0 2015-02-18 15:16:27 +01:00
Jan Lindström
4040bf18cf MDEV-7593: Default encryption key does not work correctly for page 
encrypted tables

Introduced a new innodb_default_page_encryption_key configuration
variable to allow user to set the default key identifier.
 2015-02-18 08:32:01 +02:00
Jan Lindström
a1a32f8f25 Revert file space allocation change on row0merge.cc. 2015-02-18 06:59:28 +02:00
Sergei Golubchik
a0e93bceb7 innodb/xtradb: update nonnull attributes to match the new semantics 2015-02-17 23:49:02 +01:00
Kentoku SHIBA
f5dabd7aca Update Mroonga to the latest version on 2015-02-17T13:34:27+0900 2015-02-17 13:34:27 +09:00
Sergei Golubchik
db227616d2 followup for "MDEV-6248 GUI-friendly cmake options to enable/disable plugins" 
Remove ONLY_IF clause in MYSQL_ADD_PLUGIN and the requirement
that every plugin's CMakeLists.txt *must* do MYSQL_ADD_PLUGIN
for PLUGIN_XXX=YES to work. This was very fragile and cannot be
relied on.

Use a different implementation of =YES check - iterate all
PLUGIN_* variables and see which one doesn't have a matching target.

Revert all ONLY_IF changes in CMakeLists.txt files.
 2015-02-15 22:14:33 +01:00
Sergei Golubchik
985ef1d42a Don't link plugins with libmysys.a or libmysys_ssl.a 
we don't want mysys static data structures to be overwritten
when a dynamic plugin is loaded.
 2015-02-15 22:14:33 +01:00
Jan Lindström
454beee5fb MDEV-6288 :Innodb causes server crash after disk full, then can't ALTER TABLE any more 
Fix try to avoid unnecessary crashes when disk full situation is reached
on alter table.
 2015-02-13 11:49:31 +02:00
Olivier Bertrand
2201aa66cf - Typo on the jsonudf.cpp name 
modified:
  storage/connect/CMakeLists.txt
 2015-02-12 17:23:28 +01:00
Sergei Golubchik
5dce6aa1fe Merge remote-tracking branch 'bzr/5.5' into bb-5.5-merge 2015-02-12 13:14:55 +01:00
Sergei Golubchik
ed839052d7 Merge tag 'tokudb-7.5.5' into bb-5.5-merge 2015-02-12 00:23:21 +01:00
Sergei Golubchik
8e80f91fa3 Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42 2015-02-11 23:50:40 +01:00
Olivier Bertrand
dcfe068d59 - Adding json udf's. Making the second version of json tables. 
added:
  storage/connect/jsonudf.cpp
modified:
  storage/connect/CMakeLists.txt
  storage/connect/json.cpp
  storage/connect/json.h
  storage/connect/tabjson.cpp
  storage/connect/tabjson.h

- Fix utf8 issues with PROXY tables
modified:
  storage/connect/ha_connect.cc
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h
 2015-02-11 21:39:41 +01:00
Sergei Golubchik
2a1be9cdf8 XtraDB 5.5.41-37.0 2015-02-11 20:40:56 +01:00
Jan Lindström
0ed60af423 Fix test failure seen on p8-rhel7 2015-02-11 19:52:43 +02:00
Sergei Golubchik
d72dea1959 Revert "Fixing ConnectSE compilation warnings" 
This reverts commit aa61e4c76e
that broke the compilation on few platforms (e.g. centos5).

These warnings are already fixed properly in 10.0-connect.
 2015-02-10 21:08:57 +01:00
Jan Lindström
56da6252f7 Improve InnoDB transaction lock output by providing number of table locks 
this transaction is currently holding and total number of table locks to
the table where lock is held.
 2015-02-10 15:15:27 +02:00
Alexander Barkov
aa61e4c76e Fixing ConnectSE compilation warnings (and failires in maintainer mode). 2015-02-10 16:47:42 +04:00
Alexander Barkov
a2578018bf Fixing compilation failure in storage/connect when -DMYSQL_MAINTAINER_MODE=ON: 
disabling some CXX errors in storage/connect/CMakeLists.txt.
 2015-02-10 16:01:03 +04:00
Jan Lindström
093b232a87 Do not yet allow encrypted tables with compressed tables. 2015-02-10 10:21:19 +01:00
Jan Lindström
e2e809860e Pass down the information should we encrypt the page at os0file.cc 
when page compression and google encryption is used.
 2015-02-10 10:21:18 +01:00
Jan Lindström
faad7e0c18 Add test case for combination Google encryption and page compressed tables. 2015-02-10 10:21:18 +01:00
Sergei Golubchik
21430e4378 encryption keys service 2015-02-10 10:21:18 +01:00
Sergei Golubchik
cf8bf0b68e encryption key management plugin api 2015-02-10 10:21:17 +01:00
Jan Lindström
9cdf494197 Fixed XtraDB implementation of encryption and page encryption. 2015-02-10 10:21:17 +01:00
Monty
d7d589dc01 Push for testing of encryption 2015-02-10 10:21:17 +01:00
Sergei Golubchik
f007f82881 MDEV-7351 5.5 build fails on Ubuntu Utopic in buildbot 
include oqgraph into deb packages conditionally, just like we do with tokudb
 2015-02-09 20:53:28 +01:00
Jan Lindström
44a9e3f7b4 MDEV-7139: Sporadic failure in innodb.innodb_corrupt_bit on P8 
The testcase fails randomly due to ibuf merge happening in the background.
Fix not to do any merges with ibuf_debug enabled.
 2015-02-09 16:14:27 +02:00
Olivier Bertrand
3c097fd689 - Remove some GCC warnings 
modified:
  storage/connect/ha_connect.cc
 2015-02-08 19:47:26 +01:00
Olivier Bertrand
96ba1f1473 - Handle the use of date/time values when making queries for MYSQL or 
ODBC. Was raised by 7549.
modified:
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp
  storage/connect/tabodbc.cpp
 2015-02-08 18:17:29 +01:00
Olivier Bertrand
35548d577c - Modify the connect_type_conv and connect_conv_size variables. 
They were global (read-only) now they are session (not read-only)
modified:
  storage/connect/checklvl.h
  storage/connect/ha_connect.cc
  storage/connect/myconn.cpp
  storage/connect/myutil.cpp
  storage/connect/tabutil.cpp

- Suppress the compver variable on Linux compile. Was not
  debian reproductible because using __DATE__ and __TIME__ macros.
modified:
  storage/connect/ha_connect.cc

- ODBC LONGVARVAR type conversion now uses connect_conv_size.
modified:
  storage/connect/odbconn.cpp
 2015-02-07 11:33:52 +01:00
Sergei Golubchik
8e7649867f Merge 10.0-galera into 10.1 2015-02-06 16:14:23 +01:00
Jan Lindström
8cc9751165 MDEV-7538: Wrong constraint (TINYINT or MEDIUMINT and INT) 
causes server crash

Analysis: If wrong data types used on foreign constraint there
was possibility that foreign->id is NULL when incorrect
foreign constraint was removed from the dictionary cache.

Fix: Add guard foreign->id != NULL before trying to lookup
or remove the foreign constraint from dictionary cache.

Tested using user database where problem was repeatable.
 2015-02-04 14:40:46 +02:00
Jan Lindström
f32091532d MDEV-7055: MySQL#74664 - InnoDB: Failing assertion: len <= col->len || col->mtype == 5 || (col->len == 0 && col->mtype == 1) in file rem0rec.cc line 845 
Debug assertion maybe too strict.
 2015-02-04 10:50:16 +02:00
Jan Lindström
7afbf338aa MDEV-7513: ib_warn_row_too_big dereferences null thd 
Analysis: Purge thread does not have thd and no access to
handlerton.

Fix: If thd does not exists we use sql_print_warning instead
of push_warning_printf.
 2015-02-04 09:29:54 +02:00
Olivier Bertrand
22367ba71f - Add or correct some tracing code 
modified:
  storage/connect/odbconn.cpp
  storage/connect/tabodbc.cpp
 2015-02-02 19:34:35 +01:00
Olivier Bertrand
82f2be67ae - Fix a bug causing Insert into ODBC to fail when the column name is 
UTF8 encoded.
modified:
  storage/connect/tabodbc.cpp
 2015-02-02 15:35:58 +01:00
Monty
67b24a2374 Remove some allocations not needed for internal temporary tables. 2015-02-01 14:19:39 +02:00
Olivier Bertrand
6a78371991 - Fix a bug causing UseCnc not being initialized for ODBC catalog tables. 
This made errors by calling SQLConnect or SQLDriverConnect randomly
  with incorrect parameters.
modified:
  storage/connect/tabodbc.cpp
  
- Removing GCC warnings  
modified:
  storage/connect/ha_connect.cc

- Typo
modified:
  storage/connect/odbconn.cpp
 2015-02-01 12:16:30 +01:00
Sergei Golubchik
b050354ffb compiler warnings 2015-01-31 21:51:45 +01:00
Sergei Golubchik
4b21cd21fe Merge branch '10.0' into merge-wip 2015-01-31 21:48:47 +01:00
Olivier Bertrand
180b2be63c - Add the possibility to establish an ODBC connection via SQLConnect (the 
default being still to use SQLDriverConnect)
modified:
  storage/connect/ha_connect.cc
  storage/connect/odbccat.h
  storage/connect/odbconn.cpp
  storage/connect/odbconn.h
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h

- Cardinality testing not possible for TBL tables
modified:
  storage/connect/tabtbl.cpp

- Make all line ending LF instead of CRLF
modified:
  storage/connect/tabjson.cpp
 2015-01-31 15:05:43 +01:00