summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | 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
|\ \ \ | | |/ | |/|
| * | Restore alphabetical order of the system variables.ramil/ram@mysql.com/myoffice.izhnet.ru2006-08-141-1/+1
| |/
* | Fixed bug#16861: User defined variable can have a wrong value if a tmp table wasevgen@sunlight.local2006-08-221-1/+1
* | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1cmiller@zippy.cornsilk.net2006-08-091-1/+2
|\ \ | |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@zippy.cornsilk.net2006-08-021-1/+2
| |\
| | * Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maintiggy@rolltop.ignatz42.dyndns.org2006-07-191-1/+2
| | |\
| | | * Bug#16180 Setting SQL_LOG_OFF without SUPER privilege is silently ignorediggy@mysql.com2006-06-271-1/+2
* | | | Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes neededtsmith/tim@siva.hindu.god2006-07-201-0/+1
|\ \ \ \ | |/ / /
| * | | --{skip-}merge option added which allows the user to disable merge engine andramil/ram@mysql.com/myoffice.izhnet.ru2006-07-141-0/+1
| |/ /
* | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-081-0/+40
|\ \ \ | |/ /
| * | WL#2928 Date Translation NREbar@mysql.com2006-07-041-0/+43
| |/
* | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@mysql.com2006-06-281-1/+1
|\ \
| * | Bugs#20392: INSERT_ID session variable has weird valuebar@mysql.com2006-06-221-1/+1
* | | Fix compilation failures on Windows caused by the patch for Bug#17199.konstantin@mysql.com2006-06-271-1/+1
|/ /
* | Bug #1039: tmpdir and datadir not available via @@ system variable syntaxjimw@mysql.com2006-05-081-3/+66
* | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2006-05-041-2/+2
|\ \ | |/
| * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1jani@hundin.mysql.fi2006-04-301-4/+0
| |\
| | * Fix for Bug#14515.jani@a193-229-222-105.elisa-laajakaista.fi2006-04-301-4/+0
* | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-04-271-0/+1
|\ \ \