Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mishka.local | 2005-07-18 | 1 | -78/+112 |
|\ | |||||
| * | Cleanups during review | monty@mishka.local | 2005-07-18 | 1 | -78/+112 |
* | | Look in the directory above the executable for the my.cnf/ini, on Windows, as | jimw@mysql.com | 2005-07-06 | 1 | -12/+80 |
|/ | |||||
* | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb | marty@linux.site | 2005-06-30 | 1 | -1/+1 |
|\ | |||||
| * | fixes for windows 64-bit compiler warnings | georg@lmy002.wdf.sap.corp | 2005-06-13 | 1 | -1/+1 |
* | | Merge mysql.com:/home/jonas/src/wl1882 | joreland@mysql.com | 2005-06-13 | 1 | -1/+59 |
|\ \ | |/ |/| | |||||
| * | Add "--instance=name" option to load_defaults (or env(MYSQL_INSTANCE)) | joreland@mysql.com | 2005-06-07 | 1 | -1/+59 |
* | | fixes for compiler warnings from VC6 | reggie@monster. | 2005-06-06 | 1 | -1/+1 |
|/ | |||||
* | 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 | 1 | -135/+0 |
* | | fix comments | petr@mysql.com | 2005-05-18 | 1 | -2/+2 |
|/ | |||||
* | 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 | 1 | -0/+138 |
|\ | |||||
| * | post-review fixes | petr@mysql.com | 2005-05-16 | 1 | -0/+138 |
* | | --default-extra-file handling code fix. | ramil@mysql.com | 2005-05-12 | 1 | -2/+2 |
* | | A fix (bug #5056: defaults-extra-file throws no error when file is inaccessib... | ramil@ram-book.(none) | 2005-05-06 | 1 | -4/+9 |
* | | 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 with 4.1 | monty@mysql.com | 2005-04-30 | 1 | -57/+78 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | CAST(string_argument AS UNSIGNED) didn't work for big integers above the sign... | monty@mysql.com | 2005-04-29 | 1 | -45/+58 |
| * | | Cleanups during review | monty@mysql.com | 2005-04-26 | 1 | -27/+35 |
* | | | 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 |
* | | | Fixed errors descovered by valgrind 2.4 | monty@mysql.com | 2005-04-06 | 1 | -2/+2 |
* | | | more merge fixes | petr@mysql.com | 2005-03-29 | 1 | -8/+4 |
* | | | manual merge | petr@mysql.com | 2005-03-29 | 1 | -11/+119 |
|\ \ \ | |/ / | |||||
| * | | Post-review fixes for "!include" patch originating from Yahoo! (the whole pat... | petr@mysql.com | 2005-03-25 | 1 | -14/+121 |
| |/ | |||||
* | | made IM to work with --defaults-file smoothly | petr@mysql.com | 2005-02-18 | 1 | -38/+4 |
* | | --defaults-extra-file bug fixed | hf@deer.(none) | 2005-01-12 | 1 | -1/+1 |
* | | Merging fixed | hf@deer.(none) | 2005-01-11 | 1 | -23/+8 |
* | | Merging conflicts resolved | hf@deer.(none) | 2005-01-11 | 1 | -0/+39 |
|\ \ | |/ | |||||
| * | fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file) | hf@deer.(none) | 2005-01-03 | 1 | -16/+39 |
| * | Merge with 4.0 | jani@ua141d10.elisa.omakaista.fi | 2004-11-12 | 1 | -5/+4 |
| |\ | |||||
| | * | Removed an unneccessary for() and variable. | jani@ua141d10.elisa.omakaista.fi | 2004-11-12 | 1 | -5/+4 |
* | | | Added checking for my.cnf file from environment variable MYSQL_HOME | jani@ua141d10.elisa.omakaista.fi | 2005-01-04 | 1 | -17/+25 |
* | | | Portability fix for gcc 2.95.3 | monty@mysql.com | 2004-11-12 | 1 | -1/+2 |
* | | | Merge with 4.1 | monty@mysql.com | 2004-11-12 | 1 | -53/+98 |
|\ \ \ | |/ / | |||||
| * | | merge with 4.0 | monty@mysql.com | 2004-11-12 | 1 | -39/+84 |
| |\ \ | | |/ | |||||
| | * | Some code clean-up and optimization. | jani@a80-186-24-72.elisa-laajakaista.fi | 2004-11-11 | 1 | -30/+60 |
| | * | Removed check for .ini file elsewhere, except on Windows. | jani@a80-186-24-72.elisa-laajakaista.fi | 2004-11-11 | 1 | -0/+4 |
| | * | Fixed a typo that caused segmentation fault when using | jani@a193-229-222-105.elisa-laajakaista.fi | 2004-11-05 | 1 | -1/+1 |
| | * | Changed default.c so that it now checks for my.ini and then | jani@a193-229-222-105.elisa-laajakaista.fi | 2004-11-05 | 1 | -39/+50 |
* | | | Fixed a problem causing load_defaults not to accept some command-line | petr@mysql.com | 2004-09-11 | 1 | -4/+2 |
* | | | Fixed memory allocation: allocated memory wasn't enough to store the | cps@silver_beast.(none) | 2004-09-06 | 1 | -1/+1 |
* | | | After review fix: added a comment | cps@silver_beast.(none) | 2004-09-06 | 1 | -0/+6 |