Commit graph

171613 commits

Author SHA1 Message Date
Vicențiu Ciorbaru
d3a3adb833 MDEV-7985: MySQL Users Break when Migrating to MariaDB, part 2
Gave priority to password field when using a native authentication
plugin.

Also, prevented a user from setting an invalid auth_string, when using
native authentication.
2015-05-05 22:50:32 +03:00
Sergei Golubchik
7b70b0d4a9 Merge branch 'bb-10.0-serg' into 10.0 2015-05-05 16:31:53 +02:00
Sergei Golubchik
93047370a6 mroonga doesn't work in embedded anymore
specify RECOMPILE_FOR_EMBEDDED and disable tests in suite.pm
2015-05-05 16:28:23 +02:00
Sergei Golubchik
1d3ea9ecd8 perfschema 5.6.24
including the big commit
  commit 305130361bf72726de220f3d2b2787395e10be61
  Author: Marc Alff <marc.alff@oracle.com>
  Date:   Tue Feb 10 11:31:32 2015 +0100

      WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6

(with the following commits) and related changes in sql/
2015-05-05 15:23:47 +02:00
Alexander Barkov
e4fde092c6 Temporarily disabling Mroonga on Solaris
(See MDEV-7440 Build fails in libgroonga on Solaris)
2015-05-05 15:39:32 +04:00
Alexander Barkov
73c2356e7b MDEV-7778 impossible create copy of table, if table contain default value for timestamp field
MDEV-8082 ON UPDATE is not preserved by CREATE TABLE .. SELECT
2015-05-05 13:22:09 +04:00
Sergei Golubchik
dd0207bda4 .gitignore: add generated mroonga *.result files
and remove duplicates
2015-05-05 08:53:52 +02:00
Sergei Golubchik
d08b7ed514 Merge branch 'Kentoku:10.0' into 10.0 2015-05-05 08:19:20 +02:00
Kentoku SHIBA
d4dd936bd7 Merge branch 'ks-Mroonga-5.02' into 10.0 2015-05-05 16:26:45 +09:00
Sergei Golubchik
5dcb111c38 Merge branch 'Buggynours:10.0' into 10.0 2015-05-05 07:50:31 +02:00
Alexander Barkov
539b3ca87d - Moving Item_func_spatial_mbr_rel from Item_bool_func2 to Item_bool_func,
as Item_func_spatial_mbr_rel needs nothing from Item_bool_func2.
- Renaming Item_func_spacial_rel (the class that implements precise spacial
  relations) to Item_func_spatial_precise_rel
- Adding a new abstract class Item_func_spatial_rel as a common parent
  for Item_func_spatial_precise_rel and Item_func_spatial_mbr_rel.
