Jan Lindström
ecfc3de57e
MDEV-8129: Compilation warnings in log0crypt.cc
...
Fix incorrect types and compiler warnings.
2015-05-11 12:22:13 +03:00
Nirbhay Choubey
e11cad9e9d
Merge tag 'mariadb-10.0.19' into 10.0-galera
2015-05-09 17:09:21 -04:00
Sergei Golubchik
5fdb14542a
MDEV-8021 "InnoDB: Tablespace id 4 encrypted but encryption service not available. Can't continue opening tablespace" on server restart when there are encrypted tables
...
key id was written in the wrong place on the tablespace first page
(thus its value could not be read back later)
2015-05-09 11:19:36 +02:00
Jan Lindström
d259376fd8
MDEV-8041: InnoDB redo log encryption
...
Merged new version of InnoDB/XtraDB redo log encryption from Google
provided by Jonas Oreland.
2015-05-09 11:13:00 +03:00
Alexey Yurchenko
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
sjaakola
226c249ab3
refs codership/mysql-wsrep#53 - fencing LOAD DATA splitting related commit to not happen with ALTER processing
2015-05-08 17:41:06 -04:00
sjaakola
91417b4047
refs #7 - merged fix from 5.5 branch. However, 5.6 branch has not (yet) surfaced similar applier hang as 5.5
2015-05-08 17:41:04 -04:00
Sergei Golubchik
ac286a9bc7
Merge branch '5.5' into 10.0
2015-05-08 11:20:43 +02:00
Jan Lindström
3832bda1ba
Fix compiler error if compiler does not support c99 style
...
initializers.
2015-05-07 18:30:42 +03:00
Jan Lindström
8350ea0514
Fix compiler error if compiler does not support c99 style
...
initializers.
2015-05-07 13:04:03 +03:00
Jan Lindström
b975685036
Merge pull request #54 from openquery/MDEV-8053-c99-style-for-structure-members-10.1
...
c99 style for assigning structure members
2015-05-06 16:48:17 +03:00
Jan Lindström
f704b3335f
Merge pull request #52 from openquery/MDEV-8053-c99-style-for-structure-members
...
c99 style for assigning structure members
2015-05-06 16:47:23 +03:00
Jan Lindström
bad81f23f6
MDEV-8046: Server crashes in pfs_mutex_enter_func on select from I_S.INNODB_TABLESPACES_ENCRYPTION if InnoDB is disabled
...
Problem was that information schema tables innodb_tablespaces_encryption and
innodb_tablespaces_scrubbing where missing required check is InnoDB enabled
or not.
2015-05-06 15:16:28 +03:00
Jan Lindström
2f25c653ad
MDEV-8074: Failing assertion: mutex->magic_n == MUTEX_MAGIC_N in file sync0sync.cc line 508
...
Problem was that e.g. on crash recovery fil_space_crypt_close_tablespace
and fil_space_crypt_mark_space_closing access mutex that is not yet
initialized. Mutex is naturally initialized only if encryption is
configured.
2015-05-06 14:11:30 +03:00
Sergei Golubchik
5dcb111c38
Merge branch 'Buggynours:10.0' into 10.0
2015-05-05 07:50:31 +02:00
Sergei Golubchik
bbcc8e6924
XtraDB-5.6.23-72.1
2015-05-05 00:08:58 +02:00
Sergei Golubchik
a4416abdde
5.6.23-72.1
2015-05-04 22:17:04 +02:00
Sergei Golubchik
49c853fb94
Merge branch '5.5' into 10.0
2015-05-04 22:00:24 +02:00
Nirbhay Choubey
d2562004c5
Merge tag 'mariadb-5.5.43' into 5.5-galera
2015-05-04 13:50:52 -04:00
Sergei Golubchik
14a142fca6
move to storage/xtradb
2015-05-04 19:15:28 +02:00
Teemu Ollakka
f6b1e0fe0a
refs #55 fixed debug build compilation errors
2015-05-04 13:04:52 -04:00
Nirbhay Choubey
2a6e1230e3
refs #7 - handling lock queue granting in BF-BF conflict situation
...
Merge fix to xtradb.
2015-05-04 13:04:51 -04: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
Jan Lindström
53382ac128
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:23:08 +03:00
Sergei Golubchik
4c87f72773
Merge branch '5.5' into bb-5.5-serg
2015-04-29 16:24:52 +02:00
Nirbhay Choubey
8aa84821b4
MDEV-8057: Galera conflicts with InnoDB buffer pool dump
...
Avoid creating innodb buffer pool dump/load thread if mysqld is started
with wsrep recovery mode (--wsrep-recover).
(Merged fix for lp:1305955 from lp:percona-xtradb-cluster)
2015-04-28 18:59:11 -04: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
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
Sergei Golubchik
fd39c56eff
move to storage/xtradb/
2015-04-27 23:37:51 +02:00
Sergei Golubchik
245cc73452
MDEV-7434 XtraDB does not build on Solaris
2015-04-27 15:42:12 +02:00
Daniel Black
3d801e606b
c99 style for assigning structure members
2015-04-27 21:08:52 +10:00
Daniel Black
4d606cb955
c99 style for assigning structure members
2015-04-25 22:57:33 +10:00
Kristian Nielsen
791b0ab5db
Merge 10.0 -> 10.1
2015-04-20 13:21:58 +02:00
Kristian Nielsen
167332597f
Merge 10.0 -> 10.1.
...
Conflicts:
mysql-test/suite/multi_source/multisource.result
sql/sql_base.cc
2015-04-17 15:18:44 +02:00
Sergei Golubchik
4a7472bbf2
fix a crash in innodb.innodb-wl5522-zip,xtradb
...
dereferencing of the uninitialized pointer bpade->slot
(when compiled without UNIV_DEBUG)
2015-04-11 00:28:42 +02:00
Sergei Golubchik
a73676b2e6
Merge branch '10.1' into bb-10.1-serg
2015-04-10 19:32:14 +02:00
Sergei Golubchik
966b236612
add support for --innodb-encrypt-tables=FORCE
...
this will prevent user from creating tables with ENCRYPTED=OFF
2015-04-10 02:53:32 +02:00
Sergei Golubchik
dab6c83744
allow srv_encrypt_tables and ENCRYPTED=YES to be used together
2015-04-10 02:51:06 +02:00
Sergei Golubchik
bc9f118e29
rename table attribute ENCRYPTION=ON/OFF to ENCRYPTED=YES/NO
2015-04-10 02:51:01 +02:00
Sergei Golubchik
ea764f5f52
s/innodb_default_encryption_key/innodb_default_encryption_key_id/
...
and make it a session variable, not global, as any decent
default sysvar for a table attribute should be
2015-04-10 02:40:10 +02:00
Sergei Golubchik
92ff523619
change ENCRYPTION_KEY_ID to be HA_TOPTION_SYSVAR
...
instead of manually implenting "default from a sysvar" in the code
2015-04-10 02:39:36 +02:00
Sergei Golubchik
0a9052f591
Store the key id in the tablespace and read it back
2015-04-09 19:36:12 +02:00
Sergei Golubchik
97d5de4ccf
Add encryption key id to the API as a distinct concept
...
which is separate from the encryption key version
2015-04-09 19:35:40 +02:00
Sergei Golubchik
5dffda3ccc
Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg
...
With changes:
* update tests to pass (new encryption/encryption_key_id syntax).
* not merged the code that makes engine aware of the encryption mode
(CRYPT_SCHEME_1_CBC, CRYPT_SCHEME_1_CTR, storing it on disk, etc),
because now the encryption plugin is handling it.
* compression+encryption did not work in either branch before the
merge - and it does not work after the merge. it might be more
broken after the merge though - some of that code was not merged.
* page checksumming code was not moved (moving of page checksumming
from fil_space_encrypt() to fil_space_decrypt was not merged).
* restored deleted lines in buf_page_get_frame(), otherwise
innodb_scrub test failed.
2015-04-09 19:27:40 +02:00
Sergei Golubchik
129e960179
fix log_blocks_crypt() to actually decrypt the encrypted log
...
It used to double-encrypt it, relying on the fact that second
encrypt() call was (like XOR) negating the effect of the
first one.
2015-04-09 19:06:11 +02:00
Sergei Golubchik
d6b912c64d
update XtraDB/InnoDB plugin maturity to match the server
...
because of encryption changes - make it beta and let
it mature together with the server
2015-04-09 18:44:02 +02:00
Sergei Golubchik
f130da7b00
clarify/simplify new innodb sysvars: help texts
2015-04-09 18:42:45 +02:00
Sergei Golubchik
87cf86519e
clarify/simplify new innodb sysvars: innodb-scrub-force-testing
...
rename to innodb-debug-force-scrubbing
2015-04-09 18:42:45 +02:00
Sergei Golubchik
19e76814b7
clarify/simplify new innodb sysvars: innodb-scrub-log-interval
...
rename to innodb-scrub-log-speed
2015-04-09 18:42:45 +02:00
