Commit graph

90880 commits

Author SHA1 Message Date
Olivier Bertrand
2b2c61cc79 Commit changes to json_udf.inc 2015-06-05 17:21:04 +02:00
Olivier Bertrand
2a3166feff Fix swapping key numeric values on Big Endian machines.
Fix typo error in CntIndexRange (kp instead of p)
Change version date
  modified:   storage/connect/connect.cc
  modified:   storage/connect/ha_connect.cc
2015-06-03 17:54:11 +02:00
Olivier Bertrand
5a9e2e62bf Merge branch '10.1' of https://github.com/Buggynours/MariaDB into 10.1 2015-06-03 16:59:45 +02:00
Olivier Bertrand
36d2bd6a15 Handle ODBC table null values modified: tabodbc.cpp 2015-06-03 16:58:42 +02:00
Olivier Bertrand
30fd69e605 Handle ODBC table null values modified: tabodbc.cpp 2015-06-02 11:53:22 +02:00
Olivier Bertrand
e8ea671c25 Commit changes pulled from ob-10.0 2015-06-02 10:34:51 +02:00
Olivier Bertrand
893631a8c1 All the last changes made in the ob-10.0 branch including also changes of line endings of some test files 2015-05-20 12:39:17 +02:00
Olivier Bertrand
83ca074c75 Last commit was done with wrong files 2015-05-10 12:52:28 +02:00
Olivier Bertrand
b3f9838f5b Update 10.1 with changes from 10.0 2015-04-19 12:15:58 +02:00
Olivier Bertrand
48a77e6188 Make this repository aligned with 10.0 one 2015-04-05 14:03:35 +02:00
Olivier Bertrand
464947e632 - Fix a bug that caused a crash when doing delete on a json table with wrong syntax file
- Suppress MYSQL_SUPPORT preprocessor variable
2015-03-22 11:31:10 +01:00
Olivier Bertrand
7733b247e1 Same changes than in version 10.0.17 2015-03-19 12:21:08 +01:00
Olivier Bertrand
73d0427553 Changes to avoid compiling error with Visual Studio 2008
Adding files to ignore
2015-03-16 17:22:50 +01:00
Olivier Bertrand
6cf2093653 - Commit changes to .gitignore 2015-03-15 14:31:43 +01:00
Alexander Barkov
b1b6101af2 A preparatory patch for MDEV-6566.
Adding a new virtual function MY_CHARSET_HANDLER::copy_abort().
Moving character set specific code into the correspoding implementations
(for simple, multi-byte and mbmaxlen>1 character sets).
2015-03-02 18:24:22 +04:00
Jan Lindström
7047bef1ef Use standard InnoDB error mechanism on compression and encryption
error messages.
2015-03-02 10:55:48 +02:00
Sergei Golubchik
1f1f977167 Fix test failing when file_key_management_plugin doesn't load
* remove useless suppressions from the test file, when a plugin doesn't
  load, the file isn't executed anyway
