summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | Merge of changes in MyISAM since December 16 -> April 1unknown2008-04-011-0/+1
| | * | | | | | | Fixed problems with ma_test2 and mi_test2 on high-byte-first systemunknown2008-02-211-0/+1
| | * | | | | | | ignore:unknown2008-02-031-0/+1
| | * | | | | | | storage/maria/unittest/ma_test_all-tunknown2008-01-291-0/+3
| | * | | | | | | Allow index on 'CHAR(0) NULL' columnsunknown2008-01-211-0/+1
| | * | | | | | | Windows fixesunknown2008-01-101-0/+5
| | * | | | | | | after mergeunknown2007-12-281-0/+1
| | * | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-0/+54
| | |\ \ \ \ \ \ \
| | | * | | | | | | Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expe...unknown2007-12-041-0/+2
| | | * | | | | | | make maria more pluggableunknown2007-10-121-0/+3
| | | * | | | | | | Fixed merge problems.unknown2007-09-271-0/+4
| | | * | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-0/+52
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Added maria_commit() and maria_begin() to be used with external testsunknown2007-08-291-0/+3
| | | | * | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-071-0/+50
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-07-041-0/+1
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | After merge fixesunknown2007-07-011-0/+1
| | | | | * | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-2/+51
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /
| | | | | | * | | | | | | Fixed LSN codding to allow code allunknown2007-06-151-0/+1
| | | | | | * | | | | | | Fixed that ma_test_all works with -T (simple transaction/logging support)unknown2007-06-041-0/+2
| | | | | | * | | | | | | After merge fixesunknown2007-04-191-0/+9
| | | | | | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-04-051-0/+9
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Fixed that maria.test worksunknown2007-04-051-0/+9
| | | | | | * | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-0/+28
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / /
| | | | | | | * | | | | | | After merge fixesunknown2007-01-261-0/+15
| | | | | | | * | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-201-0/+13
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-181-0/+13
| | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-10-101-0/+13
| | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2006-09-071-0/+13
| | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-2unknown2006-08-091-0/+13
| | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1unknown2006-05-241-1/+14
| | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | * | | | | | | Added storage/maria (based on MyISAM). WL#3245unknown2006-04-111-0/+13
* | | | | | | | | | | | | | | | | | | | mysql-5.1 -> mysql-5.5 mergeSergei Golubchik2010-11-051-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Extract reload_acl_and_cache() and flush_tables_with_read_lock()Konstantin Osipov2010-08-131-0/+3
* | | | | | | | | | | | | | | | | | | Update .bzrignore.Alexander Nozdrin2010-07-301-0/+1
* | | | | | | | | | | | | | | | | | | manual merge from mysql-trunk-bugfixingJon Olav Hauglid2010-06-061-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Ignore files auto-generated for each build by CMake-build-scripts.Alexander Nozdrin2010-05-261-0/+10
* | | | | | | | | | | | | | | | | | | | Bug#42643: InnoDB does not support replication of TRUNCATE TABLEDavi Arnaut2010-05-251-0/+6
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Ignoring auto-generated libmysqld/des_key_file.cc.Alexander Nozdrin2010-04-211-0/+1
* | | | | | | | | | | | | | | | | | | Backport of:Konstantin Osipov2010-04-131-0/+1
* | | | | | | | | | | | | | | | | | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-061-0/+2
* | | | | | | | | | | | | | | | | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-2/+3
* | | | | | | | | | | | | | | | | | | Add configure.am to .bzrignore.Alexander Nozdrin2010-03-011-0/+1
* | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add libmysqld/sql_audit.cc to .bzrignore.Alexander Nozdrin2010-01-311-0/+1
* | | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Add client/dtoa.c to .bzrignore.Alexander Nozdrin2010-01-201-0/+1
| * | | | | | | | | | | | | | | | | | | Manual merge from next-mr.unknown2010-01-121-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-141-0/+2
| | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |