summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge with 4.1unknown2005-06-0767-302/+416
|\
| * ctype_cp1250_ch.result, ctype_cp1250_ch.test:unknown2005-06-063-1/+25
| * mtr_misc.pl, mtr_report.pl:unknown2005-06-054-8/+25
| * a compiler must see '#pragma implementation' *before*unknown2005-06-0544-56/+86
| * Fix show warnings limit 0 and show warnings limit 0, 0.unknown2005-06-043-2/+77
| * mergemergedunknown2005-06-044-17/+11
| |\
| | * after mergemergeunknown2005-06-042-3/+9
| | * mergemergedunknown2005-06-035-34/+13
| | |\
| | | * after merge fixesunknown2005-06-032-5/+16
| | | * mergedunknown2005-06-0314-346/+90
| | | |\
| | | | * Merge bk-internal:/home/bk/mysql-4.0/unknown2005-06-031-18/+7
| | | | |\
| | | | | * *don't* mess with kernel defines, boy.unknown2005-06-031-18/+7
| | | | * | sql_repl.cc:unknown2005-06-032-1/+2
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-06-031-42/+126
| |\ \ \ \ \ | | |/ / / /
| * | | | | Move USE_PRAGMA_IMPLEMENTATION to proper placeunknown2005-06-0347-232/+175
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-06-034-7/+19
| |\ \ \ \ \
| * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-06-032-14/+1
| |\ \ \ \ \ \
| | * | | | | | Removed duplicated and wrong merged codeunknown2005-06-032-14/+1
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-064-8/+9
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-064-8/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fixes for compiler warnings from VC6unknown2005-06-064-8/+9
* | | | | | | | | | Ensure that we reset auto-increment cache if we have to do an UPDATE becasue ...unknown2005-06-066-0/+172
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-066-11/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-064-7/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Some Windows compile improvements:unknown2005-06-064-7/+2
| * | | | | | | | | | A logger patch for Netware.unknown2005-06-061-2/+0
| * | | | | | | | | | A fix for Metrowerks compiler.unknown2005-06-061-2/+2
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-062-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Some fixes for Netware.unknown2005-06-062-1/+6
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-066-1/+98
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Some fixes for Netware builds.unknown2005-06-063-1/+12
| * | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0unknown2005-06-063-0/+86
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | sp.test, sp.result:unknown2005-06-063-0/+86
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-0630-109/+606
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-0628-106/+601
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#8610: The ucs2_turkish_ci collation fails with upper('i')unknown2005-06-0628-106/+601
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Portability fix, mySTL on Sun Forte 5.4.unknown2005-06-061-2/+4
| * | | | | | | | | | Futher fixes for aCC.unknown2005-06-061-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-0617-16/+57
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Futher yaSSL portability fixes: hp3750 (HP aCC + HPUX).unknown2005-06-061-1/+2
| * | | | | | | | | Fix yaSSL compilation failure on ds20 (DEC CXX + Linux)unknown2005-06-062-1/+3
| * | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-062-1/+1
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-062-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | - include/config-win.h: removed double HAVE_CHARSET_cp932 #defineunknown2005-06-032-1/+1
| * | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-063-2/+20
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | a fix (bug #10539: When inserting out of range value in BIT, different engine...unknown2005-05-183-2/+20
| * | | | | | | | | | | Mergeunknown2005-06-063-1/+24
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | A fix (bug #10568: Function 'LAST_DAY(date)' does not return NULL for invalid...unknown2005-06-013-1/+24
| * | | | | | | | | | | | Fix broken linking when building with ha_federatedunknown2005-06-051-1/+1
| * | | | | | | | | | | | sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc:unknown2005-06-055-9/+6