summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Expand)AuthorAgeFilesLines
* 5.5 mergeSergei Golubchik2013-11-231-0/+1
|\
| * .bzrignoreSergei Golubchik2013-11-191-0/+1
* | MDEV-4425 Regexp enhancementsAlexander Barkov2013-10-021-0/+1
* | pcre: Removing config.h from the tree, it's a generated file.Alexander Barkov2013-09-271-0/+1
* | MDEV-4425 REGEXP enhancementsAlexander Barkov2013-09-261-0/+13
* | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-4/+288
|\ \ | |/
| * .bzrignoreSergei Golubchik2013-09-091-0/+286
| * remove PBXTSergei Golubchik2013-08-301-4/+0
| * start using jemallocSergei Golubchik2013-08-301-0/+2
* | 5.5 mergeSergei Golubchik2013-07-171-0/+1
|\ \ | |/
| * mysql-5.5.32 mergeSergei Golubchik2013-07-161-0/+1
| |\
| | * A bit more intelligent processing of .in files in mysql-test/collectionsBjorn Munch2013-01-151-0/+2
* | | 5.5 mergeSergei Golubchik2013-06-061-0/+3
|\ \ \ | |/ /
| * | 5.3 merge.Sergei Golubchik2013-05-201-0/+2
| |\ \
| | * \ 5.2 mergeSergei Golubchik2013-05-201-6/+1
| | |\ \
| | | * \ 5.1 mergeSergei Golubchik2013-05-201-0/+1
| | | |\ \
| | | | * | MDEV-4280: Assertion `empty_size == empty_size_on_page' failure in ma_blockre...Michael Widenius2013-05-111-0/+1
| | * | | | bzr ignore sql-bench/test-table-eliminationSergey Petrunya2012-11-021-0/+1
| * | | | | If one declared several continue handler for the same condition on different ...Michael Widenius2013-05-061-0/+1
* | | | | | 5.5 mergeSergei Golubchik2013-03-271-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Automatic mergeMichael Widenius2013-03-011-0/+1
* | | | | | SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | MWL#182: Explain running statementsSergey Petrunya2012-06-151-0/+1
| |\ \ \ \ \
| | * \ \ \ \ MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-0/+1
| | |\ \ \ \ \
| | | * | | | | bzr ignore libmysqld/my_apc.ccSergey Petrunya2012-01-041-0/+1
| | | |/ / / /
* | | | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-091-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Bug#12845091 .EMPTY FILE IN /DATA/TEST PREVENTS USERS FROM DROPPING TEST DB O...Tor Didriksen2012-05-301-1/+1
* | | | | | Building RPMs with CPackSergei Golubchik2012-05-221-0/+3
| |/ / / / |/| | | |
* | | | | MDEV-207 Install headers required to build external storage pluginsSergei Golubchik2012-05-051-0/+1
* | | | | Ignore install_manifest.txt (created by 'make install')Michael Widenius2012-04-021-0/+1
* | | | | Merge MWL#192: Non-blocking client library, into MariaDB 5.5.unknown2012-02-211-0/+2
|\ \ \ \ \
| * | | | | MWL#192: Non-blocking client API for libmysqlclient.unknown2011-09-201-0/+4
* | | | | | Don't crash with: UPDATE performance_schema.setup_instruments SET ENABLED="NO";Michael Widenius2012-01-241-0/+2
* | | | | | 5.3 mergeSergei Golubchik2012-01-131-0/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Added new file (for netware)Michael Widenius2011-12-021-0/+2
* | | | | | Added ignore of generated fileMichael Widenius2011-12-271-0/+1
* | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-7/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | fix a compilation failure for perl Net::HandlerSocket moduleSergei Golubchik2011-10-121-0/+5
| * | | | | mergeSergei Golubchik2011-10-111-1/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | merge with 5.1Sergei Golubchik2011-10-071-1/+5
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/|
| | | * | support for plugins on windowsSergei Golubchik2011-10-041-0/+5
* | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | removed some duplicate/redundant entries from .bzrignoreBjorn Munch2011-09-291-68/+0
| * | | | Bug #12373393 PB2 SHOULD ALLOW TO CREATE COLLECTIONS AS SUPER SET OF EXISTING...Bjorn Munch2011-09-291-0/+1
* | | | | Fixed that oqgraph and libmysqld/examples compiles on OpenSuse 11.4Michael Widenius2011-10-261-0/+1
* | | | | cleanupsSergei Golubchik2011-10-191-0/+1
* | | | | merge with 5.3Sergei Golubchik2011-10-191-0/+29
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Automerge 5.2->5.3unknown2011-07-311-0/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge with 5.1Michael Widenius2011-07-251-0/+1
| | |\ \ \ | | | | |/ | | | |/|
| * | | | Added mytop to distribution (with some small trivial changes to make it workg...Michael Widenius2011-06-271-0/+1