Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.0-galera into 10.1 | Sergei Golubchik | 2015-02-06 | 2 | -2/+2 |
|\ | |||||
| * | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 4 | -11/+5 |
| |\ | |||||
| * | | MDEV-6771 : Incorrect Size for Transfer Reported to pv | Nirbhay Choubey | 2015-01-13 | 2 | -2/+2 |
| * | | MDEV-6891: Update company name | Nirbhay Choubey | 2014-12-12 | 1 | -2/+2 |
| * | | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 6 | -5/+32 |
| |\ \ | |||||
| * \ \ | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -0/+3 |
| |\ \ \ | |||||
| * | | | | Updated config files: | Nirbhay Choubey | 2014-09-23 | 1 | -0/+0 |
| * | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 8 | -66/+58 |
| |\ \ \ \ | |||||
| * | | | | | MDEV-6490: mysqldump unknown option --galera-sst-mode | Nirbhay Choubey | 2014-08-07 | 1 | -9/+33 |
| * | | | | | MDEV-4728: local merge from maria-5.5-galera. | Nirbhay Choubey | 2014-07-15 | 1 | -2/+13 |
| * | | | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0 | Nirbhay Choubey | 2014-06-19 | 3 | -12/+20 |
| |\ \ \ \ \ | |||||
| * | | | | | | MDEV#6316: Fix mysqldump SST method to transfer binlog | Nirbhay Choubey | 2014-06-16 | 1 | -1/+6 |
| * | | | | | | MDEV#6317: Fix rsync SST method to transfer binlog | Nirbhay Choubey | 2014-06-06 | 2 | -25/+49 |
| * | | | | | | Fix for wsrep_sst_xtrabackup-v2.sh script. | Nirbhay Choubey | 2014-06-02 | 1 | -0/+6 |
| * | | | | | | Merging changes from maria-5.5-galera and | Nirbhay Choubey | 2014-05-22 | 1 | -0/+8 |
| * | | | | | | bzr merge -r4065..4088 codership/5.6 | Nirbhay Choubey | 2014-05-21 | 2 | -2/+19 |
| * | | | | | | bzr merge -r3985..3991 codership/5.5 | Nirbhay Choubey | 2014-05-21 | 4 | -21/+87 |
| * | | | | | | bzr merge -r3968..3984 codership/5.5 (non-Innodb changes only). | Nirbhay Choubey | 2014-05-21 | 3 | -24/+36 |
| * | | | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 10 | -44/+50 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | MDEV#6098 mysqldump sst fails on maria-10.0-galera | Nirbhay Choubey | 2014-04-15 | 1 | -2/+5 |
| * | | | | | | | MDEV#6077 : mysqldump sst fails on maria-10.0-galera | Nirbhay Choubey | 2014-04-11 | 1 | -6/+8 |
| * | | | | | | | Removing unnecessary extra copies of wsrep_sst_xxx | Nirbhay Choubey | 2014-04-10 | 7 | -1850/+0 |
| * | | | | | | | Local merge (mariadb-galera-10.0.10). | Nirbhay Choubey | 2014-04-09 | 15 | -210/+1367 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 5 | -177/+1325 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | * bzr merge -r4027..4061 codership/5.6 | Nirbhay Choubey | 2014-03-26 | 2 | -8/+4 |
| | | * | | | | | | | bzr merge -r3946..3968 codership/5.5 | Nirbhay Choubey | 2014-03-25 | 5 | -175/+1327 |
| | * | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 11 | -33/+42 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | * Merging fix for lp:1224775mariadb-galera-10.0.7a | Nirbhay Choubey | 2014-04-02 | 1 | -39/+9 |
| |/ / / / / / / / | |||||
| * | | | | | | | | * mysqld_safe could not start server as it failedmariadb-galera-10.0.7 | Nirbhay Choubey | 2014-02-14 | 1 | -1/+1 |
| * | | | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera. | Nirbhay Choubey | 2014-01-30 | 1 | -0/+1 |
| * | | | | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 2 | -1/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 7 | -36/+91 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Merge fixes, now at level 3430 in mariadb-galera-5.5 | Seppo Jaakola | 2013-10-07 | 1 | -51/+58 |
| * | | | | | | | | | | Merged revisions 3418..3424 from mariadb-galera-5.5 | Seppo Jaakola | 2013-10-07 | 2 | -54/+58 |
| * | | | | | | | | | | Merged revisions 3411..3417 from mariadb-galera-5.5 | Seppo Jaakola | 2013-10-07 | 1 | -0/+119 |
| * | | | | | | | | | | Merged revisions 3409..3411 from mariadb-galera-5.5 | Seppo Jaakola | 2013-10-06 | 3 | -2/+745 |
| * | | | | | | | | | | Merge fix. | Jan Lindström | 2013-09-09 | 1 | -0/+68 |
| * | | | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 15 | -71/+2138 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -6/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 3 | -17/+231 |
* | | | | | | | | | | | | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 3 | -10/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | 5.5 merge | Sergei Golubchik | 2015-01-21 | 3 | -10/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | MDEV-6220 mysqldump will not backup database with --flush-logs parameter and ... | Sergei Golubchik | 2015-01-19 | 1 | -0/+1 |
| | * | | | | | | | | | | | | mysql-5.5.41 merge | Sergei Golubchik | 2014-12-19 | 2 | -10/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | Bug #14486004 MYSQL_SETPERMISSION DOES NOT QUOTE USER NAMES | Arun Kuruvila | 2014-10-17 | 1 | -3/+3 |
| | | * | | | | | | | | | | | | Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG | Jon Olav Hauglid | 2014-10-13 | 1 | -4/+8 |
| | | * | | | | | | | | | | | | Bug #19361402 - ADD --MANUAL-LLDB OPTION TO MYSQL-TEST-RUN.PL, contributed | Sayantan Dutta | 2014-09-02 | 1 | -0/+0 |
| | * | | | | | | | | | | | | | MDEV-6891: Update company name | Nirbhay Choubey | 2014-12-12 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | Fixed compiler warnings | Michael Widenius | 2014-12-19 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | MDEV-6891: Update company name | Nirbhay Choubey | 2014-12-12 | 1 | -2/+2 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |