summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base -> 10.0-montySergei Golubchik2012-10-191-1/+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
* | | | | more fixes for test casesSergei Golubchik2012-10-011-1/+1
* | | | | fixes for test failuresSergei Golubchik2012-09-271-0/+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
| * | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-5/+18
| |\ \ \ \ | | |/ / /
| | * | | Merge with MariaDB 5.1Michael Widenius2011-05-031-5/+18
| | |\ \ \ | | | |/ /
| | | * | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-5/+18
| | | |\ \
| * | | \ \ Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree.unknown2011-05-031-0/+3
| |\ \ \ \ \
| | * | | | | Backport MySQL WL#2540 into MariaDB.unknown2011-05-031-0/+3
| | |/ / / /
| * | | | | Merge with 5.2Michael Widenius2011-03-091-1/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+10
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+7
| | | |\ \ \
| | | * | | | Ignore some linked filesMichael Widenius2011-01-301-0/+3
| * | | | | | Added HandlerSocket pluginMichael Widenius2011-02-201-0/+1
* | | | | | | update .bzrignoreSergei Golubchik2011-07-101-0/+33
* | | | | | | 5.5-mergeSergei Golubchik2011-07-021-23/+16
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Ignore auto-generated files (source_downloads).Alexander Nozdrin2011-06-071-0/+1
| * | | | | | Ignore auto-generated files.Alexander Nozdrin2011-05-161-0/+1
| * | | | | | Ignore auto-generated files.Alexander Nozdrin2011-05-111-0/+3
| * | | | | | Manual merge from 5.1Mattias Jonsson2011-04-201-0/+9
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | mergeMattias Jonsson2011-04-201-0/+9
| | |\ \ \ \ \
| | | * | | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAKMattias Jonsson2011-03-251-0/+12
| | | | |_|_|/ | | | |/| | |