summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge from 4.1msvensson@neptunus.(none)2005-05-264-36/+110
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-05-261-1/+1
| |\
| | * Add ifdefs to control when "#pragma implementation" should be usedmsvensson@neptunus.(none)2005-05-261-1/+1
| * | Cleanup during code reviewmonty@mysql.com2005-05-253-35/+109
| * | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1lars@mysql.com2005-05-242-3/+23
| |\ \
* | \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-4.1gbichot@bk-internal.mysql.com2005-05-242-3/+23
|\ \ \ \ | | |/ / | |/| |
| * | | BUG# 9148 Denial of servicereggie@mdk10.(none)2005-05-232-5/+7
| * | | BUG# 9148: Denial of servicereggie@mdk10.(none)2005-05-212-3/+21
| | |/ | |/|
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-05-231-1/+4
|\ \ \
| * \ \ merged changes from 4.1reggie@mdk10.(none)2005-05-231-1/+4
| |\ \ \ | | | |/ | | |/|
| | * | BUG#10687 - Merge engine fails under Windowsreggie@mdk10.(none)2005-05-231-1/+4
| | * | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1reggie@mdk10.(none)2005-05-233-2/+55
| | |\ \ | | | |/
| | * | BUG# 10687: MERGE Engine fails on Windowsreggie@mdk10.(none)2005-05-231-1/+1
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-buildmsvensson@neptunus.(none)2005-05-231-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | default_modify.c:kent@mysql.com2005-05-211-1/+1
* | | | Merge mdk10.(none):/home/reggie/bk/bug9148reggie@mdk10.(none)2005-05-201-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | fixed stupid typo that added a ! before my_accessreggie@mdk10.(none)2005-05-201-1/+1
* | | | fixed conflictsreggie@mdk10.(none)2005-05-203-2/+55
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | BUG# 9148: Denial of servicereggie@mdk10.(none)2005-05-203-2/+55
| |/
| * Added cp932 character setshuichi@mysql.com2005-05-051-0/+5
* | Merge mysql.com:/home/jimw/my/mysql-5.0-8271jimw@mysql.com2005-05-191-2/+4
|\ \
| * | Fix change to allow FIFO as log. (Bug #8271)jimw@mysql.com2005-05-191-1/+3
| * | Avoid doing a seek when first setting up the IO cache for a file,jimw@mysql.com2005-05-131-1/+1
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-05-191-0/+1
|\ \ \
| * \ \ Mergemsvensson@neptunus.(none)2005-05-181-0/+1
| |\ \ \
| | * | | BUG#9626msvensson@neptunus.(none)2005-05-181-0/+1
| | |/ /
* | | | Change the return type back to int (modify_defaults_file).konstantin@mysql.com2005-05-191-3/+3
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-buildjimw@mysql.com2005-05-181-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | default.c:kent@mysql.com2005-05-181-0/+3
* | | | New file default_modify.c. Fixed a typo on mysqld.ccjani@a193-229-222-105.elisa-laajakaista.fi2005-05-183-136/+166
* | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0petr@mysql.com2005-05-181-2/+2
|\ \ \ \
| * | | | fix commentspetr@mysql.com2005-05-181-2/+2
| |/ / /
* | | | Change update_auto_increment to return 1 if get_auto_increment() returned ~(u...monty@mysql.com2005-05-181-1/+1
|/ / /
* | | a fix (bug #10655: mysys/default.c compilation problem).ramil@mysql.com2005-05-161-2/+1
* | | Mergepetr@mysql.com2005-05-162-1/+141
|\ \ \
| * | | post-review fixespetr@mysql.com2005-05-162-1/+141
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-05-131-10/+18
|\ \ \ \
| * | | | concurrent-insert can now be set to 2 for concurrent inserts when there is ho...monty@mishka.local2005-05-131-10/+18
* | | | | --default-extra-file handling code fix.ramil@mysql.com2005-05-121-2/+2
| |_|/ / |/| | |
* | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil@mysql.com2005-05-071-4/+9
|\ \ \ \ | |/ / / |/| | |
| * | | A fix (bug #5056: defaults-extra-file throws no error when file is inaccessib...ramil@ram-book.(none)2005-05-061-4/+9
* | | | mergemonty@mishka.local2005-05-061-6/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes while reviewing new codemonty@mishka.local2005-05-061-6/+5
* | | | 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
|\ \ \ \
| * | | | Add default configuration files to my_print_defaults usage, andjimw@mysql.com2005-04-281-41/+59
* | | | | 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
| |\ \ \ \
| | * | | | Fix handling of the -e flag to my_print_defaults. (Bug #9136)jimw@mysql.com2005-03-151-5/+6
* | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-05-012-61/+85
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |