Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix --defaults-file and --defaults-extra-file broken by a wrong merge | petr@mysql.com | 2005-05-04 | 1 | -1/+2 |
* | Merge mysql.com:/home/jimw/my/mysql-5.0-5354 | jimw@mysql.com | 2005-05-02 | 1 | -41/+59 |
|\ | |||||
| * | Add default configuration files to my_print_defaults usage, and | jimw@mysql.com | 2005-04-28 | 1 | -41/+59 |
* | | Clean up merge from 4.1 | jimw@mysql.com | 2005-05-02 | 1 | -5/+6 |
|\ \ | |||||
| * \ | Merge mysql.com:/home/jimw/my/mysql-4.1-9136 | jimw@mysql.com | 2005-05-02 | 1 | -5/+6 |
| |\ \ | |||||
| | * | | Fix handling of the -e flag to my_print_defaults. (Bug #9136) | jimw@mysql.com | 2005-03-15 | 1 | -5/+6 |
* | | | | Merge bk-internal:/home/bk/mysql-5.0 | serg@serg.mylan | 2005-05-01 | 2 | -61/+85 |
|\ \ \ \ | |||||
| * \ \ \ | Merge with 4.1 | monty@mysql.com | 2005-04-30 | 2 | -61/+85 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | monty@mysql.com | 2005-04-30 | 1 | -0/+22 |
| | |\ \ \ | |||||
| | * | | | | CAST(string_argument AS UNSIGNED) didn't work for big integers above the sign... | monty@mysql.com | 2005-04-29 | 1 | -45/+58 |
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | monty@mysql.com | 2005-04-28 | 2 | -31/+42 |
| | |\ \ \ \ | |||||
| | | * | | | | Fixed core dump bug when hot link list in key cache was empty. Bug #10167 | monty@mysql.com | 2005-04-27 | 1 | -4/+7 |
| | | * | | | | Cleanups during review | monty@mysql.com | 2005-04-26 | 1 | -27/+35 |
* | | | | | | | yassl changeset 2: | serg@serg.mylan | 2005-04-30 | 1 | -0/+9 |
|/ / / / / / | |||||
* | | | | | | Merge mysql.com:/home/mydev/mysql-4.1-4100 | ingo@mysql.com | 2005-04-28 | 1 | -0/+22 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | Merge mysql.com:/home/mydev/mysql-4.1-bug5964 | ingo@mysql.com | 2005-04-28 | 1 | -0/+22 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | BUG#5964 - 4.1 MERGE tables regression from 4.0 | ingo@mysql.com | 2005-04-28 | 1 | -0/+22 |
| | |/ / | |||||
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | msvensson@neptunus.(none) | 2005-04-27 | 1 | -1/+1 |
| |\ \ \ | |||||
* | \ \ \ | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 | msvensson@neptunus.(none) | 2005-04-27 | 1 | -0/+14 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable | msvensson@neptunus.(none) | 2005-04-27 | 1 | -0/+14 |
* | | | | | Merge from 4.1 to 5.0 | msvensson@neptunus.(none) | 2005-04-27 | 1 | -16/+12 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable | msvensson@neptunus.(none) | 2005-04-27 | 1 | -16/+12 |
| | |/ / | |/| | | |||||
* | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 | joerg@mysql.com | 2005-04-26 | 1 | -7/+7 |
|\ \ \ \ | |||||
| * | | | | A fix (bug #9756: mysql client failing on dumps containing certain \ sequences). | ramil@mysql.com | 2005-04-26 | 1 | -7/+7 |
* | | | | | Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#... | joerg@mysql.com | 2005-04-26 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Step 2 of the switch to support configuration with NPTL: | joerg@mysql.com | 2005-04-20 | 1 | -1/+1 |
| |/ / | |||||
* | | | Fixed Bug#6593, "Inconsistency in handling option prefixes (--skip, --disable... | jani@a193-229-222-105.elisa-laajakaista.fi | 2005-04-19 | 1 | -1/+2 |
* | | | Merge mysql.com:/home/cps/mysql/trees/mysql-4.1 | petr@mysql.com | 2005-04-14 | 1 | -9/+18 |
|\ \ \ | |/ / | |||||
| * | | post review fix | petr@mysql.com | 2005-04-14 | 1 | -9/+18 |
* | | | Proper handling of "utf8-general-cs" clollation: Missing parts in configuration. | joerg@mysql.com | 2005-04-11 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Add missing parts for the "Cybozu" custom build, to avoid future manual patches. | joerg@mysql.com | 2005-04-08 | 1 | -2/+2 |
* | | | Fixed errors found during review | monty@mysql.com | 2005-04-06 | 1 | -1/+1 |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mysql.com | 2005-04-06 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Fixed errors descovered by valgrind 2.4 | monty@mysql.com | 2005-04-06 | 1 | -2/+2 |
* | | | | remove the rest of isam/merge references | serg@serg.mylan | 2005-04-05 | 1 | -5/+17 |
|/ / / | |||||
* | | | merge | bar@mysql.com | 2005-03-29 | 1 | -0/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 | bar@mysql.com | 2005-03-29 | 1 | -0/+6 |
| |\ \ | |||||
| | * | | Adding Cybozu's patch. | bar@mysql.com | 2005-03-29 | 1 | -0/+6 |
* | | | | more merge fixes | petr@mysql.com | 2005-03-29 | 1 | -8/+4 |
* | | | | manual merge | petr@mysql.com | 2005-03-29 | 1 | -11/+119 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 | petr@mysql.com | 2005-03-29 | 1 | -14/+121 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Post-review fixes for "!include" patch originating from Yahoo! (the whole pat... | petr@mysql.com | 2005-03-25 | 1 | -14/+121 |
* | | | | Manual merge | konstantin@mysql.com | 2005-03-26 | 2 | -1/+226 |
|\ \ \ \ | |/ / / | |||||
| * | | | A fix for Bug#8226 "Cannot connect via shared memory": | konstantin@mysql.com | 2005-03-26 | 2 | -1/+225 |
| | |/ | |/| | |||||
* | | | Merge bk-internal:/home/bk/mysql-5.0 | serg@serg.mylan | 2005-03-21 | 1 | -2/+5 |
|\ \ \ | |||||
| * \ \ | Manual merge of csets from -build tree into main 5.0 tree. | dlenev@mysql.com | 2005-03-21 | 1 | -2/+5 |
| |\ \ \ | |||||
| | * | | | Eliminate warnings noticed by VC7. This includes fixing my_mmap() on | jimw@mysql.com | 2005-03-18 | 1 | -2/+5 |
* | | | | | Merge bk-internal:/home/bk/mysql-5.0 | serg@serg.mylan | 2005-03-17 | 1 | -27/+48 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Field::quote_data(): | serg@serg.mylan | 2005-03-17 | 1 | -27/+48 |
| |/ / / | |||||
* | | | | Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants... | brian@zim.(none) | 2005-03-16 | 1 | -2/+1 |
|/ / / |