summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
Commit message (Expand)AuthorAgeFilesLines
* 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 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:/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
| * | | | | | | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2006-11-291-2/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Increased heap max length to > 4G for 64 bit machines monty@mysql.com/nosik.monty.fi2006-11-281-2/+2
| | | |_|_|/ / | | |/| | | |
* | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-11-301-13/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-11-291-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159kroki/tomash@moonlight.intranet2006-11-211-13/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | / / | | |_|_|/ / | |/| | | |
| | * | | | 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
| | | |\ \ \ | | | | |/ / | | | |/| |
* | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-11-281-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fixed a LOT of compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-271-1/+1
| |/ / / /
* | | | | This straightens up usage of have_ variables, and removes dead -skip-isam opt...brian@zim.(none)2006-11-201-10/+0
* | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-archbrian@zim.(none)2006-11-101-3/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | This patch fixes the example engine, the example parser, and the example daem...brian@zim.(none)2006-11-101-3/+0
* | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-11-071-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | Removed Innodb variable at request of Innobase. brian@zim.(none)2006-11-051-2/+0
* | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@shellback.(none)2006-10-301-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Improve comments around FLUSH STATUSmsvensson@shellback.(none)2006-10-301-1/+1