summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@pilot.blaudden2007-03-081-2/+4
|\
| * Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781msvensson@pilot.blaudden2007-03-051-2/+4
| |\
| | * Add "have_ssl" as synonym for "have_openssl"msvensson@pilot.blaudden2007-03-051-1/+3
* | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimetsmith@quadxeon.mysql.com2007-03-071-2/+11
|\ \ \
| * | | Bug #26598: Create variable to allow turning off of statistic gathering on me...tsmith@siva.hindu.god2007-03-061-1/+3
| |/ /
| * | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1msvensson@pilot.blaudden2007-03-011-3/+15
| |\ \
| * \ \ Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166msvensson@pilot.blaudden2007-02-201-0/+5
| |\ \ \ | | | |/ | | |/|
| | * | 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/mysql-5.0-maintmsvensson@pilot.mysql.com2007-02-141-1/+3
| |\ \ \ | | |/ /
| | * | 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 weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-02-281-3/+15
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-231-3/+15
| |/ / /
* | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-02-151-10/+5
|\ \ \ \ | |/ / /
| * | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2007-02-061-8/+3
| |\ \ \
| | * | | After merge fixesmonty@mysql.com/narttu.mysql.fi2007-01-291-2/+0
| | * | | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-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/my50-bug22943msvensson@pilot.mysql.com2007-01-291-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | 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
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
* | | | | | | BUG#23225: Slow query log: setting slow_query_log_file writes tokroki/tomash@moonlight.home2007-02-021-1/+1
|/ / / / / /
* | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-01-171-15/+28
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-01-121-15/+28
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-5.1-new-rpllars@black.(none)2006-12-081-15/+28
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge suse.vabb.com:/home/Chuck/development/mysql-5.1-new-rplcbell/Chuck@suse.vabb.com2006-12-071-9/+0
| | | |\ \ \ \ \ \
| | | | * | | | | | WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.cbell/Chuck@suse.vabb.com2006-12-071-9/+0
| | | * | | | | | | Merge mysql.com:/usr/home/bar/mysql-5.0.b22645bar@bar.intranet.mysql.r18.ru2006-12-051-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
* | | | | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2007-01-111-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bug#25183 (Compiler warnings in the sql directory (GCC 4.1))malff/marcsql@weblab.(none)2006-12-191-1/+1
* | | | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-01-021-1/+65
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | / / / / / / / / / | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-12-011-1/+65
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2006-11-301-1/+65
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2006-11-211-1/+65
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | WL#3602 (SET GLOBAL READONLY)malff/marcsql@weblab.(none)2006-11-201-1/+65
| | | | |/ / / / / / /
* | | | | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
* | | | | | | | | | | Post-merge fix (related to bug 24200 changes)tsmith/tim@siva.hindu.god2006-12-201-1/+2
* | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50-buildtsmith/tim@siva.hindu.god2006-12-201-0/+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
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2006-11-301-9/+11
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fixed compiler warnings (Mostly VC++):monty@mysql.com/narttu.mysql.fi2006-11-301-7/+9