summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0-galera into 10.1Sergei Golubchik2015-02-062-2/+2
|\
| * maria-10.0.16 mergeNirbhay Choubey2015-01-264-11/+5
| |\
| * | MDEV-6771 : Incorrect Size for Transfer Reported to pvNirbhay Choubey2015-01-132-2/+2
| * | MDEV-6891: Update company nameNirbhay Choubey2014-12-121-2/+2
| * | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-056-5/+32
| |\ \
| * \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-0/+3
| |\ \ \
| * | | | Updated config files:Nirbhay Choubey2014-09-231-0/+0
| * | | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-118-66/+58
| |\ \ \ \
| * | | | | MDEV-6490: mysqldump unknown option --galera-sst-modeNirbhay Choubey2014-08-071-9/+33
| * | | | | MDEV-4728: local merge from maria-5.5-galera.Nirbhay Choubey2014-07-151-2/+13
| * | | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-193-12/+20
| |\ \ \ \ \
| * | | | | | MDEV#6316: Fix mysqldump SST method to transfer binlogNirbhay Choubey2014-06-161-1/+6
| * | | | | | MDEV#6317: Fix rsync SST method to transfer binlogNirbhay Choubey2014-06-062-25/+49
| * | | | | | Fix for wsrep_sst_xtrabackup-v2.sh script.Nirbhay Choubey2014-06-021-0/+6
| * | | | | | Merging changes from maria-5.5-galera andNirbhay Choubey2014-05-221-0/+8
| * | | | | | bzr merge -r4065..4088 codership/5.6Nirbhay Choubey2014-05-212-2/+19
| * | | | | | bzr merge -r3985..3991 codership/5.5Nirbhay Choubey2014-05-214-21/+87
| * | | | | | bzr merge -r3968..3984 codership/5.5 (non-Innodb changes only).Nirbhay Choubey2014-05-213-24/+36
| * | | | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-2110-44/+50
| |\ \ \ \ \ \
| * | | | | | | MDEV#6098 mysqldump sst fails on maria-10.0-galeraNirbhay Choubey2014-04-151-2/+5
| * | | | | | | MDEV#6077 : mysqldump sst fails on maria-10.0-galeraNirbhay Choubey2014-04-111-6/+8
| * | | | | | | Removing unnecessary extra copies of wsrep_sst_xxxNirbhay Choubey2014-04-107-1850/+0
| * | | | | | | Local merge (mariadb-galera-10.0.10).Nirbhay Choubey2014-04-0915-210/+1367
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-275-177/+1325
| | |\ \ \ \ \ \ \
| | | * | | | | | | * bzr merge -r4027..4061 codership/5.6Nirbhay Choubey2014-03-262-8/+4
| | | * | | | | | | bzr merge -r3946..3968 codership/5.5Nirbhay Choubey2014-03-255-175/+1327
| | * | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-2611-33/+42
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | * Merging fix for lp:1224775mariadb-galera-10.0.7aNirbhay Choubey2014-04-021-39/+9
| |/ / / / / / / /
| * | | | | | | | * mysqld_safe could not start server as it failedmariadb-galera-10.0.7Nirbhay Choubey2014-02-141-1/+1
| * | | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-301-0/+1
| * | | | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-252-1/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-047-36/+91
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge fixes, now at level 3430 in mariadb-galera-5.5Seppo Jaakola2013-10-071-51/+58
| * | | | | | | | | | Merged revisions 3418..3424 from mariadb-galera-5.5Seppo Jaakola2013-10-072-54/+58
| * | | | | | | | | | Merged revisions 3411..3417 from mariadb-galera-5.5Seppo Jaakola2013-10-071-0/+119
| * | | | | | | | | | Merged revisions 3409..3411 from mariadb-galera-5.5Seppo Jaakola2013-10-063-2/+745
| * | | | | | | | | | Merge fix.Jan Lindström2013-09-091-0/+68
| * | | | | | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-0315-71/+2138
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-6/+9
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-133-17/+231
* | | | | | | | | | | | | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-313-10/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | 5.5 mergeSergei Golubchik2015-01-213-10/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | MDEV-6220 mysqldump will not backup database with --flush-logs parameter and ...Sergei Golubchik2015-01-191-0/+1
| | * | | | | | | | | | | | mysql-5.5.41 mergeSergei Golubchik2014-12-192-10/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Bug #14486004 MYSQL_SETPERMISSION DOES NOT QUOTE USER NAMESArun Kuruvila2014-10-171-3/+3
| | | * | | | | | | | | | | | Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANGJon Olav Hauglid2014-10-131-4/+8
| | | * | | | | | | | | | | | Bug #19361402 - ADD --MANUAL-LLDB OPTION TO MYSQL-TEST-RUN.PL, contributedSayantan Dutta2014-09-021-0/+0
| | * | | | | | | | | | | | | MDEV-6891: Update company nameNirbhay Choubey2014-12-121-2/+2
| * | | | | | | | | | | | | | Fixed compiler warningsMichael Widenius2014-12-191-1/+1
| * | | | | | | | | | | | | | MDEV-6891: Update company nameNirbhay Choubey2014-12-121-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |