summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
Commit message (Expand)AuthorAgeFilesLines
* Merged with mysql-5.1 main tree.unknown2007-07-021-7/+7
* Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-2/+190
|\
| * Fixed dubug info.unknown2007-04-181-6/+5
| * Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bakunknown2007-04-161-2/+174
| |\
| | * Pagecache integration for review.unknown2007-04-041-2/+174
| * | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-3/+37
| |\ \ | | |/
| | * merge of recent MyISAM changes into Maria.unknown2006-12-201-0/+2
| | * Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-201-3/+35
| | |\
| | | * Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-181-3/+37
| | | |\
| | | | * Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2006-10-131-2/+2
| | | | |\
| | | | | * Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2006-09-201-2/+2
| | | | | |\
| | | | | | * Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2006-08-101-2/+2
| | | | | | |\
| | | | | | | * amd64 atomic opsunknown2006-08-101-2/+2
| | | | * | | | Merge of recent MyISAM changes into Maria. Testsuite passes as muchunknown2006-10-111-2/+2
| | | | * | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-10-101-1/+35
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2006-09-071-1/+35
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge gbichot3.local:/home/mysql_src/mysql-5.1-2unknown2006-08-091-1/+35
| | | | | | |\ \
| | | | | | | * \ Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1unknown2006-05-241-1/+35
| | | | | | | |\ \
| | | | | | | | * | Added storage/maria (based on MyISAM). WL#3245unknown2006-04-111-1/+35
* | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rplunknown2007-06-181-11/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rplunknown2007-06-181-11/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rplunknown2007-06-121-11/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rplunknown2007-06-121-11/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | WL#3303 (RBR: Engine-controlled logging format):unknown2007-05-281-10/+0
* | | | | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.1-amainunknown2007-06-151-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1unknown2007-06-141-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Bug#28580 Repeatation of status variablesunknown2007-06-061-2/+0
* | | | | | | | | | | | | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesunknown2007-06-061-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-051-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-311-0/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Missing functionality in WL#2936:unknown2007-05-251-0/+19
* | | | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-051-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optunknown2007-06-041-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Bug #26162: Trigger DML ignores low_priority_updates settingunknown2007-06-031-1/+5
| | * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-05-151-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bjunknown2007-05-081-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bjunknown2007-04-181-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51unknown2007-06-051-93/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-011-89/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | / / / / / / / / / / / | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Changed accidently added tabs back into spaces.unknown2007-05-281-1/+1
| | * | | | | | | | | | | | | | | | Merged from main 5.1unknown2007-05-241-14/+1
| | * | | | | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-241-88/+104
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-101-77/+78
| | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074unknown2007-05-231-4/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | - This patch addesses the performance issues with invalidating the entireunknown2007-05-231-4/+11
* | | | | | | | | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664unknown2007-05-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Bug#26664 test suite times out on OS X 64bitunknown2007-05-241-2/+2
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-151-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge adventure.(none):/home/thek/Development/cpp/bug27792/my50-bug27792unknown2007-05-081-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | / / / / / / / / / / | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | 4.1 -> 5.0 Manual merge for Bug #27792 unknown2007-05-081-0/+5
| | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |