Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge from 4.1 | msvensson@neptunus.(none) | 2005-05-26 | 4 | -36/+110 |
|\ | |||||
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | msvensson@neptunus.(none) | 2005-05-26 | 1 | -1/+1 |
| |\ | |||||
| | * | Add ifdefs to control when "#pragma implementation" should be used | msvensson@neptunus.(none) | 2005-05-26 | 1 | -1/+1 |
| * | | Cleanup during code review | monty@mysql.com | 2005-05-25 | 3 | -35/+109 |
| * | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 | lars@mysql.com | 2005-05-24 | 2 | -3/+23 |
| |\ \ | |||||
* | \ \ | Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 | gbichot@bk-internal.mysql.com | 2005-05-24 | 2 | -3/+23 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | BUG# 9148 Denial of service | reggie@mdk10.(none) | 2005-05-23 | 2 | -5/+7 |
| * | | | BUG# 9148: Denial of service | reggie@mdk10.(none) | 2005-05-21 | 2 | -3/+21 |
| | |/ | |/| | |||||
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | msvensson@neptunus.(none) | 2005-05-23 | 1 | -1/+4 |
|\ \ \ | |||||
| * \ \ | merged changes from 4.1 | reggie@mdk10.(none) | 2005-05-23 | 1 | -1/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | BUG#10687 - Merge engine fails under Windows | reggie@mdk10.(none) | 2005-05-23 | 1 | -1/+4 |
| | * | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 | reggie@mdk10.(none) | 2005-05-23 | 3 | -2/+55 |
| | |\ \ | | | |/ | |||||
| | * | | BUG# 10687: MERGE Engine fails on Windows | reggie@mdk10.(none) | 2005-05-23 | 1 | -1/+1 |
* | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build | msvensson@neptunus.(none) | 2005-05-23 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | default_modify.c: | kent@mysql.com | 2005-05-21 | 1 | -1/+1 |
* | | | | Merge mdk10.(none):/home/reggie/bk/bug9148 | reggie@mdk10.(none) | 2005-05-20 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | fixed stupid typo that added a ! before my_access | reggie@mdk10.(none) | 2005-05-20 | 1 | -1/+1 |
* | | | | fixed conflicts | reggie@mdk10.(none) | 2005-05-20 | 3 | -2/+55 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | |||||
| * | | BUG# 9148: Denial of service | reggie@mdk10.(none) | 2005-05-20 | 3 | -2/+55 |
| |/ | |||||
| * | Added cp932 character set | shuichi@mysql.com | 2005-05-05 | 1 | -0/+5 |
* | | Merge mysql.com:/home/jimw/my/mysql-5.0-8271 | jimw@mysql.com | 2005-05-19 | 1 | -2/+4 |
|\ \ | |||||
| * | | Fix change to allow FIFO as log. (Bug #8271) | jimw@mysql.com | 2005-05-19 | 1 | -1/+3 |
| * | | Avoid doing a seek when first setting up the IO cache for a file, | jimw@mysql.com | 2005-05-13 | 1 | -1/+1 |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | msvensson@neptunus.(none) | 2005-05-19 | 1 | -0/+1 |
|\ \ \ | |||||
| * \ \ | Merge | msvensson@neptunus.(none) | 2005-05-18 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | BUG#9626 | msvensson@neptunus.(none) | 2005-05-18 | 1 | -0/+1 |
| | |/ / | |||||
* | | | | Change the return type back to int (modify_defaults_file). | konstantin@mysql.com | 2005-05-19 | 1 | -3/+3 |
* | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-build | jimw@mysql.com | 2005-05-18 | 1 | -0/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | default.c: | kent@mysql.com | 2005-05-18 | 1 | -0/+3 |
* | | | | New file default_modify.c. Fixed a typo on mysqld.cc | jani@a193-229-222-105.elisa-laajakaista.fi | 2005-05-18 | 3 | -136/+166 |
* | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 | petr@mysql.com | 2005-05-18 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | fix comments | petr@mysql.com | 2005-05-18 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Change update_auto_increment to return 1 if get_auto_increment() returned ~(u... | monty@mysql.com | 2005-05-18 | 1 | -1/+1 |
|/ / / | |||||
* | | | a fix (bug #10655: mysys/default.c compilation problem). | ramil@mysql.com | 2005-05-16 | 1 | -2/+1 |
* | | | Merge | petr@mysql.com | 2005-05-16 | 2 | -1/+141 |
|\ \ \ | |||||
| * | | | post-review fixes | petr@mysql.com | 2005-05-16 | 2 | -1/+141 |
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mishka.local | 2005-05-13 | 1 | -10/+18 |
|\ \ \ \ | |||||
| * | | | | concurrent-insert can now be set to 2 for concurrent inserts when there is ho... | monty@mishka.local | 2005-05-13 | 1 | -10/+18 |
* | | | | | --default-extra-file handling code fix. | ramil@mysql.com | 2005-05-12 | 1 | -2/+2 |
| |_|/ / |/| | | | |||||
* | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 | ramil@mysql.com | 2005-05-07 | 1 | -4/+9 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | A fix (bug #5056: defaults-extra-file throws no error when file is inaccessib... | ramil@ram-book.(none) | 2005-05-06 | 1 | -4/+9 |
* | | | | merge | monty@mishka.local | 2005-05-06 | 1 | -6/+5 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fixes while reviewing new code | monty@mishka.local | 2005-05-06 | 1 | -6/+5 |
* | | | | 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 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | |