summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1unknown2004-11-121-1/+1
|\
| * Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0unknown2004-11-121-1/+1
| |\
| | * Makefile.am:unknown2004-11-121-1/+1
* | | Add back data that bk loosed during automatic mergeunknown2004-11-121-0/+279
* | | Merge with 4.1 to get latest fix to client_test.cunknown2004-11-124-296/+32
|\ \ \ | |/ /
| * | Fixed a function call.unknown2004-11-121-1/+1
| * | Merge with 4.0unknown2004-11-124-9/+25
| |\ \ | | |/
| | * Removed an unneccessary for() and variable.unknown2004-11-121-5/+4
| | * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-11-124-31/+77
| | |\
| | * | A fix (bug #6564: QUOTE(NULL) returns NULL, not the string 'NULL')unknown2004-11-113-4/+21
| * | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-121-13/+11
| |\ \ \
| | * | | Code cleanup and some optimizations.unknown2004-11-121-13/+11
* | | | | Portability fix for gcc 2.95.3unknown2004-11-124-11/+14
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-11-125-57/+84
|\ \ \ \ \
| * | | | | Changed some unneccessary calls to current_thd() into table->in_useunknown2004-11-125-57/+84
* | | | | | Merge with 4.1unknown2004-11-1241-423/+722
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-121-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix to allow usage of 4.0 tables with 4.1unknown2004-11-121-0/+1
| * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-121-188/+217
| |\ \ \ \ \
| | * | | | | Added possibility to run only certain tests by giving the test name(s)unknown2004-11-121-188/+217
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-11-127-10/+10
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | typos in error messages fixedunknown2004-11-127-10/+10
| * | | | | | Merge on pullunknown2004-11-1231-190/+458
| |\ \ \ \ \ \
| | * | | | | | After merge fixesunknown2004-11-1210-81/+112
| | * | | | | | merge with 4.0unknown2004-11-1224-116/+352
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Bug#6123 - GRANT USAGE creates useless mysql.db rowunknown2004-11-113-1/+17
| | | * | | | | Some code clean-up and optimization.unknown2004-11-111-30/+60
| | | | |_|_|/ | | | |/| | |
| | | * | | | Removed check for .ini file elsewhere, except on Windows.unknown2004-11-111-0/+4
| | | * | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-11-101-12/+13
| | | |\ \ \ \
| | | | * | | | Alphabetize some out-of-order options in option structure.unknown2004-11-091-12/+13
| | | * | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-11-102-1/+9
| | | |\ \ \ \ \
| | | | * | | | | Fix for BUG#6522 "Replication fails due to a rolled back transaction in the b...unknown2004-11-102-1/+9
| | | | |/ / / /
| | | * | | | | mysql.h:unknown2004-11-091-0/+2
| | | |/ / / /
| | | * | | | Fixed a typo that caused segmentation fault when usingunknown2004-11-051-1/+1
| | | * | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-11-052-39/+51
| | | |\ \ \ \
| | | | * | | | Changed default.c so that it now checks for my.ini and thenunknown2004-11-052-39/+51
| | | * | | | | mysqldump.c:unknown2004-11-051-0/+1
| | | * | | | | Change "Bootstrap" so that it will not fail on BK source trees of other versi...unknown2004-11-051-1/+1
| | | * | | | | client_priv.h:unknown2004-11-052-8/+51
| | | * | | | | libmysql.c:unknown2004-11-051-1/+2
| | | * | | | | Mergeunknown2004-11-051-0/+1
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | libmysql.def, libmysql.c:unknown2004-11-052-1/+2
| | | * | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-11-044-1/+56
| | | |\ \ \ \ \
| | | | * | | | | Fix for BUG##5714 "Insert into MyISAM table and select ... for update]":unknown2004-11-044-1/+56
| | | * | | | | | Merge siva.hindu.god:/opt/home/tim/m/40/bkunknown2004-11-043-2/+3
| | | |\ \ \ \ \ \
| | | | * | | | | | Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROCunknown2004-11-023-2/+3
| | | | |/ / / / /
| | | * | | | | | Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/push-4.0unknown2004-11-044-1/+42
| | | |\ \ \ \ \ \
| | | | * | | | | | The files stored in "Docs/Images" within the "mysqldocs" BK tree must be incl...unknown2004-11-044-1/+42
| | | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-11-047-5/+123
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix for bug #6387 "Queried timestamp values do not match the insertedunknown2004-11-037-5/+123
| | | | | |/ / / / / | | | | |/| | | | |