summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-04-031-0/+8
|\
| * Merge mysqldev@production.mysql.com:my/build-200702201448-5.0.36/mysql-5.0-re...cmiller@zippy.cornsilk.net2007-02-271-0/+8
| |\
| | * Prevent bugs by making DBUG_* expressions syntactically equivalent cmiller@zippy.cornsilk.net2007-02-221-1/+6
| | * Merge bk-internal.mysql.com:/data0/bk/mysql-5.0baker@bk-internal.mysql.com2007-01-141-0/+3
| | |\
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communitycmiller@zippy.cornsilk.net2007-01-031-0/+3
| | | |\
| | | | * Bug#24795: Add SHOW PROFILEcmiller@zippy.cornsilk.net2007-01-031-0/+3
* | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50tsmith@quadxeon.mysql.com2007-03-071-16/+38
|\ \ \ \ \
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimekostja@bodhi.local2007-03-071-16/+38
| |\ \ \ \ \
| | * | | | | A fix for Bug#26750 "valgrind leak in sp_head" (and post-reviewkostja@bodhi.local2007-03-071-16/+39
* | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimetsmith@quadxeon.mysql.com2007-03-071-0/+67
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2007-03-061-0/+67
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Bug#8407 (Stored functions/triggers ignore exception handler)malff/marcsql@weblab.(none)2007-03-051-0/+67
| | |/ / / /
* | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0msvensson@pilot.blaudden2007-03-011-11/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rplbar@mysql.com2007-02-281-0/+1
| |\ \ \ \ \
| | * | | | | Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it)bar@mysql.com2007-02-281-0/+1
| | |/ / / /
| * | | | | Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.0-rplcbell/Chuck@mysql_cab_desk.2007-02-261-1/+1
| |\ \ \ \ \
| | * | | | | BUG#20141 "User-defined variables are not replicated properly for SF/cbell/Chuck@mysql_cab_desk.2007-02-231-1/+1
| | |/ / / /
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-10/+13
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-15/+19
| | |\ \ \ \
| | | * | | | Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-15/+19
| | | | |_|/ | | | |/| |
* | | | | | Bug#18628 mysql-test-run: security problem(part1)msvensson@pilot.mysql.com2007-02-141-1/+1
|/ / / / /
* | | | | Manual merge.kostja@bodhi.local2007-01-151-10/+11
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge bodhi.local:/opt/local/work/mysql-4.1-4968kostja@bodhi.local2006-12-121-10/+11
| |\ \ \ \
| | * | | | A fix and test cases forkostja@bodhi.local2006-12-081-9/+10
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2007-01-111-2/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | A fix and a test case for Bug#24179 "select b into $var" fails with kostja@bodhi.local2006-12-011-2/+10
* | | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-311-1/+1
* | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| |_|/ / |/| | |
* | | | Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836iggy@rolltop.ignatz42.dyndns.org2006-12-041-3/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836iggy@rolltop.ignatz42.dyndns.org2006-11-291-3/+1
| |\ \ \
| | * | | Bug#20836 Selecting into variables results in wrong results being returnediggy@rolltop.ignatz42.dyndns.org2006-11-281-2/+1
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-11-291-8/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Increased heap max length to > 4G for 64 bit machines monty@mysql.com/nosik.monty.fi2006-11-281-8/+9
* | | | | Merge bk-internal:/home/bk/mysql-5.0gkodinov@dl145s.mysql.com2006-11-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-201-1/+1
| |/ / /
* | | | Merge mysql.com:/home/hf/work/mysql-4.1-mrgholyfoot/hf@mysql.com/deer.(none)2006-11-161-0/+6
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-11-161-0/+6
| |\ \ | | |/ | |/|
| | * Bug #23427 (incompatible ABI change)holyfoot/hf@mysql.com/deer.(none)2006-10-241-0/+6
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1kostja@bodhi.local2006-11-021-15/+33
| |\ \ | | |/ | |/|
| | * BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID.kroki/tomash@moonlight.intranet2006-10-061-15/+33
| * | Merge bk-internal:/home/bk/mysql-4.1-maintjimw@rama.(none)2006-09-281-1/+1
| |\ \ | | |/ | |/|
* | | Improve comments around FLUSH STATUSmsvensson@shellback.(none)2006-10-301-2/+7
* | | Merge bk-internal:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-10-031-2/+11
|\ \ \
| * | | Fix for the patch for bug#21726: Incorrect result with multiplekroki/tomash@moonlight.intranet2006-10-031-2/+11
* | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-10-031-15/+33
|\ \ \ \ | |/ / /
| * | | BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_IDkroki/tomash@moonlight.intranet2006-10-021-15/+33
* | | | Merge bk-internal:/home/bk/mysql-5.0-maintjimw@rama.(none)2006-09-281-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge rama.(none):/home/jimw/my/mysql-4.1-cleanjimw@rama.(none)2006-09-281-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Bug #2717: include/my_global.h mis-defines __attribute__jimw@rama.(none)2006-08-171-1/+1
* | | | after merge fixgluh@mysql.com/gluh.(none)2006-09-271-1/+1
|/ / /