summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/mysql_src/mysql-4.1guilhem@mysql.com2005-10-1212-42/+324
|\
| * mergeguilhem@mysql.com2005-10-12106-540/+45165
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1grog@mysql.com2005-10-123-1/+11
| | |\
| | | * sql_yacc.yy:grog@mysql.com2005-10-123-1/+11
| | * | Merge mysql.com:/space/my/mysql-4.1lenz@mysql.com2005-10-111-1/+1
| | |\ \ | | | |/ | | |/|
| * | | Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in sl...guilhem@mysql.com2005-10-128-41/+304
| * | | The "exit" command of mysqltest is quite useful when writing tests for 4.1 so...guilhem@mysql.com2005-10-051-2/+7
| * | | Importing BUILD/compile-pentium64-valgrind-max from 5.0 (unchanged), and spee...guilhem@mysql.com2005-10-042-0/+30
* | | | slave.cc:guilhem@mysql.com2005-10-121-1/+18
|\ \ \ \
| * | | | To help people avoid BUG#2122 "changing hostname confuses master or slave" un...guilhem@mysql.com2005-10-111-1/+18
* | | | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-10-121-2/+1
|\ \ \ \ \
| * | | | | Fix compile error on Windows: remove wrong typecastsergefp@mysql.com2005-10-121-2/+1
* | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-10-124-0/+116
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed BUG#13510: Setting password local variable changes current passwordpem@mysql.com2005-10-114-0/+116
* | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-10-121-1/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-10-121-1/+3
| |\ \ \ \ \ \
| | * | | | | | Fixed BUG#13616: "CALL <dbname>.<procedurename>" executes properly, butpem@mysql.com2005-10-051-1/+3
* | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@mysql.com2005-10-121-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge lgrimmer@bk-internal:/home/bk/mysql-5.0lenz@mysql.com2005-10-121-1/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge mysql.com:/space/my/mysql-4.1-buildlenz@mysql.com2005-10-111-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge mysql.com:/space/my/mysql-4.0-buildlenz@mysql.com2005-10-111-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | - added Docs/manual.chm to the windows source distribution (BUG#13899)lenz@mysql.com2005-10-111-1/+1
* | | | | | | | | | after merge fixgluh@eagle.intranet.mysql.r18.ru2005-10-123-41/+43
* | | | | | | | | | 4.1->5.0 mergegluh@mysql.com2005-10-122-1/+98
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Fix for bug#9270 multiple SSL race conditions (for 5.0 tree)gluh@eagle.intranet.mysql.r18.ru2005-10-111-0/+97
| * | | | | | | | Added missing HAVE_REPLICATION definelars@mysql.com2005-10-101-1/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-10-1261-712/+721
|\ \ \ \ \ \ \ \
| * | | | | | | | Reviewing new pushed codemonty@mysql.com2005-10-1239-316/+334
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-10-0833-396/+387
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Simple changes during review of codemonty@mysql.com2005-10-083-61/+37
| | * | | | | | | | Review of code pushed since last 5.0 pull:monty@mysql.com2005-10-0640-368/+386
* | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-10-123-0/+57
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-10-113-0/+57
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix bug#13327 check_equality() wasn't checking view's fieldsevgen@moonbone.local2005-10-103-0/+57
* | | | | | | | | | | | Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0eric@mysql.com2005-10-117-20/+70
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-13650jimw@mysql.com2005-10-113-18/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix use of "%*s" *printf() specifiers that were really meant to bejimw@mysql.com2005-10-063-18/+19
| * | | | | | | | | | | Merge abarkov@bk-internal:/home/bk/mysql-5.0bar@mysql.com2005-10-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | complete.c:bar@mysql.com2005-10-111-1/+1
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merginghf@deer.(none)2005-10-111-4/+4
| * | | | | | | | | | | Merginghf@deer.(none)2005-10-113-1/+50
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | / / / / / | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2005-10-106-5/+80
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | additional fix for bug #13372 (decimal union)hf@deer.(none)2005-09-271-1/+1
| | | * | | | | | | | | additional fix to the bug #13372 (decimal union)hf@deer.(none)2005-09-272-3/+3
| | | * | | | | | | | | Fix for bug #13372 (decimal union)hf@deer.(none)2005-09-275-4/+79
* | | | | | | | | | | | BUG#13724 conditionally added CONNECTION='connect string' for SHOW CREATE TABLEeric@mysql.com2005-10-103-0/+13
|/ / / / / / / / / / /
* | | | | | | | | | | Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0lars@mysql.com2005-10-101-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added missing HAVE_REPLICATION definelars@mysql.com2005-10-101-0/+2
* | | | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0svoj@mysql.com2005-10-114-37/+70
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Always save/restore connect string.svoj@mysql.com2005-10-102-18/+12
View Lorry Controller Status