summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-05-062-0/+182
|\
| * Manual merge for WL#1622 code, will need fixessergefp@mysql.com2004-05-052-0/+182
| |\
| | * WL#1622 "SQL Syntax for Prepared Statements" - cosmetic code review fixessergefp@mysql.com2004-04-302-0/+17
| | * Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-04-2813-150/+383
| | |\
| | * \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-04-144-0/+374
| | |\ \
| | * \ \ Mergedsergefp@mysql.com2004-04-132-0/+165
| | |\ \ \
| | | * \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-04-093-1/+3
| | | |\ \ \
| | | * \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-04-082-0/+165
| | | |\ \ \ \
| | | | * \ \ \ Mergesergefp@mysql.com2004-04-082-0/+165
| | | | |\ \ \ \
| | | | | * | | | Correct handling of parameter variables with NULL values in PREPARE queriessergefp@mysql.com2004-04-072-0/+13
| | | | | * | | | Post-merge fixessergefp@mysql.com2004-04-052-0/+152
| | | | | |\ \ \ \
| | | | | | * | | | Many files:sergefp@mysql.com2004-04-052-0/+152
* | | | | | | | | | Merge with 4.0 to get security patch for check_grant_colummonty@mysql.com2004-05-062-0/+5
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-05-052-0/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | very minor changes: a STOP SLAVE in a replication test to get rid of a non cr...guilhem@mysql.com2004-05-052-0/+5
* | | | | | | | | | | | Fixed wrong key usage which caused wrong result for some "WHERE primary_key=c...monty@mysql.com2004-05-062-0/+25
* | | | | | | | | | | | fixed test resultsbell@sanja.is.com.ua2004-05-051-1/+1
* | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-05-051-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Replication:guilhem@mysql.com2004-05-051-4/+6
* | | | | | | | | | | | | mergebell@sanja.is.com.ua2004-05-0531-27/+307
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | After merge fixesmonty@mysql.com2004-05-054-7/+7
| * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-0527-21/+300
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | after merge fixesmonty@mysql.com2004-05-059-21/+20
| | * | | | | | | | | | | Merge with 4.0.19monty@mysql.com2004-05-0524-13/+293
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge marko@build.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-05-033-1/+63
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | InnoDB: implement LOCK TABLE (Bug #3299)marko@hundin.mysql.fi2004-04-293-1/+63
| | | * | | | | | | | | | Portability fixesmonty@mysql.com2004-04-302-2/+2
| | | |/ / / / / / / / /
| | | * | | | | | | | | Very small fixes for testsuite (a real_sleep instead of sleep, plus TCP port ...guilhem@mysql.com2004-04-285-3/+5
| | | * | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-04-285-0/+87
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | A new option --replicate-same-server-id to force a slave to execute queries o...guilhem@mysql.com2004-04-285-0/+87
| | | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-04-285-2/+66
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fixed http address in some scripts (Bug #3460)monty@mysql.com2004-04-283-2/+49
| | | | * | | | | | | | | | Fixed stack overrun with some INSERT ... SELECT ... GROUP BY queries (Bug #3265)monty@mysql.com2004-04-282-0/+17
| | | | |/ / / / / / / / /
| | | * | | | | | | | | | Merge ltantony.dsl-verizon.net:/usr/home/antony/work/mysql-4.0antony@ltantony.dsl-verizon.net2004-04-288-7/+24
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix for Bug 3481antony@ltantony.dsl-verizon.net2004-04-288-7/+24
| | | | |/ / / / / / / / /
| | | * | | | | | | | | | bug#3556 - soundexserg@serg.mylan2004-04-282-4/+4
| | | |/ / / / / / / / /
| | | * | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-04-133-0/+45
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fix for BUG#3461 "multi-table DELETE replicated despite replicate-wild-ignore...guilhem@mysql.com2004-04-133-0/+45
* | | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-05-055-10/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | caching of queries with isammerge tables forbiden using general waybell@sanja.is.com.ua2004-05-053-10/+36
| * | | | | | | | | | | | avoid using ndb tables in query cachebell@sanja.is.com.ua2004-05-052-0/+74
* | | | | | | | | | | | | a fix (Bug #3435: STDDEV|VARIANCE(constant) returns constant if no rows)ram@gw.mysql.r18.ru2004-05-052-0/+17
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-0514-16/+182
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed crashing bug with alter table when table was in use (Bug #3643)monty@mysql.com2004-05-057-11/+58
| * | | | | | | | | | | Fix to handle unsigned data in prepared statements (Bug #3447)monty@mysql.com2004-05-047-5/+124
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2004-05-044-0/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix for a multi table updates when one of the tables is not updatedSinisa@sinisa.nasamreza.org2004-05-042-0/+5
| * | | | | | | | | | | union.result:Sinisa@sinisa.nasamreza.org2004-05-042-2/+2
| * | | | | | | | | | | union.result, union.test:Sinisa@sinisa.nasamreza.org2004-05-042-0/+2
| * | | | | | | | | | | Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT Sinisa@sinisa.nasamreza.org2004-05-032-0/+15