summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0tsmith@quadxeon.mysql.com2007-06-051-1/+5
|\
| * Bug #26162: Trigger DML ignores low_priority_updates settinggkodinov/kgeorge@macbook.gmz2007-06-031-1/+5
* | Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664msvensson@pilot.blaudden2007-05-241-2/+2
|\ \ | |/ |/|
| * Bug#26664 test suite times out on OS X 64bitmsvensson@pilot.blaudden2007-05-241-2/+2
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@vajra.(none)2007-05-151-0/+5
|\ \
| * | 4.1 -> 5.0 Manual merge for Bug #27792 thek@adventure.(none)2007-05-081-0/+5
* | | Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bjgni@dev3-221.dev.cn.tlan2007-05-081-0/+4
|\ \ \ | |/ / |/| |
| * | Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bjlzhou/zhl@dev3-63.(none)2007-04-181-0/+4
| |\ \ | | |/ | |/|
| | * BUG#26675 Add ndb_connectstring in "show global variables".lzhou/zhl@dev3-63.(none)2007-03-121-0/+4
* | | Merge romeo.(none):/home/bkroot/mysql-5.0-rplmats@romeo.(none)2007-04-201-3/+11
|\ \ \
| * | | Bug#22648 LC_TIME_NAMES: Setting GLOBAL has no effectbar@mysql.com2007-04-091-3/+11
| |/ /
* | | Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()aelkin/elkin@andrepl.(none)2007-03-231-2/+3
|/ /
* | Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781msvensson@pilot.blaudden2007-03-051-1/+3
|\ \
| * | Add "have_ssl" as synonym for "have_openssl"msvensson@pilot.blaudden2007-03-051-1/+3
* | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0msvensson@pilot.blaudden2007-03-011-6/+3
|\ \ \ | |/ / |/| |
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-211-6/+3
| |\ \
| | * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-6/+3
| | |\ \ | | | |/ | | |/|
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-6/+3
| | | |\
| | | | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-6/+3
* | | | | Bug#20166 mysql-test-run.pl does not test system privilege tables creationmsvensson@pilot.blaudden2007-02-201-0/+6
* | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628msvensson@pilot.mysql.com2007-02-141-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bug#18628 mysql-test-run: security problem(part1)msvensson@pilot.mysql.com2007-02-141-0/+4
| |/ / /
* | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943msvensson@pilot.mysql.com2007-01-291-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Bug#22943 syscall pruning in libmysqlmsvensson@pilot.mysql.com2007-01-291-2/+2
* | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145j.mysql.com2007-01-121-6/+28
|\ \ \ \
| * \ \ \ Merge mysql.com:/home/bkroot/mysql-5.0-rpllars@mysql.com/black.(none)2006-12-081-6/+28
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge mysql.com:/usr/home/bar/mysql-4.1.b22645bar@mysql.com/bar.intranet.mysql.r18.ru2006-12-051-6/+28
| | |\ \ \
| | | * | | Bug#22645 LC_TIME_NAMES: Statement not replicatedbar@mysql.com/bar.intranet.mysql.r18.ru2006-12-051-8/+27
* | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
* | | | | | Added innodb_rollback_on_timeout option to restore the 4.1 tsmith/tim@siva.hindu.god2006-12-191-0/+1
|/ / / / /
* | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marveldf@kahlann.erinye.com2006-12-011-3/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fixed portability issue in my_thr_init.c (was added in my last push)monty@mysql.com/narttu.mysql.fi2006-11-301-1/+1
| * | | | Increased heap max length to > 4G for 64 bit machines monty@mysql.com/nosik.monty.fi2006-11-281-2/+2
| |/ / /
* | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159kroki/tomash@moonlight.intranet2006-11-211-15/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | BUG#23159: prepared_stmt_count should be status variablekroki/tomash@moonlight.intranet2006-11-211-14/+0
| |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1kostja@bodhi.local2006-11-021-2/+6
| |\
| | * BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID.kroki/tomash@moonlight.intranet2006-10-061-2/+6
| * | Merge bk-internal:/home/bk/mysql-4.1-maintjimw@rama.(none)2006-09-281-6/+6
| |\ \ | | |/ | |/|
* | | Improve comments around FLUSH STATUSmsvensson@shellback.(none)2006-10-301-1/+1
* | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-10-061-0/+1
|\ \ \
| * \ \ Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my50-bug19024iggy@rolltop.ignatz42.dyndns.org2006-10-041-0/+1
| |\ \ \
| | * | | Bug #19024- SHOW COUNT(*) WARNINGS not return Errorsiggy@rolltop.ignatz42.dyndns.org2006-10-041-0/+1
* | | | | Merge bk-internal:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-10-031-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix for the patch for bug#21726: Incorrect result with multiplekroki/tomash@moonlight.intranet2006-10-031-0/+1
* | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-10-031-2/+11
|\ \ \ \ \ | |/ / / /
| * | | | BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_IDkroki/tomash@moonlight.intranet2006-10-021-2/+11
| |/ / /
* | | | Fix merge of __attribute__ cleanup.jimw@rama.(none)2006-09-281-2/+2
* | | | Merge rama.(none):/home/jimw/my/mysql-4.1-cleanjimw@rama.(none)2006-09-281-6/+6
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bug #2717: include/my_global.h mis-defines __attribute__jimw@rama.(none)2006-08-171-6/+6
* | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/41tsmith@maint2.mysql.com2006-09-011-1/+1
|\ \ \ | | |/ | |/|