Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -7/+7 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-05-09 | 3 | -9/+17 |
| |\ | |||||
| | * | MDEV-5625 Debian package mariadb-client-5.5 lacks dependency on ↵ | Sergei Golubchik | 2014-04-10 | 2 | -2/+10 |
| | | | | | | | | | | | | libterm-readkey-perl | ||||
| | * | MDEV-6022 Patch 44_scripts__mysql_config__libs.dpatch is inapplicable, deb ↵ | Sergei Golubchik | 2014-04-07 | 1 | -7/+7 |
| | | | | | | | | | | | | package creation fails | ||||
| * | | MDEV-5454 Dependencies for mariadb-connect-engine-10.0.deb don't look correct | Sergei Golubchik | 2014-05-04 | 2 | -2/+4 |
| | | | |||||
* | | | MDEV-6192 [Warning] Failed to load slave replication state from | Nirbhay Choubey | 2014-04-30 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | table mysql.gtid_slave_pos: 1286: Unknown storage engine 'InnoDB' Removed 'loose-innodb' option from mysqld booststrap command in debian post-installation script. | ||||
* | | | Adding wsrep_sst_xtrabackup-v2 to the list of files | Nirbhay Choubey | 2014-04-15 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | in mariadb-galera-server package. | ||||
* | | | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 2 | -0/+2 |
|\ \ \ | |/ / | | | | | | | | | | * bzr merge -rtag:mariadb-10.0.10 maria/10.0. | ||||
| * | | Merge with 10.0-base | Michael Widenius | 2014-03-13 | 2 | -0/+2 |
| |\ \ | | | | | | | | | | | | | | | | | Automatic merge, except for server_audit.cc that had to be modified slightly Changes to xtradb and innobase where ignored was these made no sence for 10.0 | ||||
| | * \ | Merge with 5.5 | Michael Widenius | 2014-03-11 | 2 | -0/+2 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-5756 Add Audit Plugin to Debian packaging. | Alexey Botchkov | 2014-02-28 | 2 | -0/+2 |
| | | | | |||||
* | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 11 | -41/+42 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | * Fix for post-merge build failures. | ||||
| * | | | default xtradb - fixes for debian packaging | Sergei Golubchik | 2014-03-08 | 2 | -2/+2 |
| | | | | |||||
| * | | | MDEV-4447 MariaDB sources should have unix-style line endings everywhere | Sergei Golubchik | 2014-02-27 | 2 | -11/+11 |
| | | | | |||||
| * | | | revert bugfix for MDEV-5295 deb upgrade 5.5 to 10.0.6 does not work | Sergei Golubchik | 2014-02-05 | 2 | -16/+16 |
| | | | | | | | | | | | | | | | | it didn't help, instead it only broke upgrades even more | ||||
| * | | | MDEV-5591 Cannot build the package under Debian Wheezy | Elena Stepanova | 2014-02-05 | 2 | -10/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Rules performed unnecessary copying which made tests run with wrong global testdir | ||||
| * | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 7 | -18/+29 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.5 merge | Sergei Golubchik | 2014-02-01 | 7 | -18/+28 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-4787 Missing dependency to "patch" for the Debian/Ubuntu "mariadb-test" ↵ | Sergei Golubchik | 2014-01-27 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | package add patch as a "suggested" dependency to mariadb-test-5.5 | ||||
| | | * | update debian patches to match the current code state | Sergei Golubchik | 2014-01-23 | 5 | -13/+13 |
| | | | | |||||
| * | | | upgrade sphinx to 2.1.5 | Sergei Golubchik | 2014-02-01 | 2 | -2/+0 |
| | | | | |||||
| * | | | MDEV-5295 deb upgrade 5.5 to 10.0.6 does not work | Sergei Golubchik | 2014-01-29 | 2 | -16/+16 |
| | | | | | | | | | | | | | | | | Use Breaks: not Conflicts: | ||||
| * | | | MDEV-5493 ha_sphinx.so is not included into Ubuntu deb packages (included ↵ | Sergei Golubchik | 2014-01-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | into Debian) | ||||
* | | | | Merging deb/rpm script changes from maria-5.5-galera. | Nirbhay Choubey | 2014-03-24 | 2 | -4/+4 |
| | | | | |||||
* | | | | Modified debian scripts to make galera packages | Nirbhay Choubey | 2014-03-14 | 36 | -647/+76 |
| | | | | | | | | | | | | | | | | | | | | self-contained. | ||||
* | | | | Debian script fixes. | Nirbhay Choubey | 2014-03-13 | 6 | -25/+12 |
| | | | | |||||
* | | | | Fixed install_macros.cmake to set the correct | Nirbhay Choubey | 2014-02-19 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | destination for documentation. | ||||
* | | | | * mysqld_safe could not start server as it failedmariadb-galera-10.0.7 | Nirbhay Choubey | 2014-02-14 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trying to perform wsrep position recovery. Fixed by correcting the erroneous mysqld command by properly quoting it. * Merged the changes made to Ubuntu rules in previous revision to Debian rules. | ||||
* | | | | Fixes in debian distribution files. | Nirbhay Choubey | 2014-02-13 | 31 | -80/+269 |
| | | | | |||||
* | | | | * Fixed debian dist file names. | Nirbhay Choubey | 2014-01-30 | 11 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Fixed failing test results. * Updated tztime.cc (lp:1161432). | ||||
* | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera. | Nirbhay Choubey | 2014-01-30 | 15 | -44/+127 |
| | | | | | | | | | | | | | | | | | | | | * Fixed Debian/Ubuntu dist files. * Fixed some compiler warnings. | ||||
* | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 5 | -5/+23 |
|\ \ \ \ | |/ / / | |||||
| * | | | put ha_xtradb.so in deb packages | Sergei Golubchik | 2013-12-22 | 2 | -1/+2 |
| | | | | |||||
| * | | | MDEV-5319 - Request for merge of Oqgraph v3 functionality | Sergey Vojtovich | 2013-12-16 | 5 | -2/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | storage/oqgraph into 10.0 - since oqgraph depends on Judy, move it to a separate package (DEB) | ||||
| * | | | MDEV-4748 - metadata_lock_info plugin | Sergey Vojtovich | 2013-12-13 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | - include metadata_lock_info plugin into debian packages - ignore metadata_lock_info plugin in mysqld--help test - let test suite run with built-in metadata_lock_info plugin | ||||
| * | | | restore debian/dist/Ubuntu/control that was changed by mistake | Sergei Golubchik | 2013-12-12 | 1 | -11/+8 |
| | | | | |||||
| * | | | correct old assert in add_role_user_mapping_action to match changed function ↵ | Sergei Golubchik | 2013-12-09 | 1 | -8/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | prototypes. fix the element deleting logic for roles_mappings_hash | ||||
| * | | | remove unused libevent (that was merged from 5.6 by mistake) | Sergei Golubchik | 2013-11-21 | 2 | -2/+2 |
| | | | | |||||
* | | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 9 | -44/+69 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | and a number of fixes to make this buildable. Run also few short multi-master high conflict rate tests, with no issues | ||||
| * | | | add missing plugins to deb packages | Sergei Golubchik | 2013-11-14 | 3 | -8/+17 |
| | | | | |||||
| * | | | 10.0-base merge | Sergei Golubchik | 2013-11-13 | 6 | -28/+11 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.5. merge | Sergei Golubchik | 2013-11-13 | 6 | -28/+11 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-5038 put tokudb into the server package | Sergei Golubchik | 2013-11-11 | 6 | -28/+11 |
| | | | | |||||
| * | | | merge with 10.0.5 | Sergei Golubchik | 2013-11-09 | 2 | -2/+4 |
| |\ \ \ | |||||
| | * | | | 10.0 version of MDEV-5254 | Sergei Golubchik | 2013-11-07 | 2 | -2/+4 |
| | | | | | |||||
| * | | | | mariadb-tokudb-engine-10.0.deb | Sergei Golubchik | 2013-11-09 | 5 | -8/+8 |
| | | | | | |||||
| * | | | | misc fixes for buildbot | Sergei Golubchik | 2013-11-07 | 2 | -2/+2 |
| |/ / / | |||||
| * | | | 10.0-base merge (roles) | Sergei Golubchik | 2013-10-29 | 1 | -6/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | fixes for builbot 1 | Sergei Golubchik | 2013-10-20 | 1 | -6/+6 |
| | | | | |||||
| * | | | simplify CMakeLists.txt for cassandra/connect engines | Sergei Golubchik | 2013-09-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | now, if the dynamic plugin puts itself in a distinct component, then * ${plugin}.cnf file is generated and installed automatically * a separate RPM is generated automatically * necessary FILELIST/PROVIDES/OBSOLETES/REQUIRES are filled in automatically |