summaryrefslogtreecommitdiff
path: root/mysys/default.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0jonas@perch.ndb.mysql.com2005-09-301-0/+4
|\ | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
| * export forced_defaults_file using global variable defaults_filejonas@perch.ndb.mysql.com2005-09-301-0/+4
| | | | | | | | analog with defaults_extra_file and defaults_grouop_suffix
* | Fixed a missing cast.jani@a193-229-222-105.elisa-laajakaista.fi2005-09-201-1/+1
|/
* A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 ↵ramil@mysql.com2005-09-091-0/+3
| | | | client binaries).
* Ensure we free all items for prepared statementsmonty@mysql.com2005-07-291-1/+1
| | | | | | Before the fix in ~Prepared_statments we got a memory leak when executing mysql_client_test.test Note that test 'variables.test' fails. This will be fixed when Jimw pushes the fix for Bug 10351
* Cleanups during review of new codemonty@mysql.com2005-07-281-26/+26
| | | | Ensure mysql_close() is called if mysql_set_character_set() fails
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-07-181-78/+112
|\ | | | | | | into mishka.local:/home/my/mysql-5.0
| * Cleanups during reviewmonty@mishka.local2005-07-181-78/+112
| | | | | | | | | | | | | | | | | | Changed defaults option --instance to --defaults-group-suffix Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX mysql_print_defaults now understands --defaults-group-suffix Remove usage of my_tempnam() (not safe function) if( -> if ( and while( to while (
* | Look in the directory above the executable for the my.cnf/ini, on Windows, asjimw@mysql.com2005-07-061-12/+80
|/ | | | | the new installer and GUI tools expect. (Bug #10419) Also, dynamically bind to GetSystemWindowsDirectory() so that it works on all platforms. (Bug #5354)
* Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbmarty@linux.site2005-06-301-1/+1
|\ | | | | | | into linux.site:/home/marty/MySQL/mysql-5.0
| * fixes for windows 64-bit compiler warningsgeorg@lmy002.wdf.sap.corp2005-06-131-1/+1
| |
* | Merge mysql.com:/home/jonas/src/wl1882joreland@mysql.com2005-06-131-1/+59
|\ \ | |/ |/| | | into mysql.com:/home/jonas/src/mysql-5.0-ndb
| * Add "--instance=name" option to load_defaults (or env(MYSQL_INSTANCE)) joreland@mysql.com2005-06-071-1/+59
| | | | | | | | | | which enables having multiple mysqld in same my.cnf without mysql_multi or IM
* | fixes for compiler warnings from VC6reggie@monster.2005-06-061-1/+1
|/
* Merge mysql.com:/home/jimw/my/mysql-5.0-buildjimw@mysql.com2005-05-181-0/+3
|\ | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * default.c:kent@mysql.com2005-05-181-0/+3
| | | | | | | | | | | | | | | | | | | | Disabled use of GetSystemWindowsDirectory() when compiled with VC6 mysql.cc: Removed unused variable 'field' from print_warnings() libmysql.dsp: Added "my_chsize.c" and "my_seek.c" mysqlclient.dsp: Added "my_chsize.c"
* | New file default_modify.c. Fixed a typo on mysqld.ccjani@a193-229-222-105.elisa-laajakaista.fi2005-05-181-135/+0
| | | | | | | | | | | | Changed name of function my_correct_default_file to modify_defaults_file. Improved function and fixed some bugs in it.
* | fix commentspetr@mysql.com2005-05-181-2/+2
|/
* a fix (bug #10655: mysys/default.c compilation problem).ramil@mysql.com2005-05-161-2/+1
|
* Mergepetr@mysql.com2005-05-161-0/+138
|\
| * post-review fixespetr@mysql.com2005-05-161-0/+138
| |
* | --default-extra-file handling code fix.ramil@mysql.com2005-05-121-2/+2
| |
* | A fix (bug #5056: defaults-extra-file throws no error when file is ↵ramil@ram-book.(none)2005-05-061-4/+9
| | | | | | | | inaccessible).
* | fix --defaults-file and --defaults-extra-file broken by a wrong mergepetr@mysql.com2005-05-041-1/+2
| |
* | Merge mysql.com:/home/jimw/my/mysql-5.0-5354jimw@mysql.com2005-05-021-41/+59
|\ \ | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | Add default configuration files to my_print_defaults usage, andjimw@mysql.com2005-04-281-41/+59
| |/ | | | | | | | | add handling of configuration file in the Windows shared system directory. (Bug #5354)
* | Clean up merge from 4.1jimw@mysql.com2005-05-021-5/+6
|\ \
| * \ Merge mysql.com:/home/jimw/my/mysql-4.1-9136jimw@mysql.com2005-05-021-5/+6
| |\ \ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * | Fix handling of the -e flag to my_print_defaults. (Bug #9136)jimw@mysql.com2005-03-151-5/+6
| | | |
* | | | Merge with 4.1monty@mysql.com2005-04-301-57/+78
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | CAST(string_argument AS UNSIGNED) didn't work for big integers above the ↵monty@mysql.com2005-04-291-45/+58
| | | | | | | | | | | | | | | | | | | | | | | | signed range. (Bug #7036) Produce warnings of wrong cast of strings to signed/unsigned. Don't block not resolved IP's if DNS server is down (Bug #8467) Fix compiler problems with MinGW (Bug #8872)
| * | Cleanups during reviewmonty@mysql.com2005-04-261-27/+35
| | |
* | | Merge mysql.com:/home/cps/mysql/trees/mysql-4.1petr@mysql.com2005-04-141-9/+18
|\ \ \ | |/ / | | | | | | into mysql.com:/home/cps/mysql/trees/mysql-5.0
| * | post review fixpetr@mysql.com2005-04-141-9/+18
| | |
* | | Fixed errors descovered by valgrind 2.4monty@mysql.com2005-04-061-2/+2
| | | | | | | | | | | | Added suppression file for some valgrind warnings that are not real errors
* | | more merge fixespetr@mysql.com2005-03-291-8/+4
| | |
* | | manual mergepetr@mysql.com2005-03-291-11/+119
|\ \ \ | |/ /
| * | Post-review fixes for "!include" patch originating from Yahoo! (the whole ↵petr@mysql.com2005-03-251-14/+121
| |/ | | | | | | patch is recommitted)
* | made IM to work with --defaults-file smoothlypetr@mysql.com2005-02-181-38/+4
| |
* | --defaults-extra-file bug fixedhf@deer.(none)2005-01-121-1/+1
| |
* | Merging fixedhf@deer.(none)2005-01-111-23/+8
| |
* | Merging conflicts resolvedhf@deer.(none)2005-01-111-0/+39
|\ \ | |/
| * fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)hf@deer.(none)2005-01-031-16/+39
| |
| * Merge with 4.0jani@ua141d10.elisa.omakaista.fi2004-11-121-5/+4
| |\
| | * Removed an unneccessary for() and variable.jani@ua141d10.elisa.omakaista.fi2004-11-121-5/+4
| | |
* | | Added checking for my.cnf file from environment variable MYSQL_HOMEjani@ua141d10.elisa.omakaista.fi2005-01-041-17/+25
| | | | | | | | | | | | instead of DATADIR.
* | | Portability fix for gcc 2.95.3monty@mysql.com2004-11-121-1/+2
| | | | | | | | | | | | After merge fixes
* | | Merge with 4.1monty@mysql.com2004-11-121-53/+98
|\ \ \ | |/ /
| * | merge with 4.0monty@mysql.com2004-11-121-39/+84
| |\ \ | | |/
| | * Some code clean-up and optimization.jani@a80-186-24-72.elisa-laajakaista.fi2004-11-111-30/+60
| | |