1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-21 21:22:27 +03:00
Commit Graph

54 Commits

Author SHA1 Message Date
26a14ee130 Merge 10.1 into 10.2 2019-05-13 17:54:04 +03:00
cb248f8806 Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
682c3bfd25 MDEV-10442: "Address already in use" on restart
SST processes should inherit mysqld's process group.
2017-12-18 16:57:54 +01:00
a36c369bda Merge 10.1 into 10.2
For running the Galera tests, the variable my_disable_leak_check
was set to true in order to avoid assertions due to memory leaks
at shutdown.

Some adjustments due to MDEV-13625 (merge InnoDB tests from MySQL 5.6)
were performed. The most notable behaviour changes from 10.0 and 10.1
are the following:

* innodb.innodb-table-online: adjustments for the DROP COLUMN
behaviour change (MDEV-11114, MDEV-13613)

* innodb.innodb-index-online-fk: the removal of a (1,NULL) record
from the result; originally removed in MySQL 5.7 in the
Oracle Bug #16244691 fix
377774689b

* innodb.create-index-debug: disabled due to MDEV-13680
(the MySQL Bug #77497 fix was not merged from 5.6 to 5.7.10)

* innodb.innodb-alter-autoinc: MariaDB 10.2 behaves like MySQL 5.6/5.7,
while MariaDB 10.0 and 10.1 assign different values when
auto_increment_increment or auto_increment_offset are used.
Also MySQL 5.6/5.7 exhibit different behaviour between
LGORITHM=INPLACE and ALGORITHM=COPY, so something needs to be tested
and fixed in both MariaDB 10.0 and 10.2.

* innodb.innodb-wl5980-alter: disabled because it would trigger an
InnoDB assertion failure (MDEV-13668 may need additional effort in 10.2)
2017-08-31 09:30:40 +03:00
c23efc7d50 Merge remote-tracking branch 'origin/10.0-galera' into 10.1 2017-08-21 13:35:00 +03:00
83664e21e4 MW-366 Improved support for IPv6 networks - made mysqld and SST scripts to recognize []-escaped IPv6 addresses - pulled in latest Percona and MariaDB updates to SST scripts - instruct netcat and socat in wsrep_sst_xtrabackup-v2 to listen on IPv6 socket via sockopt parameter in the [sst] section of my.cnf
In summary, wsrep_node_address and wsrep_sst_receive_address can now
be set to IPv6 addresses escaped by []. Rsync SST works out ouf the
box thanks to rsync daemon listening on both IPv4 and IPv6 sockets by
default. For xtrabackup SST onver IPv6 one needs to set sockopt in
the [sst] section of joiner's configuration file to ",pf=ip6" if
using socat as a streamer or to "-6" if using netcat.
2017-08-11 15:00:18 +03:00
da4d71d10d Merge branch '10.1' into 10.2 2017-03-30 12:48:42 +02:00
f0ec34002a Correct FSF address 2017-03-10 18:21:29 +01:00
ebe061900b MDEV-10442: "Address already in use" on restart
SST processes should inherit mysqld's process group.
2016-11-21 16:20:10 -05:00
89685d55d7 Reuse THD for new user connections
- To ensure that mallocs are marked for the correct THD, even if it's
  allocated in another thread, I added the thread_id to the THD constructor
- Added st_my_thread_var to thr_lock_info_init() to avoid a call to my_thread_var
- Moved things from THD::THD() to THD::init()
- Moved some things to THD::cleanup()
- Added THD::free_connection() and THD::reset_for_reuse()
- Added THD to CONNECT::create_thd()
- Added THD::thread_dbug_id and st_my_thread_var->dbug_id. These are needed
  to ensure that we have a constant thread_id used for debugging with a THD,
  even if it changes thread_id (=connection_id)
- Set variables.pseudo_thread_id in constructor. Removed not needed sets.
2016-06-04 09:06:00 +02:00
7f19330c59 Merge branch 'github/10.0-galera' into 10.1 2015-11-19 17:48:36 +01:00
5079d69d48 MDEV-8975: 10.1 Fails To Join Existing Galera Cluster
During the process of guessing the IP address, if bind-address
is INADDR_ANY, mysqld should proceed with address specified via
wsrep_node_address or use one from network interfaces.

Patch contributed by darkain (pull#115).
2015-11-05 21:52:19 -05:00
bb52905432 MDEV-8034 : wsrep_node_address can't be IPV6
Updated address parsing logic to include IPv6 format.
2015-09-15 18:58:08 -04:00
2ea16b995d This commit fixes
- errno handling in wsp::env::append() method, where error could be returned by mistake
  - return code of sst_prepare_other() when pthread_create() fails - it was returning positive error code which by convention is treated as success.
2015-09-09 22:30:51 -04:00
86ee30cea9 Refs codership/mysql-wsrep#141: this commit
1. Passes wsrep_sst_auth_value to SST scripts via WSREP_SST_OPT_AUTH envronmental variable, so it never appears on the command line
  2. In mysqldump and xtrabackup* SST scripts which rely on MySQL authentication, instead of passing password on the command line, SST script sets MYSQL_PWD environment variable, so that password also never appears on the mysqldump/innobackupex command line.
2015-09-09 22:29:03 -04:00
fa5f18d673 Merge branch '5.5-galera' into 10.0-galera 2015-09-09 20:51:39 -04:00
d809fcc301 This commit fixes
- errno handling in wsp::env::append() method, where error could be returned by mistake
  - return code of sst_prepare_other() when pthread_create() fails - it was returning positive error code which by convention is treated as success.
2015-09-09 17:03:31 -04:00
d78110e7fa Refs codership/mysql-wsrep#141: this commit
1. Passes wsrep_sst_auth_value to SST scripts via WSREP_SST_OPT_AUTH envronmental variable, so it never appears on the command line
  2. In mysqldump and xtrabackup* SST scripts which rely on MySQL authentication, instead of passing password on the command line, SST script sets MYSQL_PWD environment variable, so that password also never appears on the mysqldump/innobackupex command line.
2015-09-09 17:02:26 -04:00
dced5146bd Merge branch '10.0-galera' into 10.1 2015-07-14 16:05:29 -04:00
4ed9ddd30e Refs codership/mysql-wsrep#33
1. factored XID-related functions to a separate wsrep_xid.cc unit.
  2. refactored them to take refrences instead of pointers where appropriate
  3. implemented wsrep_get/set_SE_position to take wsrep_uuid_t and wsrep_seqno_t instead of XID
  4. call wsrep_set_SE_position() in wsrep_sst_received() to reinitialize SE checkpoint after SST was received, avoid assert() in setting code by first checking current position.
2015-05-08 17:41:06 -04:00
9d15689d1f Refs #25 - made sure signals that may be set to ignored in mysqld were set to default in the child process. 2015-05-08 17:41:05 -04:00
b02d736560 Refs #25 - made sure signals that may be set to ignored in mysqld were set to default in the child process. 2015-05-04 13:04:52 -04:00
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
8ee5668033 Changes in wsrep_guess_ip()
* Changed loopback detection to be done via ifa->ifa_flags
* Removed unused function wsrep_guess_address()
2015-02-27 17:43:10 -05:00
4fb2f66907 Changes in wsrep_guess_ip()
* Changed loopback detection to be done via ifa->ifa_flags
* Removed unused function wsrep_guess_address()
2015-02-24 21:55:22 -05:00
8e7649867f Merge 10.0-galera into 10.1 2015-02-06 16:14:23 +01:00
e6f35f1511 Backported changes done in wsrep_guess_ip() from 10.1. 2015-01-26 11:58:16 -05:00
f9e7f82d15 Backported changes done in wsrep_guess_ip() from 10.1. 2015-01-26 11:44:39 -05:00
e51e5e940c Merged patch for lp:1167368 from maria-5.5-galera. 2014-12-08 23:44:53 -05:00
a4cdd20d49 MDEV-7131: [PATCH] wsrep_guess_ip doesn't compile on OpenBSD
Extend platform check to include OpenBSD.
(Contributed by: Jonathan Matthew)
2014-11-19 13:33:37 -05:00
2156f62d2e portability: use getifaddrs()
instead of exec'ing /usr/sbin/ifconfig|grep|sed|awk
2014-10-01 23:48:36 +02:00
7aabc2ded2 fixing embedded: WaaS. Wsrep as a Service. 2014-10-01 23:48:34 +02:00
df4dd593f2 MDEV-6247: Merge 10.0-galera to 10.1.
Merged lp:maria/maria-10.0-galera up to revision 3879.

Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.
2014-08-26 15:43:46 +03:00
bc5c65f9b4 MDEV-6636 : Merged fixes for lp:1167368 and lp:1250805. 2014-08-25 17:03:17 -04:00
02ba2bfdb4 Merging revision from codership-mysql/5.5 (r3928..3968) and
codership-mysql/5.6 (r4021..4065).
- Also contains fixes for some build failures.
2014-03-27 16:26:00 -04:00
c5f7486654 bzr merge -r4062..4065 codership/5.6 2014-03-26 14:13:12 -04:00
31eaa90a6e Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
496e22cf3b merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
and a number of fixes to make this buildable. 
Run also few short multi-master high conflict rate tests, with no issues
2013-12-04 10:32:43 +02:00
6422d276fa bzr merge -r3895..3903 lp:codership-mysql/5.5
This is just before 5.5.34 merge in wsrep-5.5 branch
2013-11-26 22:09:14 +02:00
a2594e96f7 Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API #24 2013-11-26 16:48:30 +02:00
2b4183f10b bzr merge -r3890..3891 lp:codership-mysql/5.5 2013-11-06 00:29:37 +02:00
255e20a175 Merged revisions 3418..3424 from mariadb-galera-5.5 2013-10-07 08:57:23 +03:00
c72126e043 Merge revisions 3907--3914 from lp:~codership/codership-mysql/5.5-23
------------------------------------------------------------
revno: 3914  3kB/s | 
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Thu 2013-09-12 15:00:46 +0400
message:
  References lp:1217653 - fix index-id evaluation of FOREIGN KEY, when referenced table without PRIMARY KEY
------------------------------------------------------------
revno: 3913
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Wed 2013-09-11 13:58:02 +0400
message:
  References lp:1217653 - fix index-id evaluation of FOREIGN KEY, when referenced table without PRIMARY KEY
------------------------------------------------------------
revno: 3912
committer: Seppo Jaakola <seppo.jaakola@codership.com>
branch nick: wsrep-5.5-23
timestamp: Fri 2013-09-06 13:13:48 +0300
message:
  References: lp:1212955 - releasing MDL after failed BEGIN and "SET AUTOCOMMIT"
------------------------------------------------------------
revno: 3911
committer: Seppo Jaakola <seppo.jaakola@codership.com>
branch nick: wsrep-5.5-23
timestamp: Wed 2013-09-04 10:52:31 +0300
message:
  References: lp:1123233 - avoiding to set wsrep_seqno_changed for replaying transactions
    Note, also missing transactions don't declare seqno_changed anymore. Earlier they would have caused crash at wsrep_cleanup_transaction phase.
------------------------------------------------------------
revno: 3910 [merge]
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Tue 2013-09-03 15:27:02 +0400
message:
  References lp:1049599 - expose desync functionality to the client
------------------------------------------------------------
revno: 3909
committer: Seppo Jaakola <seppo.jaakola@codership.com>
branch nick: wsrep-5.5-23
timestamp: Tue 2013-09-03 09:41:08 +0300
message:
   References: lp:1123233 - rollback for transaction which has not appended key information
------------------------------------------------------------
revno: 3908
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-09-01 13:29:12 +0400
message:
  lp:1201893 - fix command for default IP address
------------------------------------------------------------
revno: 3907
committer: Seppo Jaakola <seppo.jaakola@codership.com>
branch nick: wsrep-5.5-23
timestamp: Thu 2013-08-29 12:16:42 +0300
message:
  References: lp:1212955 - releasing transactional MDL locks after commit failures (e.g. certification failure).
2013-09-26 16:43:49 +03:00
ba3ff50ab2 Merge 10.0 to galera-10.0 2013-09-03 17:50:36 +03:00
551ad1cf6f Merged FreeBSD compatibility changes (up to revision 3893 in lp:~codership/codership-mysql/5.5-23) 2013-08-07 00:17:16 +03:00
9d1546fe2c References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858..3867 2013-05-25 12:22:57 +03:00
800fa186e3 merged with codership-mysql up to revision 3839
bzr merge -r3810..3839 lp:codership-mysql/5.5
2013-02-05 17:54:42 +02:00
9da9a242fa remerging wsrep files from lp:codership-mysql 2013-02-05 16:54:50 +02:00
e0c6a87b99 re-merging wsrep files from lp:codership-mysql 2013-02-05 15:48:54 +02:00
fc6cd855e9 References: lp:1066784 - Merged revisions 3810-3827 from lp:codership-mysql 2012-11-28 17:38:32 +02:00