summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual mergeistruewing@stella.local2008-03-141-30/+8
|\
| * Merge kaamos.(none):/data/src/mysql-5.1kaa@kaamos.(none)2008-03-121-30/+8
| |\
| | * Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opttnurnberg@white.intern.koehntopp.de2008-02-241-31/+8
| | |\
| | | * Bug#32757: hang with sql_mode set when setting some global variablestnurnberg@mysql.com/white.intern.koehntopp.de2008-02-241-31/+8
* | | | Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/...antony@pcg5ppc.xiphis.org2008-03-071-36/+91
|\ \ \ \ | |/ / / |/| | |
| * | | Merge xiphis.org:/anubis/antony/work/p1-bug34598.2acurtis/antony@ltamd64.xiphis.org2008-02-191-15/+41
| |\ \ \
| | * | | Bug#34598acurtis/antony@xiphis.org/ltamd64.xiphis.org2008-02-191-15/+41
| | | |/ | | |/|
| * | | Merge stella.local:/home2/mydev/mysql-5.1-amainistruewing@stella.local2008-02-141-1/+1
| |\ \ \ | | | |/ | | |/|
| * | | fixes to make pushbuild tests greenacurtis/antony@xiphis.org/ltamd64.xiphis.org2008-01-261-3/+2
| * | | Bug#33358acurtis/antony@xiphis.org/ltamd64.xiphis.org2008-01-251-18/+48
| | |/ | |/|
* | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-buildguilhem@gbichot4.local2008-02-181-4/+3
|\ \ \ | |_|/ |/| |
| * | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>guilhem@gbichot4.local2008-02-181-4/+3
| |/
* | A fix and a test case for Bug#34166 Server crash in SHOW OPEN TABLES andkostja@dipika.(none)2008-01-301-1/+1
|/
* Merge mysql.com:/home/gluh/MySQL/Merge/5.1gluh@eagle.(none)2007-12-131-4/+52
|\
| * Bug#31177: Server variables can't be set to their current valuestnurnberg@sin.intern.azundris.com2007-12-061-0/+2
| * Bug#31177: Server variables can't be set to their current valuestnurnberg@mysql.com/white.intern.koehntopp.de2007-12-041-2/+21
| * Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opttnurnberg@white.intern.koehntopp.de2007-12-021-4/+31
| |\
| | * Bug#31177: Server variables can't be set to their current valuestnurnberg@mysql.com/white.intern.koehntopp.de2007-12-011-4/+31
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-11-191-1/+2
|\ \ \ | |/ /
| * | Merge mysql.com:/home/gluh/MySQL/Merge/5.1gluh@eagle.(none)2007-11-141-1/+1
| |\ \
| | * | Fixed bug #32034: On 64bit platforms assigning values ofgshchepa/uchum@gleb.loc2007-11-141-1/+1
| | |/
| * | Bug#31210 - INSERT DELAYED crashes server when used onistruewing@stella.local2007-11-051-0/+1
| |/
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-10-221-4/+9
|\ \ | |/
| * fix undefined variable which can lead to crashacurtis/antony@xiphis.org/ltamd64.xiphis.org2007-10-041-2/+3
| * Bug#31382acurtis/antony@xiphis.org/ltamd64.xiphis.org2007-10-041-3/+7
| * Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-08-221-11/+18
| |\
* | | sql_plugin.cc:serg@janus.mylan2007-10-081-2/+8
* | | Manual merge of parallel development in separate team trees.joerg@trift2.2007-08-221-11/+18
|\ \ \ | |/ / |/| / | |/
| * Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarismonty@mysql.com/nosik.monty.fi2007-08-131-11/+18
* | Fix doxygen warnings.kostja@bodhi.(none)2007-08-151-1/+1
|/
* WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)malff/marcsql@weblab.(none)2007-07-271-2/+2
* Merge ppcg5.local:/Users/antony/Work/p2-bug25800.6antony@ppcg5.local2007-06-141-24/+32
|\
| * post-merge fixistruewing@chilla.local2007-05-311-3/+3
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1istruewing@chilla.local2007-05-311-24/+32
| |\
| | * Bug#27836antony@ppcg5.local2007-05-241-24/+32
* | | Bug#25800antony@ppcg5.local2007-06-121-0/+22
|/ /
* | Added casts to avoid compiler warnings and fixed a wrong type.jani@a88-113-38-195.elisa-laajakaista.fi2007-05-311-3/+3
* | Merged from main 5.1jani@linux-th5m.site2007-05-241-33/+33
* | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-241-13/+14
|\ \ | |/ |/|
| * WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-101-14/+14
* | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opttomas@whalegate.ndb.mysql.com2007-05-101-0/+1
|\ \
| * \ Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bjgni@dev3-221.dev.cn.tlan2007-05-081-0/+1
| |\ \ | | |/ | |/|
| | * Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bjgni@dev3-221.dev.cn.tlan2007-04-241-0/+1
| | |\
| | | * BUG#18676 In order to coincide with 5.0 mysqld error code after bug#18676, Ma...gni/root@dev3-221.dev.cn.tlan2007-04-161-0/+1
* | | | WL#2936acurtis/antony@xiphis.org/ltamd64.xiphis.org2007-05-041-2/+14
* | | | WL#2936acurtis/antony@xiphis.org/ltamd64.xiphis.org2007-05-011-8/+6
* | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-04-301-21/+29
|\ \ \ \
| * | | | WL#2936acurtis/antony@xiphis.org/ltamd64.xiphis.org2007-04-301-21/+29
* | | | | WL#2936 - Falcon & MySQL plugin interface: server variablesistruewing@chilla.local2007-04-301-4/+3
|/ / / /
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesserg@sergbook.mysql.com2007-04-291-9/+3
|\ \ \ \
View Lorry Controller Status