summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
Commit message (Expand)AuthorAgeFilesLines
* Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-071-2/+5
|\
| * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-071-2/+5
| |\
| | * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-2/+5
| | |\
| | | * Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bakunknown2007-04-161-0/+3
| | | |\
| | | | * Pagecache integration for review.unknown2007-04-041-0/+3
| | | * | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-2/+2
| | | |\ \ | | | | |/
| | | | * Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-201-2/+2
| | | | |\
| | | | | * Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-181-2/+2
| | | | | |\
| | | | | | * Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2006-10-131-1/+1
| | | | | | |\
| | | | | | | * Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2006-09-201-1/+1
| | | | | | | |\
| | | | | | | | * Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2006-08-101-1/+1
| | | | | | | | |\
| | | | | | | | | * amd64 atomic opsunknown2006-08-101-1/+1
| | | | | | * | | | Merge of recent MyISAM changes into Maria. Testsuite passes as muchunknown2006-10-111-0/+3
| | | | | | * | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-10-101-4/+1
| | | | | | |\ \ \ \ | | | | | | | |/ / /
| | | | | | | * | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2006-09-071-0/+7
| | | | | | | |\ \ \ | | | | | | | | |/ /
| | | | | | | | * | Merge gbichot3.local:/home/mysql_src/mysql-5.1-2unknown2006-08-091-0/+7
| | | | | | | | |\ \
| | | | | | | | | * \ Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1unknown2006-05-241-0/+6
| | | | | | | | | |\ \
| | | | | | | | | | * | Added storage/maria (based on MyISAM). WL#3245unknown2006-04-111-0/+6
* | | | | | | | | | | | Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-enginesunknown2007-07-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Bug #29245: Bad Merge Caused Error Codes Conflict between 5.0/5.1unknown2007-06-261-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Patch for the following bugs:unknown2007-06-281-1/+95
|/ / / / / / / / / /
* | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-rplunknown2007-06-211-0/+1
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1unknown2007-06-211-10/+18
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rplunknown2007-06-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rplunknown2007-06-181-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rplunknown2007-06-121-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rplunknown2007-06-121-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | WL#3303 (RBR: Engine-controlled logging format):unknown2007-05-291-0/+1
* | | | | | | | | | | | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/51unknown2007-06-211-10/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Manual merge.unknown2007-06-191-10/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-baseunknown2007-06-151-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | | This the 4-th patch in scope of CS patch (BUG#11986).unknown2007-06-141-3/+10
| | * | | | | | | | | | | | | | The second cleanup patch in scope of BUG#11986.unknown2007-06-141-1/+2
| | * | | | | | | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-baseunknown2007-06-111-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Follow up after work on Bug 4968unknown2007-06-101-6/+6
* | | | | | | | | | | | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/51unknown2007-06-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Sdditional fix-up for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlockunknown2007-06-181-0/+1
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.1-amainunknown2007-06-151-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1unknown2007-06-141-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | bug #28309 First insert violates UNIQUE constraint - was "memory" table empty?unknown2007-06-071-0/+1
| | * | | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-06-051-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Bug #28488: Incorrect information in file: './test/t1_test#.frm'unknown2007-06-041-0/+2
* | | | | | | | | | | | | | | Bug#26402 Server crashes with old-style named tableunknown2007-06-141-0/+4
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51unknown2007-06-051-63/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-011-36/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-241-36/+38
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-101-37/+37
| | | * | | | | | | | | | | Merge nosik:/my/mysql-5.1unknown2007-05-021-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Added sql_mode PAD_CHAR_TO_FULL_LENGTH (WL#921)unknown2007-04-271-0/+2
| | | | |/ / / / / / / / / /
| * | | | | | | | | | | | | Merge adventure.(none):/home/thek/Development/cpp/bug24988/my51-bug24988unknown2007-05-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \