summaryrefslogtreecommitdiff
path: root/libmysqld/lib_sql.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-1/+1
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-1/+1
| |\
| | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-2/+1
* | | Merge mysql.com:/d2/hf/common/my41-commonholyfoot/hf@mysql.com/hfmain.(none)2007-01-031-0/+1
|\ \ \
| * | | warning count for embedded prepared statements addedholyfoot/hf@mysql.com/hfmain.(none)2007-01-031-0/+1
| * | | merging fixholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-2/+0
* | | | Merge mysql.com:/d2/hf/common/my41-commonholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-0/+4
|\ \ \ \ | |/ / /
| * | | merging fixholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-4/+4
| * | | embedded-server related fixesholyfoot/hf@mysql.com/hfmain.(none)2007-01-021-0/+6
| * | | Merge bk@192.168.21.1:mysql-4.1-optholyfoot/hf@mysql.com/deer.(none)2006-12-081-0/+4
| |\ \ \
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1kostja@bodhi.local2006-11-291-5/+9
| |\ \ \ \
* | \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/deer.(none)2006-12-081-0/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | several fixes to make tests pass in embedded-server modeholyfoot/hf@mysql.com/deer.(none)2006-11-131-0/+2
| * | | | | Merge mysql.com:/home/hf/work/embt/my41-embtholyfoot/hf@mysql.com/deer.(none)2006-11-131-0/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | embedded-mode tests fixedholyfoot/hf@mysql.com/deer.(none)2006-11-131-0/+4
| | |/ / /
| * | | | Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmtholyfoot/hf@mysql.com/deer.(none)2006-10-241-1/+1
| |\ \ \ \ | | |/ / /
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-11-291-0/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge mysql.com:/home/hf/work/mysql-4.1-mrgholyfoot/hf@mysql.com/deer.(none)2006-11-161-0/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug #23427 (incompatible ABI change)holyfoot/hf@mysql.com/deer.(none)2006-10-241-5/+5
* | | | | Fix after manual merge: remove dead declaration.kroki/tomash@moonlight.intranet2006-11-171-1/+0
* | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383kroki/tomash@moonlight.intranet2006-11-171-7/+9
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | BUG#23383: mysql_affected_rows() returns different values thankroki/tomash@moonlight.intranet2006-11-171-5/+9
| |/ /
* | | Bug #23427: incompatible ABI change in 5.0.26?cmiller@zippy.cornsilk.net2006-10-201-1/+0
| |/ |/|
* | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-251-2/+6
|\ \ | |/
| * Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-201-2/+6
| |\
| | * bug #19983 (mysql_client_test_embedded fails)holyfoot@deer.(none)2006-06-021-2/+6
* | | mergingholyfoot/hf@mysql.com/deer.(none)2006-07-181-14/+0
* | | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-181-10/+25
|\ \ \ | |/ /
| * | Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-131-22/+31
| |\ \
| | * | bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-011-22/+31
| | |/
* | | mergingholyfoot@mysql.com2006-06-261-0/+7
|\ \ \ | |/ /
| * | bug #20318 (ctype_ucs2_def test fails with embedded)holyfoot@deer.(none)2006-06-191-0/+7
| |/
* | compilation fixesserg@serg.mylan2006-03-061-29/+22
* | Fixes to embedded server to be able to run tests with itmonty@mysql.com2006-02-241-145/+367
* | Fix for bug #13546 "Build errors with --with-embedded-serverdlenev@mysql.com2005-09-281-8/+9
* | Merge mysql.com:/home/dlenev/src/mysql-4.1-bg13501dlenev@mysql.com2005-09-281-2/+2
|\ \ | |/
| * Fix for bug #13501 "build problem: too many arguments to function my_booldlenev@mysql.com2005-09-271-2/+2
* | postmerge fixesbell@sanja.is.com.ua2005-09-211-1/+1
* | WL#2787 (part 2, ver 3 (merged)) changed securety context switchingbell@sanja.is.com.ua2005-09-151-4/+3
* | Merge deer.(none):/home/hf/work/mysql-4.1.9110hf@deer.(none)2005-07-271-0/+2
|\ \ | |/
| * Fix for bug #9110 (Max_join_size error)hf@deer.(none)2005-07-261-0/+2
* | A fix and a test case for Bug#10794 "mysql_stmt_attr_set no konstantin@mysql.com2005-06-301-1/+1
* | Rename all prepared statements COM_ commands to prefix with COM_STMT_konstantin@mysql.com2005-06-171-1/+1
* | BUG#9391 mysqlshow prints incorrect "rows" informationmsvensson@neptunus.(none)2005-04-131-5/+0
* | Remove compiler warnings and remove not used variablesmonty@mysql.com2005-02-251-4/+0
* | Merging conflicts resolvedhf@deer.(none)2005-01-111-2/+3
|\ \ | |/
| * A fix for Bug#7365 "embedded server for MacOS: problem with preparedkonstantin@mysql.com2005-01-111-2/+3
* | manually mergedserg@sergbook.mysql.com2004-12-311-6/+6
|\ \ | |/
| * Tabs removedhf@deer.(none)2004-12-211-6/+6
* | Merge with 4.1monty@mishka.local2004-12-221-26/+53
|\ \ | |/