summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* tests (temp)wip-binlog-encryptionSergei Golubchik2015-08-3131-3620/+217
* MDEV-8264 encryption for binlogSergei Golubchik2015-08-3120-134/+687
* cleanup: Log_event::write() and MYSQL_BIN_LOG::write_cache()Sergei Golubchik2015-08-319-493/+449
* 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
* Revert f1abd015, make a smaller fixSergei Golubchik2015-08-313-14/+11
* cleanup DBUG, DBUG_DUMP_EVENT_BUFSergei Golubchik2015-08-313-63/+31
* test cleanup: use --replace_result correctlySergei Golubchik2015-08-314-24/+14
* test cleanup: remove Format_description_log_event size dependencySergei Golubchik2015-08-3123-161/+203
* fix show_relaylog_events.inc to work for multisourceSergei Golubchik2015-08-313-5/+20
* cleanup: checksumming of Format_description_log_eventSergei Golubchik2015-08-311-22/+7
* 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
* cleanup: simplify nested multiline ?(?:(?:)):Sergei Golubchik2015-08-312-16/+16
* cleanup: commentsSergei Golubchik2015-08-314-28/+7
* cleanup: reformatSergei Golubchik2015-08-313-142/+121
* cleanup: Log_event::read_log_event()Sergei Golubchik2015-08-315-203/+139
* cleanup: my_checksumSergei Golubchik2015-08-3110-30/+18
* more my_crypt unittests (short inputs)Sergei Golubchik2015-08-311-1/+12
* New encryption API. Piece-wise encryption.Sergei Golubchik2015-08-3025-633/+713
* my_crypt unittestSergei Golubchik2015-08-302-1/+105
* String::release and String::reset methodsSergei Golubchik2015-08-302-9/+15
* 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
* | MDEV-5096 - Wrong error message on attempt to kill somebody else's query IDSergey Vojtovich2015-07-244-1/+44
* | 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
| * | compiler warningSergei Golubchik2015-07-201-5/+6
| * | 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
| |\ \ \
| | * | | MDEV-8383 : "GRANT role TO user" does not replicateNirbhay Choubey2015-07-103-0/+324
| | * | | MDEV-7903 : xtrabackup SST failing with maria-10.0-galeramariadb-galera-10.0.20Nirbhay Choubey2015-06-241-1/+2
| | * | | MDEV-7631 : Invalid WSREP_SST rows appear in mysqld-bin.index fileNirbhay Choubey2015-06-241-1/+8
| | * | | 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
| | | * | | | MDEV-6829 : SELinux/AppArmor policies for Galera serverNirbhay Choubey2015-06-186-0/+278
| | * | | | | 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
| | * | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-06-024-10/+61
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |