summaryrefslogtreecommitdiff
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1tsmith@quadxeon.mysql.com2007-03-221-2/+268
|\
| * Fix for BUG#735 "Prepared Statements: there is no support for Queryguilhem@gbichot3.local2007-03-091-2/+268
* | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-193-209/+1
|\ \ | |/ |/|
| * Remove test/udf_test and test/udf_test.res, since udf's are nowadaysmsvensson@pilot.blaudden2007-03-153-209/+1
* | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-231-20/+0
* | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-1203/+1203
|\ \ | |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-1203/+1203
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-1203/+1203
| | |\
| | | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-1203/+1203
* | | | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.mysql.com2007-01-191-1/+0
|\ \ \ \ | |/ / /
| * | | Bug #15518 Reusing a stmt that has failed during prepare does not clear errormsvensson@pilot.mysql.com2007-01-191-1/+0
* | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50tsmith@siva.hindu.god2007-01-181-8/+85
|\ \ \ \ | |/ / /
| * | | Merge 192.168.0.10:mysql/mysql-5.0-maintmsvensson@pilot.mysql.com2007-01-171-0/+28
| |\ \ \
| | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2007-01-111-0/+28
| | |\ \ \
| * | \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518msvensson@neptunus.(none)2007-01-161-8/+85
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Bug#15518 Reusing a stmt that has failed during prepare does not clear errormsvensson@neptunus.(none)2007-01-161-8/+85
* | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-01-021-0/+28
|\ \ \ \ \ \
| * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-12-121-0/+28
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge bodhi.local:/opt/local/work/mysql-5.0-4968kostja@bodhi.local2006-12-011-0/+28
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | A fix and a test case for Bug#24179 "select b into $var" fails with kostja@bodhi.local2006-12-011-0/+28
* | | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-311-0/+15
* | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-312-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-313-2/+17
* | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-2310-20/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-2310-20/+11
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-12-041-0/+147
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | / / | | |_|_|/ / | |/| | | |
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-11-291-1/+6
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | After merge fixes: remove const and add query buffer.kroki/tomash@moonlight.intranet2006-11-221-1/+2
| | * | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0kroki/tomash@moonlight.intranet2006-11-221-0/+68
| | |\ \ \ \
| * | \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-11-281-1/+6
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
* | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1pgalbraith@bk-internal.mysql.com2006-12-091-11/+3
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2006-12-041-11/+3
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-11-292-3/+56
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@neptunus.(none)2006-11-131-11/+3
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Bug#19817 error when try to compile PHP5.1 with mysql 5.0.21 static libsmsvensson@neptunus.(none)2006-11-131-11/+3
* | | | | | | | This finishes the work (someone) started to remove FIELD_ types and use the E...brian@zim.(none)2006-12-011-2/+2
|/ / / / / / /
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-11-292-3/+56
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvelmonty@nosik.monty.fi2006-11-271-1/+6
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.0monty@nosik.monty.fi2006-11-221-1/+6
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | |
| | | * | | | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-201-1/+6
| | | |/ / /
| * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marveljani@ua141d10.elisa.omakaista.fi2006-11-162-2/+50
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@ua141d10.elisa.omakaista.fi2006-10-172-3/+51
| | |\ \ \ \
| | | * | | | Changed several char* to LEX_STRING*.jani@ua141d10.elisa.omakaista.fi2006-10-161-3/+31
* | | | | | | After merge fixes: remove const and add query buffer.kroki/tomash@moonlight.intranet2006-11-221-1/+2
* | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21635kroki/tomash@moonlight.intranet2006-11-221-0/+68
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21635kroki/tomash@moonlight.intranet2006-11-221-0/+68
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | BUG#21635: MYSQL_FIELD struct's member strings seem to misbehave forkroki/tomash@moonlight.intranet2006-11-221-0/+68
* | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383kroki/tomash@moonlight.intranet2006-11-171-0/+78
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383kroki/tomash@moonlight.intranet2006-11-171-0/+78
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | BUG#23383: mysql_affected_rows() returns different values thankroki/tomash@moonlight.intranet2006-11-171-0/+78