summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* bzr merge -r3946..3968 codership/5.5Nirbhay Choubey2014-03-2526-243/+1589
* bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).Nirbhay Choubey2014-03-2513-97/+91
* bzr merge -r3928..3932 codership/5.5Nirbhay Choubey2014-03-254-5/+40
* References: https://mariadb.atlassian.net/browse/MDEV-5908 - Seppo Jaakola2014-03-202-2/+4
* Modified debian scripts to make galera packagesNirbhay Choubey2014-03-1436-647/+76
* Debian script fixes.Nirbhay Choubey2014-03-136-25/+12
* MDEV#5790 : SHOW GLOBAL STATUS LIKE does not showNirbhay Choubey2014-03-044-1/+107
* MDEV#5759 Init script contains syntax errorNirbhay Choubey2014-02-271-1/+5
* Fixed install_macros.cmake to set the correctNirbhay Choubey2014-02-192-4/+2
* * mysqld_safe could not start server as it failedmariadb-galera-10.0.7Nirbhay Choubey2014-02-142-2/+5
* Fixes in debian distribution files.Nirbhay Choubey2014-02-1332-568/+269
* MDEV-5644: Assertion failure during lock_cancel_waiting_and_release.Jan Lindström2014-02-112-86/+365
* MDEV#5626 : Cannot install InnoDB/XtraDB pluginNirbhay Choubey2014-02-1010-75/+272
* Dummy empty revision (to trigger bb).Nirbhay Choubey2014-02-070-0/+0
* Fix for main.commit test.Nirbhay Choubey2014-02-031-3/+2
* * Fixed debian dist file names.Nirbhay Choubey2014-01-3014-1/+6
* * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-3047-187/+439
* Fixed issue on wsrep_kill_victim mutexing order error. Furthermore, fixed mergeJan Lindström2014-01-296-23/+33
* Fixed issue with extra status lines Wsrep_local_bf_aborts at SHOW GLOBAL STATUS Jan Lindström2014-01-281-2/+2
* Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-252297-135996/+250948
|\
| * update information_schema-big.resultSergei Golubchik2013-12-231-0/+6
| * mergeSergei Golubchik2013-12-22574-53041/+137928
| |\
| | * mtr: abort when a suite.pm fails to load, don't just ignore the errors.Sergei Golubchik2013-12-226-7/+9
| | * * change the test to use is_embedded.inc instead of a direct checkSergei Golubchik2013-12-223-12/+6
| | * mtr: move collect_default_suites() after collect_mysqld_features(),Sergei Golubchik2013-12-221-6/+7
| | * don't install connect test suite explicitly,Sergei Golubchik2013-12-221-14/+0
| | * remove a deprecated API function from the plugin.hSergei Golubchik2013-12-224-15/+0
| | * remove duplicate function (see thd_tx_isolation())Sergei Golubchik2013-12-221-5/+0
| | * mysql-test:Sergei Golubchik2013-12-223-6/+9
| | * use -visibility=hidden also for plugins linked statically into libmysqldSergei Golubchik2013-12-221-0/+1
| | * put ha_xtradb.so in deb packagesSergei Golubchik2013-12-222-1/+2
| | * use dynamic libaio for ha_xtradb.soSergei Golubchik2013-12-221-2/+2
| | * fix xtradb I_S tables to loadSergei Golubchik2013-12-221-6/+6
| | * Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-22506-53270/+137888
| | |\
| | | * Percona-Server-5.6.14-rel62.0.tar.gzSergei Golubchik2013-12-16360-41411/+125303
| | | * rename *.c -> *.ccSergei Golubchik2013-12-1690-0/+0
| | * | undelete a fileSergei Golubchik2013-12-161-0/+299
| | * | move oqgraph and sphinx suites into storage/*/mysql-test/Sergei Golubchik2013-12-1649-2/+4
| * | | merge 10.0-connectSergei Golubchik2013-12-2225-408/+492
| |\ \ \
| | * | | - Fix MDEV-5340Olivier Bertrand2013-12-201-1/+1
| | * | | Merge 10.0->10.0-connectAlexander Barkov2013-12-2018-10/+15190
| | |\ \ \ | | |/ / / | |/| | |
| * | | | MDEV-4929 Myanmar collationAlexander Barkov2013-12-2013-0/+15098
| * | | | Merge 10.0-base->10.0Alexander Barkov2013-12-193-2/+10
| |\ \ \ \
| | * | | | A post-fix for MDEV-5009 don't look inside /*!50700 ... */ commentsAlexander Barkov2013-12-193-2/+10
| * | | | | MDEV-4838 Wrong metadata for DATE_ADD('string', INVERVAL)Alexander Barkov2013-12-192-0/+16
| * | | | | Merge 10.0-base->10.0Alexander Barkov2013-12-183-10/+68
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-5009 don't look inside /*!50700 ... */ commentsAlexander Barkov2013-12-183-10/+68
| | | * | | - Add extra column info in discoveryOlivier Bertrand2013-12-194-25/+44
| | | * | | Merge 10.0->10.0-connectAlexander Barkov2013-12-171410-40473/+68213
| | | |\ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge 10.0-base->10.0Alexander Barkov2013-12-1727-2/+778
| |\ \ \ \ \ | | |/ / / /