mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-02 17:23:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
170332 commits 2854 branches 349 tags 1.7 GiB
Commit graph

170332 commits

Author SHA1 Message Date
Sergei Golubchik
70a3fec400 InnoDB-5.6.24 2015-05-05 00:06:23 +02: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
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
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
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
Vicențiu Ciorbaru
acab0faa14 MDEV-7038 Assertion `status_var.memory_used == 0' failed in THD::~THD() on disconnect after executing EXPLAIN for multi-table UPDATE 
Added test case that caught this bug. It is no longer reproducible in
the current tree.
 2015-05-02 21:46:32 +03:00
Jan Lindström
37093eb51e MDEV-8079: Crash when running MariaDB Debug with InnoDB on Windows 
Problem was that std::vector was allocated using calloc instead of
new, this caused vector constructor not being called and vector
metadata not initialized.
 2015-05-01 14:51:50 +03:00
Daniel Black
2bb0e71358 Alter online table x (no options) possible 
This no-op of an operations should be able to occur without locks and
occur online.
 2015-05-01 09:57:12 +10:00
Nirbhay Choubey
320240be1d Merge test for bug#72594 from upstream 2015-04-30 10:23:36 -04:00
Sergei Golubchik
4c87f72773 Merge branch '5.5' into bb-5.5-serg 2015-04-29 16:24:52 +02:00
Vicentiu Ciorbaru
a4477d2977 Fix failing test cases for MDEV-7912 patch 2015-04-29 14:16:03 +03:00
Sergei Golubchik
f632b51d99 MDEV-7987 Fatal error: Please read "Security" section of the manual to find out how to run mysqld as root! 
update the error message to refer to the knowledge base
that (now) has an article about this use case
 2015-04-29 12:40:53 +02:00
Sergei Golubchik
6f17e233bf post-merge fixes 2015-04-29 12:40:52 +02:00
Kristian Nielsen
9088f26f20 MDEV-7802: group commit status variable addition 
Backport into 10.0
 2015-04-29 11:29:25 +02:00
Sergei Golubchik
f9c02d7c29 Merge branch 'openquery/MDEV-6916-maria-5.5-check_view-r4408' into 5.5 2015-04-28 21:11:49 +02:00
Sergei Golubchik
fbab0685a7 post-merge changes, fixes, and tests 2015-04-28 13:57:21 +02:00
Sergei Golubchik
67a3ddf17a Merge branch 'merge-xtradb-5.5' into 5.5 2015-04-28 13:54:37 +02:00
Sergei Golubchik
40e95608d9 percona-server-5.5.42-37.1.tar.gz 2015-04-28 13:42:58 +02:00
Sergei Golubchik
c581ae08a7 Null-merge branch 'merge-xtradb-5.5' into 5.5 2015-04-28 13:37:54 +02:00
Alexey Botchkov
a5fa434d0c MDEV-7779 View definition changes upon creation. 
Fixed by using POINT instead of ST_POINT in the item.
        Later need to fix that with proper ST_POINT implementation
 2015-04-28 15:31:49 +05:00
Jan Lindström
4c174fcb4a MDEV-8020: innodb.innodb-mdev-7055 produces valgrind warnings in buildbot 
Fixed by reverting incorrect fix of MDEC-7055 (reopened) and removing the
test case (because it now crashes).
 2015-04-28 15:29:46 +03:00
Vicentiu Ciorbaru
ac2b92c476 MDEV-7912 multitable delete with wrongly set sort_buffer_size crashes in merge_buffers 
Fixed overflow error that caused fewer bites to be allocated than
necessary on Windows 64 bit. This is due to ulong being 32 bit on
64 bit Windows and 64 bit on 64 bit Linux.
 2015-04-28 15:09:04 +03:00
Kristian Nielsen
ed701c6a23 MDEV-7864: Slave SQL: stopping on non-last RBR event with annotations results in SEGV (signal 11) 
The slave SQL thread was clearing serial_rgi->thd before deleting
serial_rgi, which could cause access to NULL THD.

The clearing was introduced in commit
2e100cc5a4 and is just plain wrong. So revert
that part (single line) of that commit.

Thanks to Daniel Black for bug analysis and test case.
 2015-04-28 11:56:54 +02:00
Sergei Golubchik
fd39c56eff move to storage/xtradb/ 2015-04-27 23:37:51 +02:00
Sergei Golubchik
0f12ada6b6 Merge remote-tracking branch 'mysql/5.5' into 5.5 2015-04-27 21:04:06 +02:00
Sergei Golubchik
e4df6e5799 Merge commit 'tokudb-engine/tokudb-7.5.6' into 5.5 2015-04-27 16:19:54 +02:00