summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-05-0611-56/+417
|\
| * WL#1622: Post-merge fixessergefp@mysql.com2004-05-052-9/+8
| * Manual merge for WL#1622 code, will need fixessergefp@mysql.com2004-05-0511-57/+419
| |\
| | * More small WL#1622 fixes: Allocate name of Prepared Statement on PS's mem_root.sergefp@mysql.com2004-04-301-4/+2
| | * WL#1622 "SQL Syntax for Prepared Statements" - cosmetic code review fixessergefp@mysql.com2004-04-302-14/+13
| | * Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-04-3011-54/+415
| | |\
| | | * Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-04-2829-227/+3847
| | | |\
| | | * \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-04-147-6/+413
| | | |\ \
| | | * | | Post-merge fixessergefp@mysql.com2004-04-141-2/+1
| | | * | | Mergedsergefp@mysql.com2004-04-1311-55/+417
| | | |\ \ \
| | | | * | | WL#1622 "SQL Syntax for Prepared Statements": post-review fixes:sergefp@mysql.com2004-04-135-166/+150
| | | | * | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-04-094-4/+20
| | | | |\ \ \
| | | | * \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-04-0811-24/+405
| | | | |\ \ \ \
| | | | | * \ \ \ Mergesergefp@mysql.com2004-04-0811-24/+405
| | | | | |\ \ \ \
| | | | | | * | | | Correct handling of parameter variables with NULL values in PREPARE queriessergefp@mysql.com2004-04-071-2/+4
| | | | | | * | | | Post-merge fixessergefp@mysql.com2004-04-0511-24/+403
| | | | | | |\ \ \ \
| | | | | | | * | | | Many files:sergefp@mysql.com2004-04-0511-24/+403
* | | | | | | | | | | mysql_stmt_reset now expects ok/error packet from server.konstantin@mysql.com2004-05-061-7/+11
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1pem@mysql.com2004-05-067-11/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed (portability) bug in handler.h, and tried to silence cast warnings on s...pem@mysql.comhem.se2004-05-067-11/+18
* | | | | | | | | | | | Merge with 4.0 to get security patch for check_grant_colummonty@mysql.com2004-05-062-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0monty@mysql.com2004-05-061-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | fixed db name and layout (can cause very rare race condition bug)bell@sanja.is.com.ua2004-05-041-2/+2
| * | | | | | | | | | | | Remove not used variablemonty@mysql.com2004-05-061-2/+2
| * | | | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-05-051-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | very minor changes: a STOP SLAVE in a replication test to get rid of a non cr...guilhem@mysql.com2004-05-051-3/+3
| * | | | | | | | | | | | | InnoDB portability fix: new function os_file_set_eof()marko@hundin.mysql.fi2004-05-051-1/+1
* | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed wrong key usage which caused wrong result for some "WHERE primary_key=c...monty@mysql.com2004-05-061-2/+2
* | | | | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2004-05-062-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make Item_param::val_int and Item_param::val_str follow the used convention a...sergefp@mysql.com2004-05-052-0/+5
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-05-051-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Replication:guilhem@mysql.com2004-05-051-6/+2
* | | | | | | | | | | | | | | mergebell@sanja.is.com.ua2004-05-0519-243/+379
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-0519-243/+379
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | after merge fixesmonty@mysql.com2004-05-057-18/+37
| | * | | | | | | | | | | | | | Merge with 4.0.19monty@mysql.com2004-05-0517-228/+345
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Portability fixmonty@mysql.com2004-05-051-5/+1
| | | * | | | | | | | | | | | | InnoDB: Truncate "<datadir>/innodb.status.<pid>" to its actual sizemarko@hundin.mysql.fi2004-05-051-0/+5
| | | * | | | | | | | | | | | | Merge marko@build.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-05-056-18/+26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | useless fixes for --report-password and --show-slave-auth-info (almost undocu...guilhem@mysql.com2004-05-042-2/+2
| | | | * | | | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-05-041-10/+7
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | Fix for Bug#3357 "If the statement is long, the error message is trunc and im...guilhem@mysql.com2004-05-041-10/+7
| | | | * | | | | | | | | | | | | don't rely on readdir() returning . and .. firstserg@serg.mylan2004-05-042-2/+13
| | | | * | | | | | | | | | | | | compatibility fix. warning removedserg@serg.mylan2004-05-031-4/+4
| | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | | InnoDB: implement LOCK TABLE (Bug #3299)marko@hundin.mysql.fi2004-04-291-4/+16
| | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-04-283-10/+45
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | A new option --replicate-same-server-id to force a slave to execute queries o...guilhem@mysql.com2004-04-283-10/+45
| | | * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-04-289-152/+188
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Fixed http address in some scripts (Bug #3460)monty@mysql.com2004-04-285-147/+163
View Lorry Controller Status