* add the suppression to mysql-test-run.pl instead
2015-03-01 16:53:31 +01:00
Sergei Golubchik
c3f80a2bff fix new innodb warnings to use the standard innodb warning syntax 2015-03-01 16:53:31 +01:00
Sergei Golubchik
c78f594bbc MDEV-6479 stack traces in 10.1
Take into account that PIE binaries are loaded at some offset, so
addresses cannot be directly resolved with addr2line. Find this
offset and subtract it before resolving an address.
2015-02-28 19:48:22 +01:00
Sergei Golubchik
7ba2916c55 MDEV-7000 Assertion `0' failed in Protocol::end_statement() on executing DDL under innodb_fake_changes=1
correct the if() condition to match the behavior of the old code
that this if() was supposed to replace
2015-02-28 19:48:22 +01:00
Sergei Golubchik
ba80708f66 MDEV-6960 Server crashes in check_alter_user on setting a default role via PS
There were two issues:

* set_var_default_role::user was overwritten with a new value,
  allocated in the thd->mem_root, which is reset between executions.
  That was causing the crash. Solved by introducing set_var_default_role::real_user

* when privilege tables were opened on EXECUTE, the reprepare_observer
  would abort the statement (as privilege tables are opened using
  the local TABLE_LIST that doesn't preserve metadata from PREPARE, so
  reprepare_observer thought they're changed). This issue also applied
  to SET PASSWORD. Solved by disabling reprepare_observer.
2015-02-28 19:48:22 +01:00
Sergei Golubchik
7951bb1656 cleanup: remove unused variables 2015-02-28 19:48:22 +01:00
Nirbhay Choubey
75a27eeaf7 MDEV-4987: Sort by domain_id when list of GTIDs are output
Added logic to sort gtid list based on domain_id before
populating them in string. Added a test case.
2015-02-27 23:33:22 -05:00
Nirbhay Choubey
34d86ac9ff MDEV-6594: Use separate domain_id for Galera transactions 2015-02-27 22:33:41 -05:00
Nirbhay Choubey
0f8cb3c399 MDEV-7615: Remove --galera-sst-mode option from mysqldump
Removed 'galera-sst-mode' option from mysqldump and added logic
in wsrep_sst_mysqldump script to retrieve gtid_binlog_state from
donor node and send it to the joiner node.
2015-02-27 22:30:38 -05:00
Nirbhay Choubey
4c191de323 MDEV-7560: wsrep* tests depend on the version of galera library
Added an include file to check galera library version.
2015-02-27 22:16:37 -05:00
Nirbhay Choubey
16c446235e Changes in wsrep_guess_ip()
* Changed loopback detection to be done via ifa->ifa_flags
* Removed unused function wsrep_guess_address()
2015-02-27 19:16:27 -05:00
Alexander Barkov
72d7b12b9c Reducing duplicate code and simplifying well formed string copying
by adding a new class String_copier.

This is a pre-requisite patch for MDEV-6566 and MDEV-6572,
to avoid adding more similar code.
2015-02-27 16:26:12 +04:00
Alexander Barkov
2d01907c1d MDEV-7281 EVENT: CREATE OR REPLACE 2015-02-27 13:34:18 +04:00
Vicențiu Ciorbaru
77806da0da Fix incorrect parameter passing to create_tmp_table in create_result_table
Create_tmp_table was called incorrectly called in
select_materialized_with_stats::create_result_table, having keep_row_order
passed for the do_not_open parameter and keep_row_order always set to false.
2015-02-26 23:31:35 +02:00
Jan Lindström
d7c6f1191d Try to fix test warning. 2015-02-26 19:41:21 +02:00
Jan Lindström
f37b857f80 Fix test case. 2015-02-26 17:19:51 +02:00
Jan Lindström
018f932024 test 2015-02-26 12:09:35 +02:00
Jan Lindström
2eae6848d9 MDEV-7572: InnoDB: Assertion failure in log_init_crypt_key if
file_key_management_plugin is used

Fixed error handling and added disabling InnoDB redo log encryption
if encryption key management plugin is not there.
2015-02-26 10:17:23 +02:00
Sergei Petrunia
702aee6492 MDEV-6323: ‘explain_node’ may be used uninitialized in this function
- Remove the compiler warning, add assert statements.
- make select_describe() not call mysql_explain_union() for
  views that were "merged for INSERT".
2015-02-26 00:02:10 +03:00
Jan Lindström
2330107ca8 MDEV-7572: InnoDB: Assertion failure in log_init_crypt_key if
file_key_management_plugin is used

Fixed error handling and added disabling InnoDB redo log encryption
if encryption key management plugin is not there.
2015-02-25 13:26:57 +02:00
Sergei Golubchik
da181fee4e disable feedback plugin again 2015-02-24 16:26:18 +01:00
Jan Lindström
b2862912af Try to stabilize test case. Problem was that test compares number
of encryption/compression pages and that will happen if and only
if dirty pages are written to the disk.
2015-02-22 08:46:22 +02:00
Jan Lindström
1cc7befc14 MDEV-7109: Add support for INFORMATION_SCHEMA.INNODB_SEMAPHORE_WAITS
MDEV-7399: Add support for INFORMATION_SCHEMA.INNODB_MUTEXES
    MDEV-7618: Improve semaphore instrumentation

    Introduced two new information schema tables to monitor mutex waits
    and semaphore waits. Added a new configuration variable
    innodb_intrument_semaphores to add thread_id, file name and
    line of current holder of mutex/rw_lock.
2015-02-21 21:45:16 +02:00
Jan Lindström
9152b83973 Merged from 10.0-FusionIO:
Added support for compression method snappy for page compression.
2015-02-19 17:42:18 +02:00
Jan Lindström
bab1c686a4 Push forgotten file change to fix compiler errors. 2015-02-19 12:41:10 +02:00
Jan Lindström
36c1982a19 MDEV-7604: wsrep plugin lists its plugin_maturity as Unknown
Changed wsrep plugin from mysql_plugin to maria_plugin to
set up plugin_maturity to Stable.
2015-02-18 15:23:37 +02: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
Sergei Golubchik
11536f99f1 MDEV-7305 Difficulties building cracklib_password_check
put cracklib_password_check into a separate package.
build it conditionally on Debian/Ubuntu
2015-02-17 23:49:56 +01:00
Sergei Golubchik
87eb82d4d5 cleanup: remove old debian/ubuntu names from debian/* files
namely, remove the code to support:
etch, lenny, hardy, intrepid, jaunty, karmic, maverick, natty
2015-02-17 23:49:55 +01:00
Sergei Golubchik
a0e93bceb7 innodb/xtradb: update nonnull attributes to match the new semantics 2015-02-17 23:49:02 +01:00
Sergei Petrunia
4da7aa55f6 Add a testcase for EXPLAIN FORMAT=JSON for ROR-union index_merge. 2015-02-17 18:43:22 +03:00
Sergei Golubchik
3e2849d2a0 update result files 2015-02-15 22:14:34 +01: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