2015-05-05 09:30:17 +04:00
Kentoku SHIBA
872cbb806b revert CMakeList.txt at groonga-normalizer-mysql/normalizers 2015-05-05 13:48:54 +09:00
Sergei Golubchik
bbcc8e6924 XtraDB-5.6.23-72.1 2015-05-05 00:08:58 +02:00
Sergei Golubchik
70a3fec400 InnoDB-5.6.24 2015-05-05 00:06:23 +02:00
Alexander Barkov
2fe4d0e6cd MDEV-7950 Item_func::type() takes 0.26% in OLTP RO
Step #3: Splitting the function check_equality() into a method in Item.
Implementing Item::check_equality() and Item_func_eq::check_equality().
Implement Item_func_eq::build_equal_items() in addition to
Item_func::build_equal_items() and moving the call for check_equality()
from Item_func::build_equal_items() to Item_func_eq::build_equal_items().
2015-05-05 01:09:47 +04:00
Kentoku SHIBA
d33cef1cb0 add -fPIC for groonga-normalizer-mysql 2015-05-05 05:26:06 +09:00
Sergei Golubchik
0b4f5060bb Merge branch 'merge-pcre' into 10.0 2015-05-04 22:25:57 +02:00
Sergei Golubchik
c4cc91cdc9 8.37 2015-05-04 22:19:22 +02:00
Sergei Golubchik
a4416abdde 5.6.23-72.1 2015-05-04 22:17:04 +02:00
Sergei Golubchik
d71d411905 5.6.24 2015-05-04 22:16:00 +02:00
Sergei Golubchik
085297a121 5.6.24 2015-05-04 22:13:46 +02:00
Sergei Golubchik
6c5ee86286 Null-merge branch 'merge-xtradb-5.6' into 10.0 2015-05-04 22:09:21 +02:00
Sergei Golubchik
41e8126b8f Null-merge branch 'merge-sphinx' into 10.0 2015-05-04 22:08:06 +02:00
Sergei Golubchik
18b9f48ef5 Null-merge branch 'merge-innodb-5.6' into 10.0 2015-05-04 22:05:39 +02:00
Sergei Golubchik
49c853fb94 Merge branch '5.5' into 10.0 2015-05-04 22:00:24 +02:00
Kentoku SHIBA
9130cc7f3c update Spider to 3.2.21 2015-05-05 03:09:34 +09:00
Kentoku SHIBA
d18beccc1d add -fPIC for groonga-normalizer-mysql 2015-05-05 02:43:19 +09:00
Sergei Golubchik
e2a87bdb33 move to storage/sphinx 2015-05-04 19:20:59 +02:00
Sergei Golubchik
6d06fbbd1d move to storage/innobase 2015-05-04 19:17:21 +02:00
Sergei Golubchik
14a142fca6 move to storage/xtradb 2015-05-04 19:15:28 +02:00
Alexander Barkov
9090c3efca Adding a test for Item_default_value in WHERE condition:
WHERE DEFAULT(col)
It seems this was not covered yet.
2015-05-04 18:31:24 +04:00
Alexander Barkov
462bca365a MDEV-7950 Item_func::type() takes 0.26% in OLTP RO
Step 2c:

After discussion with Igor, it appeared that Item_field and Item_ref
could not appear in this context in the old function build_equal_item_for_cond:

  else if (cond->type() == Item::FUNC_ITEM ||
           cond->real_item()->type() == Item::FIELD_ITEM)

The part of the condition checking for Item_field::FIELD_ITEM was a dead code.
- Moving implementation of Item_ident_or_func_or_sum::build_equal_items()
to Item_func::build_equal_items()
- Restoring deriving of Item_ident and Item_sum_or_func from Item_result_field.
  Removing Item_ident_or_func_or_sum.
