Jan Lindström
b47a2182f6
MariaDB adjustments.
2018-10-10 13:30:56 +03:00
Vasil Dimov
27dcef3900
Add a new config variable wsrep_certification_rules
...
This is used for controlling whether to use a new/optimized
certification rules or the old/classic ones that could cause more
certification failures - when foreign keys are used and two INSERTs are
done concurrently to the child table from different nodes.
(cherry picked from commit 815d73e6af8daace6262ab63ca6c043ffc4204b3)
2018-10-10 13:14:36 +03:00
Vasil Dimov
6aa578ec5a
Generalize "bool shared/exclusive" argument to enum
...
wsrep_append_foreign_key() and wsrep_append_key() used to take a boolean
argument denoting whether the relevant certification key type is shared
(assuming it is exclusive if the argument is false). Change that
argument to the enum wsrep_key_type from wsrep_api.h, so that eventually
other types can also be passed (like WSREP_KEY_SEMI).
This is a non-functional change.
(cherry picked from commit 360bf36dbb9378b36ef57921c725a9505e19e0d9)
2018-10-10 13:02:25 +03:00
Jan Lindström
a5001a2ad7
Merge tag 'mariadb-5.5.60' into 5.5-galera
2018-04-24 13:34:57 +03:00
Marko Mäkelä
70a9b12de9
Silence -Wimplicit-fallthrough
2018-01-23 18:08:55 +02:00
Marko Mäkelä
906ce0962d
MDEV-7049 MySQL#74585 - InnoDB: Failing assertion: *mbmaxlen < 5 in file ha_innodb.cc line 1904
...
InnoDB limited the maximum number of bytes per character to 4.
But, the filename character set that was introduced in MySQL 5.1
uses up to 5 bytes per character.
To allow InnoDB tables to be created with wider characters, let
us split the mbminmaxlen fields into mbminlen, mbmaxlen, and increase
the limit to 7 bytes per character. This will increase the payload size
of dtype_t and dict_col_t by one bit. The storage size will be unchanged
(54 bits and 77 bits will use the same number of bytes as the
previous sizes 53 and 76 bits).
2018-01-22 11:18:10 +02:00
Jan Lindström
ff979674e6
Merge tag 'mariadb-5.5.59' into 5.5-galera
2018-01-19 19:22:00 +02:00
Marko Mäkelä
d384ead0f0
MDEV-14799 After UPDATE of indexed columns, old values will not be purged from secondary indexes
...
This is a regression caused by MDEV-14051 'Undo log record is too big.'
Purge in the secondary index is wrongly skipped in
row_purge_upd_exist_or_extern() because node->row only does not contain all
indexed columns.
trx_undo_rec_get_partial_row(): Add the parameter for node->update
so that the updated columns will be copied from the initial part
of the undo log record.
2018-01-02 19:11:10 +02:00
Marko Mäkelä
cfb3361748
MDEV-12569 InnoDB suggests filing bugs at MySQL bug tracker
...
Replace all references in InnoDB and XtraDB error log messages
to bugs.mysql.com with references to https://jira.mariadb.org/ .
2017-10-26 11:02:19 +03:00
Jan Lindström
8da6b4ef52
Merge tag 'mariadb-5.5.58' into 5.5-galera
2017-10-19 09:06:17 +03:00
Sergei Golubchik
d76f5774fe
MDEV-13459 Warnings, when compiling with gcc-7.x
...
mostly caused by -Wimplicit-fallthrough
2017-10-17 07:37:39 +02:00
Jan Lindström
eec6417e05
Apply galera patches to XtraDB storage engine and remove one debug output.
2017-07-24 16:14:27 +03:00
Jan Lindström
a481de30bb
Merge tag 'mariadb-5.5.57' into 5.5-galera
2017-07-20 08:56:09 +03:00
Sergei Golubchik
59fca5806a
Merge branch 'merge-xtradb-5.5' into 5.5
2017-07-18 19:50:11 +02:00
Sergei Golubchik
46977e0a01
5.5.55-38.8
2017-07-18 19:47:01 +02:00
Sachin Setiya
5ca8121292
Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge
...
Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
2017-04-18 12:01:56 +05:30
Jan Lindström
19b9fe07f5
Fix compiler error on gcc 6.x and most of the compiler warnings.
2017-04-05 10:50:12 +03:00
Jan Lindström
108b211ee2
Fix gcc 6.3.x compiler warnings.
...
These are caused by fact that functions are declared with
__attribute__((nonnull)) or left shit like ~0 << macro
when ~0U << macro should be used.
2017-02-16 12:02:31 +02:00
Nirbhay Choubey
38a0def805
Merge tag 'mariadb-5.5.51' into 5.5-galera
2016-08-10 10:34:54 -04:00
Jan Lindström
ef92aaf9ec
MDEV-10083: Orphan ibd file when playing with foreign keys
...
Analysis: row_drop_table_for_mysql did not allow dropping
referenced table even in case when actual creating of the
referenced table was not successfull if foreign_key_checks=1.
Fix: Allow dropping referenced table even if foreign_key_checks=1
if actual table create returned error.
2016-06-23 06:46:05 +03:00
Nirbhay Choubey
d23bd26bec
Merge tag 'mariadb-5.5.48' into 5.5-galera
2016-02-13 18:28:36 -05:00
Jan Lindström
f66d01610f
MDEV-9471: Server crashes or returns an error while trying to alter partitioning on a table moved from Windows to Linux
...
At alter table when server renames the table to temporal name,
old name uses normal partioned table naming rules. However,
if tables are created on Windows and then transfered to Linux
and lower-case-table-names=1 we should modify the old name
on rename to lower case to be able to find it from the
InnoDB dictionary.
2016-02-03 12:22:31 +02:00
Nirbhay Choubey
ca07ee85ea
Merge tag 'mariadb-5.5.47' into 5.5-galera
2015-12-10 13:00:08 -05:00
Sergei Golubchik
142b725607
Merge branch 'merge/merge-xtradb-5.5' into 5.5
...
5.5.46-37.6
2015-12-09 12:57:04 +01:00
Sergei Golubchik
9457139e59
5.5.46-37.6
2015-12-09 12:27:04 +01:00
Nirbhay Choubey
fd68a7dac6
Merge tag 'mariadb-5.5.46' into 5.5-galera
2015-10-13 14:42:36 -04:00
Sergei Golubchik
16c4b3c68b
fixes for buildbot:
...
* OSX (mysqlimport freeing unallocated memory)
* Windows (didn't compile MSI)
* fulltest2 (innodb crashes in --embedded --big)
2015-10-09 16:43:59 +02:00
Sergei Golubchik
f41a41fd91
Merge branch 'merge-xtradb-5.5' into 5.5
2015-10-09 00:06:16 +02:00
Sergei Golubchik
db79f4cf61
5.5.45-37.4
2015-10-08 23:02:43 +02:00
Sergei Golubchik
fd39c56eff
move to storage/xtradb/
2015-04-27 23:37:51 +02:00
Nirbhay Choubey
3c9137deeb
Merge branch '5.5' into 5.5-galera
...
Merge banch 5.5 till revision :
fdd6c11
- MDEV-7419 Function cli_safe_read not exported
Conflicts:
.bzrignore
debian/dist/Debian/mariadb-galera-server-5.5.files.in
debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in
storage/tokudb/CMakeLists.txt
support-files/build-tags
2015-02-18 17:15:57 -05:00
Sergei Golubchik
2a1be9cdf8
XtraDB 5.5.41-37.0
2015-02-11 20:40:56 +01:00
Nirbhay Choubey
068fb8569f
bzr merge -rtag:mariadb-5.5.40 maria/5.5
2014-10-09 17:25:08 -04:00
Sergei Golubchik
7e6d4bba0c
XtraDB 5.5.40-36.1
2014-10-08 00:44:37 +02:00
Nirbhay Choubey
f20b1fd5e3
Merge of innobase changes to xtradb.
2014-08-06 17:55:29 -04:00
Nirbhay Choubey
ec91eea8db
Local merge of mariadb-5.5.39
...
bzr merge -r4264 maria/5.5
Text conflict in sql/mysqld.cc
Text conflict in storage/xtradb/btr/btr0cur.c
Text conflict in storage/xtradb/buf/buf0buf.c
Text conflict in storage/xtradb/buf/buf0lru.c
Text conflict in storage/xtradb/handler/ha_innodb.cc
5 conflicts encountered.
2014-08-06 14:06:11 -04:00
Jan Lindström
27d23c020a
Merged percona-server-5.5.38-35.2.
2014-08-01 12:54:56 +03:00
Jan Lindström
c922048368
MDEV-6191: row_search_for_mysql comment and code consistency about isolation level
...
and gap locks
2014-07-04 08:42:59 +03:00
Nirbhay Choubey
c29cbac2eb
bzr merge -r3985..3997 codership/5.5
2014-06-10 17:00:32 -04:00
Nirbhay Choubey
90ead99572
bzr merge -r3980..3984 codership/5.5
2014-06-10 16:33:57 -04:00
Nirbhay Choubey
b441c510a7
bzr merge -rtag:mariadb-5.5.38 maria/5.5
2014-06-10 16:04:26 -04:00
Sergei Golubchik
2d687cad5d
merge with XtraDB 5.5.37-35.0
2014-06-03 09:53:10 +02:00
Jan Lindström
150e88e8c9
Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.
2014-04-16 12:13:43 +03:00
Sergei Golubchik
cb67dcb618
mysql-5.5.37 selective merge
2014-03-27 22:26:58 +01:00
Nirbhay Choubey
c3a2394641
* Merged revisions 3945, 3946..3950, 3951..3961
...
from codership-mysql/5.5.
* Merged changes in innobase to xtradb.
* Updated WSREP_PATCH_REVNO.
2014-02-28 13:56:08 -05:00
Nirbhay Choubey
4cb029b38b
* Merged the missing revision 3934 from
...
codership-mysql/5.5 (missed in the last merge).
* Merged changes from Innodb to xtradb.
* Updated WSREP_PATCH_REVNO
2014-02-05 00:28:11 -05:00
Nirbhay Choubey
ecc2c96c9d
Merge of maria/5.5 into maria-5.5-galera.
...
bzr merge -r tag:mariadb-5.5.35 maria/5.5
2014-01-29 19:00:43 -05:00
Sergei Golubchik
ec34edd9c3
Percona-Server-5.5.35-rel33.0.tar.gz
2014-01-22 15:35:42 +01:00
Jan Lindström
071edcfea0
Merge with MariaDB 5.5.34.
2013-11-25 17:14:08 +02:00
Jan Lindström
4f85baab95
Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23.
...
------------------------------------------------------------
revno: 3942
committer: Seppo Jaakola <seppo.jaakola@codership.com>
branch nick: wsrep-5.5-23
timestamp: Thu 2013-11-07 17:37:10 +0200
message:
References: lp:1248921 - checking if index is foreign earlier to adhere to lat
ch order protocol
------------------------------------------------------------
revno: 3941
fixes bug: https://launchpad.net/bugs/1248908
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Thu 2013-11-07 14:31:04 +0200
message:
References lp:1248908 - Fixed access to trx sys header
Pass trx sys header as argument for trx_sys_update_wsrep_checkpoint()
and trx_sys_update_mysql_binlog_offset() to avoid successive calls
to trx_sysf_get().
------------------------------------------------------------
revno: 3940
fixes bug: https://launchpad.net/bugs/1244100
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Tue 2013-11-05 15:31:12 +0200
message:
References lp:1244100 - assign value for check_purge before return
------------------------------------------------------------
revno: 3939
fixes bug: https://launchpad.net/bugs/1247978
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Tue 2013-11-05 01:01:36 +0200
message:
References lp:1247978 - force release transactional MDL locks if wsrep is on a
nd no active transaction at the end of mysql_execute_command()
------------------------------------------------------------
revno: 3938
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-11-03 20:48:06 +0400
message:
References lp:1232789 - fix FLUSH STATUS zeroes up wsrep_cluster_size and wsre
p_local_index
------------------------------------------------------------
revno: 3937 5kB/s -
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-11-03 17:06:31 +0400
message:
References lp:587170 - reset auto_increment_* vars to defaults for TOI operati
ons
------------------------------------------------------------
revno: 3936
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-11-03 00:10:45 +0400
message:
References lp:1072839 - fix for memory leaks with wsrep variables
------------------------------------------------------------
revno: 3935
committer: Seppo Jaakola <seppo.jaakola@codership.com>
branch nick: wsrep-5.5-23
timestamp: Wed 2013-10-30 14:34:32 +0200
message:
References: lp:1246257 - skipping replication for CREATE TEMPORARY TABLE LIKE.
.. constructs
------------------------------------------------------------
revno: 3934 6kB/s \
fixes bug: https://launchpad.net/bugs/1241760
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Mon 2013-10-28 11:01:53 +0200
message:
References lp:1241760 - save thd->db to wsrep_thd_shadow before replay
------------------------------------------------------------
revno: 3933
fixes bug: https://launchpad.net/bugs/1206129
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-10-27 18:15:12 +0200
message:
References lp:1206129 - check binlog_hton->commit() return value, call wsrep_p
ost_commit() instead of wsrep_cleanup_transaction()
------------------------------------------------------------
revno: 3932
fixes bug: https://launchpad.net/bugs/1244661
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-10-27 13:14:02 +0200
message:
References lp:1244661 - added wsrep_register_hton() to trans_rollback_implicit
()
------------------------------------------------------------
revno: 3931
fixes bug: https://launchpad.net/bugs/1244667
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-10-27 11:08:49 +0200
message:
References lp:1244667 - restore thd->server_status after replay
2013-11-25 14:04:49 +02:00