summaryrefslogtreecommitdiff
path: root/libmysqld/lib_sql.cc
Commit message (Expand)AuthorAgeFilesLines
* WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-101-13/+13
* manual mergeguilhem@gbichot3.local2007-03-091-6/+6
|\
| * Mechanical class renaming:guilhem@gbichot3.local2007-01-301-6/+6
* | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-231-9/+1
* | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-02-031-0/+1
|\ \
| * \ Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-0/+1
| |\ \ | | |/ | |/|
| | * 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
* | | | | BUG#25890 put previous fix in better placedf@kahlann.erinye.com2007-01-271-5/+5
* | | | | BUG#25895 compiling the server with embedded fails on several 64-bit platformsdf@kahlann.erinye.com2007-01-271-1/+1
* | | | | BUG#25890 mysqltest_embedded crashes on startdf@kahlann.erinye.com2007-01-271-0/+5
|/ / / /
* | | | Merge mysql.com:/d2/hf/common/my50-commonholyfoot/hf@hfmain.(none)2007-01-031-0/+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/my50-commonholyfoot/hf@hfmain.(none)2007-01-021-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | 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
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-11-291-0/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Fix after manual merge: remove dead declaration.kroki/tomash@moonlight.intranet2006-11-171-1/+0
* | | | | | | WL#3630 (add embedded server to pushbuild)holyfoot/hf@mysql.com/hfmain.(none)2006-12-281-0/+2
* | | | | | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@deer.(none)2006-12-081-0/+6
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/home/hf/work/embt/my50-embtholyfoot/hf@deer.(none)2006-11-131-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/current_stmt/my50-current_stmtholyfoot/hf@deer.(none)2006-10-241-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 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.1kostja@bodhi.local2006-11-291-0/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/home/hf/work/mysql-5.0-mrgholyfoot/hf@deer.(none)2006-11-171-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
* | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383kroki/tomash@moonlight.intranet2006-11-171-7/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | 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
| | |_|/ | |/| |
* | | | Bug #23427: incompatible ABI change in 5.0.26?mmj@tiger.local[mmj]2006-10-241-1/+0
| |_|/ |/| |
* | | Many files:kent@mysql.com/g4-2.local2006-08-211-5/+1
* | | Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfootpatg@govinda.patg.net2006-08-081-2/+6
|\ \ \ | |/ /
| * | 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
* | | | Merge rama.(none):/home/jimw/my/tmp_mergejimw@rama.(none)2006-07-281-11/+12
|\ \ \ \ | |/ / /
| * | | 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
| |\ \ \ | | |/ /
View Lorry Controller Status