2015-05-04 18:12:31 +04:00
Sergei Golubchik
ae18a28500 MDEV-7973 bigint fail with gcc 5.0
-LONGLONG_MIN is the undefined behavior in C.
longlong2decimal() used to do this:

  int longlong2decimal(longlong from, decimal_t *to) {
    if ((to->sign= from < 0))
      return ull2dec(-from, to);
    return ull2dec(from, to);

and later in ull2dec() (DIG_BASE is 1000000000):

  static int ull2dec(ulonglong from, decimal_t *to) {
    for (intg1=1; from >= DIG_BASE; intg1++, from/=DIG_BASE) {}

this breaks in gcc-5 at -O3. Here ull2dec is inlined into
longlong2decimal. And gcc-5 believes that 'from' in the
inlined ull2dec is always a positive integer (indeed, if it was
negative, then -from was used instead). So gcc-5 uses
*signed* comparison with DIG_BASE.

Fix: make a special case for LONGLONG_MIN, don't negate it
2015-05-04 08:32:27 +02:00
Sergei Golubchik
298368693c MDEV-8045 Assertion `0' fails in Protocol::end_statement on CREATE VIEW after another connection aborted
0 is a valid value for a file descriptor
2015-05-03 18:26:02 +02:00
Sergei Golubchik
8e797ae267 MDEV-8014 MariaDB client can hang in an infinite loop
On EOF vio_read returns 0, it's not an error so the errno
is not reset. If the previous error was EINTR the client
will loop forever. See also man recv.
2015-05-03 14:43:34 +02:00
Sergei Golubchik
aa5095627e MDEV-7781 cannot install/uninstall plugins during bootstrap
Merge branch 'openquery:mdev-7781-allow-install-uninstall-plugins-during-bootstrap' into 10.0
Undo MySQL fix for bug#46261
2015-05-03 11:51:31 +02:00
Sergei Golubchik
dbe97bcc56 clarify the test case 2015-05-03 11:51:22 +02:00
Sergei Golubchik
c8c51ceec9 MDEV-7390 alter online table xxxx (no options) should be possible
Merge branch 'openquery:mdev-7390-alter-online-table-xx-possible-10.0' into 10.0
2015-05-03 11:32:13 +02:00
Sergei Golubchik
532de70269 more tests, moving code around 2015-05-03 11:31:04 +02:00
Sergei Golubchik
a2297506f2 Fix connection thread handling to address MDEV-6282 MDEV-6345 and MDEV-6784
Merge branch 'pastcomputer:10.0-oqgraph-6282-6345-6784-test' into 10.0
2015-05-03 11:22:25 +02:00
Sergei Golubchik
ef1eb9c6c0 SSL: Verbosely report SSL initialization errors
And don't ignore SSL_CTX_set_tmp_dh() failures
2015-05-03 11:22:12 +02:00
Sergei Golubchik
601dcd4920 MDEV-7794 MariaDB - mysql-test - fips: some ssl tests with cipher are failing
change openssl_1 test not to use non-FIPS ciphers
2015-05-03 11:22:09 +02:00
Sergei Golubchik
7e7dd8e8f4 MDEV-7695 MariaDB - ssl - fips: can not connect with --ssl-cipher=DHE-RSA-AES256-SHA - handshake failure
Change 512bit DH key to 1024bit to meet FIPS requirements
2015-05-03 11:22:07 +02:00
Sergei Golubchik
e1e1f94f47 remove unused file and unnecessary #include 2015-05-03 11:22:04 +02:00
Sergei Golubchik
93c563d37b MDEV-7788 my_md5 crashes with openssl in fips mode
Tell OpenSSL to use MD5 even if FIPS prohibits it.
This is fine as long as we do not use MD5 for cryptographical
purposes (md5 is used internally for P_S message digests and for view
checksums)
2015-05-03 11:22:02 +02:00
Sergei Golubchik
cc12a35cde MDEV-7697 Client reports ERROR 2006 (MySQL server has gone away) or ERROR 2013 (Lost connection to MySQL server during query) while executing AES* functions under SSL
Clear OpenSSL error queue after an error in AES_ENCRYPT/AES_DECRYPT.
Otherwise it might affect current ssl-encrypted connection.
2015-05-03 11:21:57 +02:00
Sergei Golubchik
f875c9f2a0 MDEV-5114 seconds_behind_master flips to 0 & spikes back, when running show slaves status
1. After a period of wait (where last_master_timestamp=0)
   do NOT restore the last_master_timestamp to the timestamp
   of the last executed event (which would mean we've just
   executed it, and we're that much behind the master).

2. Update last_master_timestamp before executing the event,
   not after.

Take the approach from the this commit (but with a different test
case that actually makes sense):

commit 0c75ab453fb8c5439576af8fe5add7a1b89f1569
Author: Luis Soares <luis.soares@sun.com>
Date:   Thu Apr 15 17:39:31 2010 +0100

    BUG#52166: Seconds_Behind_Master spikes after long idle period
2015-05-03 11:21:55 +02:00
Sergei Golubchik
e6d918cacb init_status_vars() was not invoked for embedded
which failed main.features test in embedded, because
status variables were not sorted
2015-05-03 11:21:51 +02:00
Sergei Golubchik
91f8931e45 reformat long strings
(to help 'git diff' show the correct function for hunks)
2015-05-03 11:21:47 +02:00
Vicențiu Ciorbaru
6c55e52b10 MDEV-7774: Crash when dropping user within rebuild_role_grants
The issue comes from not taking all possibilities to match an entry
within the roles_mapping HASH, when updating the data structure.
2015-05-03 11:49:49 +03:00