summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* tests (temp)wip-binlog-encryptionSergei Golubchik2015-08-3131-3620/+217
|
* MDEV-8264 encryption for binlogSergei Golubchik2015-08-3120-134/+687
| | | | | | | * Start_encryption_log_event * --encrypt-binlog command line option based on google patches.
* cleanup: Log_event::write() and MYSQL_BIN_LOG::write_cache()Sergei Golubchik2015-08-319-493/+449
| | | | | | | | | | | | Introduce Log_event_writer() that encapsulates writing data to an IO_CACHE with automatic checksum calculation. Now all events properly checksum themselves as needed. Use Log_event_writer in MYSQL_BIN_LOG::write_cache() instead of copy-pasting its logic all over. Later Log_event_writer will also do encryption.
* cleanup: correct usage of semicolons in sql_yacc.yySergei Golubchik2015-08-312-7/+6
|
* cleanup: [partial] removal of llstr()Sergei Golubchik2015-08-314-167/+97
| | | | now when my_vsnprintf() supports %llu for a few years already.
* Revert f1abd015, make a smaller fixSergei Golubchik2015-08-313-14/+11
| | | | | | | | commit f1abd015dcec3c1347e96e6197db8fd05c021537 Author: Andrei Elkin <aelkin@mysql.com> Date: Thu Nov 12 17:10:19 2009 +0200 Bug #47210 first execution of "start slave until" stops too early
* cleanup DBUG, DBUG_DUMP_EVENT_BUFSergei Golubchik2015-08-313-63/+31
| | | | | | | introduce DBUG_DUMP_EVENT_BUF, remove few unused DBUG_EXECUTE_IF's simplify few DBUG_PRINT's remove few redundant #ifndef DBUG_OFF's
* test cleanup: use --replace_result correctlySergei Golubchik2015-08-314-24/+14
| | | | | | * replace binlog positions where they are calculated (instead of --disable_query_log) * don't replace binlog positions when they're hard-coded anyway
* test cleanup: remove Format_description_log_event size dependencySergei Golubchik2015-08-3123-161/+203
| | | | | | | | | 1. use include/show_binlog_events.inc instead of SHOW BINLOG EVENTS 2. use include/show_relaylog_eventc.inc too 3. in all other places where a number might appear in the result file, include binlog_start_pos.inc, calculate the position like pos=`select $binlog_start_pos + 100`; and use replace_result $pos <pos>
* fix show_relaylog_events.inc to work for multisourceSergei Golubchik2015-08-313-5/+20
| | | | and fix SHOW RELAYLOG 'src_name' EVENTS to respect src_name
* cleanup: checksumming of Format_description_log_eventSergei Golubchik2015-08-311-22/+7
| | | | | smaller a simpler way to ensure that checksum never sees LOG_EVENT_BINLOG_IN_USE_F flag
* cleanup: remove Slave_log_event (unused since 2002)Sergei Golubchik2015-08-313-247/+0
|
* cleanup: use enum_binlog_checksum_alg, not uint8Sergei Golubchik2015-08-3112-72/+76
| | | | | | * fix unireg.h includes * use enum_binlog_checksum_alg for binlog checksum variables, not uint8
* cleanup: simplify nested multiline ?(?:(?:)):Sergei Golubchik2015-08-312-16/+16
|
* cleanup: commentsSergei Golubchik2015-08-314-28/+7
|
* cleanup: reformatSergei Golubchik2015-08-313-142/+121
| | | | | | | * reformat long lines * remove useless 'const' * remove unneeded do { ... } while(false} wrapper * remove unneeded method
* cleanup: Log_event::read_log_event()Sergei Golubchik2015-08-315-203/+139
| | | | | | | | | | | There are three Log_event::read_log_event() methods: 1. read the event image from IO_CACHE into String 2. create Log_event from the in-memory event image 3. read the event image from IO_CACHE and create Log_event The 3rd was reading event image into memory and invoking the 2nd to create Log_event. Now the 3rd also uses the 1st to read the event image from IO_CACHE into memory, instead of duplicating its functionality.
* cleanup: my_checksumSergei Golubchik2015-08-3110-30/+18
| | | | | remove my_crc_dbug_check (gdb can do it itself), add crc_0 constant, as it's needed quite often
* more my_crypt unittests (short inputs)Sergei Golubchik2015-08-311-1/+12
|
* New encryption API. Piece-wise encryption.Sergei Golubchik2015-08-3025-633/+713
| | | | | | | | | | | | | Instead of encrypt(src, dst, key, iv) that encrypts all data in one go, now we have encrypt_init(key,iv), encrypt_update(src,dst), and encrypt_finish(dst). This also causes collateral changes in the internal my_crypt.cc encryption functions and in the encryption service. There are wrappers to provide the old all-at-once encryption functionality. But binlog events are often written piecewise, they'll need the new api.
* my_crypt unittestSergei Golubchik2015-08-302-1/+105
|
* String::release and String::reset methodsSergei Golubchik2015-08-302-9/+15
| | | | | Rename reassociate to reset and create an inverse method release. Method names are chosen to match std::unique_ptr methods.
* simplify and unify my_safe_alloca usageSergei Golubchik2015-08-305-33/+24
|
* cmake warnings when PLUGIN_MROONGA=NOSergei Golubchik2015-08-131-6/+3
|
* Merge branch 'mdev8302-3' into 10.1Kristian Nielsen2015-08-041-0/+2
|\
| * Fix embedded server buildKristian Nielsen2015-08-041-0/+2
| |
* | Merge MDEV-8302 into 10.1Kristian Nielsen2015-08-045-6/+147
|\ \ | |/
| * MDEV-8302: Duplicate key with parallel replicationKristian Nielsen2015-08-045-6/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug is essentially another variant of MDEV-7458. If a transaction conflict caused a deadlock kill of T2 in record_gtid() during commit, the code would do a rollback _before_ running rgi->unmark_start_commit(). This creates a race where following transactions could start too early (before T2 has completed its transaction retry). This in turn could lead to replication failure, if there was a conflict that caused eg. duplicate key error or similar. The fix is to remove these rollbacks (in Query_log_event::do_apply_event() and Xid_log_event::do_apply_event(). They seem out-of-place; code in log_event.cc generally does not roll back on error, this is handled higher up. In addition, because of the extreme difficulty of reproducing bugs like MDEV-7458 and MDEV-8302, this patch adds some extra precations to try to detect (in debug builds) or prevent (in release builds) similar bugs. ha_rollback_trans() will now call unmark_start_commit() if needed (and assert in debug build when a caller does rollback without unmark first). We also add an extra check for thd->killed() so that we avoid doing mark_start_commit() if we already have a pending deadlock kill. And we add a missing unmark_start_commit() call in the error case, found by the above assertion.
* | MDEV-5096 - Wrong error message on attempt to kill somebody else's query IDSergey Vojtovich2015-07-244-1/+44
| | | | | | | | | | Attempting to kill query owned by different user now returns better error: "You are not owner of query N" instead of "You are not owner of thread N".
* | Merge branch 'bb-10.1-serg' into 10.1mariadb-10.1.6Sergei Golubchik2015-07-23333-2273/+11343
|\ \
| * | compilation failures on WindowsSergei Golubchik2015-07-232-2/+7
| | |
| * | fix for 32-bit testsSergei Golubchik2015-07-221-128/+128
| | |
| * | MDEV-8508 mroonga fails embedded tests in 10.1Sergei Golubchik2015-07-202-2/+2
| | | | | | | | | | | | | | | as a workaround until the bug is fixed don't run mroonga tests in --embedded mode by default
| * | compiler warningSergei Golubchik2015-07-201-5/+6
| | | | | | | | | | | | | | | WARN_DEPRECATED_NO_REPLACEMENT(NULL, ...) was causing a warning, because it expanded into NULL->variables.errmsgs[...]
| * | Merge https://github.com/Kentoku/MariaDB/tree/10.1 into 10.1Sergei Golubchik2015-07-20329-2136/+11200
| |\ \
| | * | Update Mroonga to the latest version on 2015-07-02T04:12:21+0900Kentoku SHIBA2015-07-02329-2136/+11200
| | | |
| * | | Null-merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-07-200-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | because the actual merge was already done in dced5146bdfc46e200ba35a86c3c55fb60972e33 as a patch
| | * | | MDEV-8383 : "GRANT role TO user" does not replicateNirbhay Choubey2015-07-103-0/+324
| | | | | | | | | | | | | | | | | | | | | | | | | Enable replication of GRANT/REVOKE ROLE commands across galera nodes.
| | * | | MDEV-7903 : xtrabackup SST failing with maria-10.0-galeramariadb-galera-10.0.20Nirbhay Choubey2015-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | Remove master-bin.state file on joiner node during SST.
| | * | | MDEV-7631 : Invalid WSREP_SST rows appear in mysqld-bin.index fileNirbhay Choubey2015-06-241-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Try not to release 0 (STDIN_FILENO) file descriptor as it can incorrectly get reused by streams opened later.
| | * | | Add close-on-exec flag to open(), socket(), accept() & fopen().Nirbhay Choubey2015-06-246-7/+38
| | | | |
| | * | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-06-2313-25/+434
| | |\ \ \
| | | * | | Update SELinux policy to allow UDP for multicast repl in galera.mariadb-galera-5.5.44Nirbhay Choubey2015-06-232-20/+30
| | | | | |
| | | * | | Merge tag 'mariadb-5.5.44' into 5.5-galeraNirbhay Choubey2015-06-21211-4424/+6440
| | | |\ \ \
| | | * | | | MDEV-8260 : Issues related to concurrent CTASNirbhay Choubey2015-06-197-23/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Wait for aborted thd (victim) to release MDL locks * Skip aborting an already aborted thd * Defer setting OK status in case of CTAS * Minor cosmetic changes * Added a test case
| | | * | | | MDEV-6829 : SELinux/AppArmor policies for Galera serverNirbhay Choubey2015-06-186-0/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SELinux policy and AppArmor profile under policy/.
| | * | | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-21406-4454/+7447
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Remove duplicate script added due to bad merge.Nirbhay Choubey2015-06-211-26/+0
| | | | | | |
| | * | | | | MDEV-8239 : Idle threads post-execution end up in closing tables stateNirbhay Choubey2015-06-197-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set thd's state to 'committed' only after it has done closing tables (called indirectly by relay_group_info::cleanup_context()).
| | * | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-06-024-10/+61
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |