Commit graph

6 commits

Author SHA1 Message Date
Nirbhay Choubey
887628acee Test changes (backported from 10.1). 2015-01-16 13:53:23 -05:00
Nirbhay Choubey
3bb02f3e6d bzr merge -rtag:mariadb-10.0.15 maria/10.0 2014-12-05 12:33:02 -05:00
Nirbhay Choubey
b77fc5a343 Merge of patch for MDEV#6399. 2014-07-12 18:21:29 -04:00
Nirbhay Choubey
ab4947463e Merging changes from maria-5.5-galera and
some test fixes.

bzr merge -r3479..3493 maria-5.5-galera
2014-05-22 18:31:04 -04:00
Nirbhay Choubey
9d911608f1 Fixes for some test failures. 2014-04-09 12:25:47 -04:00
Nirbhay Choubey
4a6be51f78 * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.
* Fixed Debian/Ubuntu dist files.
* Fixed some compiler warnings.
2014-01-30 12:45:38 -05:00