summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge of 4.1 -> 5.0unknown2005-06-011-0/+1
|\
| * Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-271-0/+5
| |\
| * \ - merged the 4.1.12a Changes back into the main treeunknown2005-05-261-0/+1
| |\ \
| | * | - added the cp932 charset support to the Windows buildsunknown2005-05-241-0/+1
* | | | Merge from 4.1unknown2005-05-262-0/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-261-0/+5
| |\ \ \ | | |/ / | |/| |
| | * | Add ifdefs to control when "#pragma implementation" should be usedunknown2005-05-261-0/+5
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-251-0/+1
| |\ \ \
| | * | | Cleanup during code reviewunknown2005-05-251-0/+1
| | |/ /
* | | | Manual merge.unknown2005-05-261-1/+3
|\ \ \ \ | |/ / /
| * | | simplifying new/my_arg_new wrappingunknown2005-05-241-1/+3
| |/ /
| * | Build fixes for icc, compile _without_ "-no-gnu"unknown2005-05-231-1/+1
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-buildunknown2005-05-231-1/+1
|\ \ \
| * | | Build fixunknown2005-05-231-1/+1
* | | | fixed conflictsunknown2005-05-201-0/+5
|\ \ \ \ | | |/ / | |/| |
| * | | BUG# 9148: Denial of serviceunknown2005-05-201-0/+5
* | | | Macos 10.4 compatibility changesunknown2005-05-201-1/+1
| |/ / |/| |
* | | Change the return type back to int (modify_defaults_file).unknown2005-05-192-6/+6
* | | mergeunknown2005-05-181-1/+1
|\ \ \
| * | | Fixed bug from last pushunknown2005-05-181-1/+1
* | | | New file default_modify.c. Fixed a typo on mysqld.ccunknown2005-05-182-5/+6
* | | | Fix conflicting declaration and definition of db_output (compilationunknown2005-05-181-1/+1
|/ / /
* | | Fix warnings from iccunknown2005-05-181-3/+3
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-162-2/+9
|\ \ \
| * | | A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work"unknown2005-05-162-2/+9
* | | | Mergeunknown2005-05-161-0/+5
|\ \ \ \
| * | | | post-review fixesunknown2005-05-161-0/+5
* | | | | Manual merge (again)unknown2005-05-141-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | added prototype for mysql_set_character_set functionunknown2005-05-131-0/+1
| | |_|/ | |/| |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-132-5/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | concurrent-insert can now be set to 2 for concurrent inserts when there is ho...unknown2005-05-132-5/+5
* | | | A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute"unknown2005-05-121-1/+2
* | | | Mergeunknown2005-05-091-0/+6
|\ \ \ \ | | |/ / | |/| |
| * | | a fix (bug #10438: Raid stopped working because of change in atomic add detec...unknown2005-05-091-0/+6
| * | | Merge neptunus.(none):/home/msvensson/mysql/bug10241unknown2005-05-091-1/+1
| |\ \ \
| * \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug10241unknown2005-05-092-1/+6
| |\ \ \ \
* | \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug10241unknown2005-05-091-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | After review fixesunknown2005-05-091-1/+1
| | |/ / / | |/| | |
* | | | | Merge neptunus.(none):/home/msvensson/mysql/bug10241unknown2005-05-092-1/+6
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | BUG#10241 cygwin port: invalid pragma interface directivesunknown2005-05-042-1/+6
* | | | Merge mysql.com:/home/ram/work/mysql-4.1unknown2005-05-061-12/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-061-12/+0
| |\ \ \
| | * | | A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h).unknown2005-05-061-12/+0
* | | | | Merge bk-internal.mysql.com:/users/rburnett/bug9721unknown2005-05-061-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge bk-internal.mysql.com:/data0/bk/mysql-4.1unknown2005-05-061-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Added cp932 character setunknown2005-05-051-0/+2
| * | | | Bug #9721 net_write_timeout not used on Windows unknown2005-05-051-3/+3
| |/ / /
* | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-061-0/+5
|\ \ \ \
| * \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-061-0/+5
| |\ \ \ \
| | * | | | Bug#9509 Optimizer: wrong result after AND with latin1_german2_ciunknown2005-05-051-0/+5