summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge with 4.1unknown2005-06-071-2/+0
|\
| * a compiler must see '#pragma implementation' *before*unknown2005-06-051-2/+0
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-062-2/+2
|\ \
| * | fixes for compiler warnings from VC6unknown2005-06-062-2/+2
* | | Ensure that we reset auto-increment cache if we have to do an UPDATE becasue ...unknown2005-06-061-0/+1
* | | mergeunknown2005-06-052-6/+10
|\ \ \ | |/ / |/| |
| * | Cleanup during reviewunknown2005-06-052-6/+10
* | | yassl template instantiation - don't do too muchunknown2005-06-031-1/+1
* | | Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0unknown2005-06-021-1/+1
|\ \ \ | | |/ | |/|
| * | fixed compile problem by replacing W_OK with F_OKunknown2005-06-021-1/+1
* | | Merge mysql.com:/home/mydev/mysql-4.1-4100unknown2005-06-021-30/+91
|\ \ \ | |/ /
| * | Merge mysql.com:/home/mydev/mysql-4.1unknown2005-06-021-0/+2
| |\ \
| * | | Bug#10602 - LOAD INDEX INTO CACHE deadlocksunknown2005-06-011-30/+91
* | | | Mergeunknown2005-06-021-0/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | tztime.cc:unknown2005-06-021-0/+2
| |/
* | Merge from 4.1unknown2005-05-264-36/+110
|\ \ | |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-261-1/+1
| |\
| | * Add ifdefs to control when "#pragma implementation" should be usedunknown2005-05-261-1/+1
| * | Cleanup during code reviewunknown2005-05-253-35/+109
| * | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1unknown2005-05-242-3/+23
| |\ \
* | \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-4.1unknown2005-05-242-3/+23
|\ \ \ \ | | |/ / | |/| |
| * | | BUG# 9148 Denial of serviceunknown2005-05-232-5/+7
| * | | BUG# 9148: Denial of serviceunknown2005-05-212-3/+21
| | |/ | |/|
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-231-1/+4
|\ \ \
| * \ \ merged changes from 4.1unknown2005-05-231-1/+4
| |\ \ \ | | | |/ | | |/|
| | * | BUG#10687 - Merge engine fails under Windowsunknown2005-05-231-1/+4
| | * | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-233-2/+55
| | |\ \ | | | |/
| | * | BUG# 10687: MERGE Engine fails on Windowsunknown2005-05-231-1/+1
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-buildunknown2005-05-231-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | default_modify.c:unknown2005-05-211-1/+1
* | | | Merge mdk10.(none):/home/reggie/bk/bug9148unknown2005-05-201-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | fixed stupid typo that added a ! before my_accessunknown2005-05-201-1/+1
* | | | fixed conflictsunknown2005-05-203-2/+55
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | BUG# 9148: Denial of serviceunknown2005-05-203-2/+55
| |/
| * Added cp932 character setunknown2005-05-051-0/+5
* | Merge mysql.com:/home/jimw/my/mysql-5.0-8271unknown2005-05-191-2/+4
|\ \
| * | Fix change to allow FIFO as log. (Bug #8271)unknown2005-05-191-1/+3
| * | Avoid doing a seek when first setting up the IO cache for a file,unknown2005-05-131-1/+1
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-191-0/+1
|\ \ \
| * \ \ Mergeunknown2005-05-181-0/+1
| |\ \ \
| | * | | BUG#9626unknown2005-05-181-0/+1
| | |/ /
* | | | Change the return type back to int (modify_defaults_file).unknown2005-05-191-3/+3
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-buildunknown2005-05-181-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | default.c:unknown2005-05-181-0/+3
* | | | New file default_modify.c. Fixed a typo on mysqld.ccunknown2005-05-183-136/+166
* | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-181-2/+2
|\ \ \ \
| * | | | fix commentsunknown2005-05-181-2/+2
| |/ / /
* | | | Change update_auto_increment to return 1 if get_auto_increment() returned ~(u...unknown2005-05-181-1/+1
|/ / /
* | | a fix (bug #10655: mysys/default.c compilation problem).unknown2005-05-161-2/+1
* | | Mergeunknown2005-05-162-1/+141
|\ \ \