summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Fix warnings from iccmonty@mysql.com2005-05-181-3/+3
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-05-162-2/+9
|\
| * A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work"konstantin@mysql.com2005-05-162-2/+9
* | Mergepetr@mysql.com2005-05-161-0/+5
|\ \
| * | post-review fixespetr@mysql.com2005-05-161-0/+5
* | | Manual merge (again)konstantin@mysql.com2005-05-141-0/+1
|\ \ \
| * | | added prototype for mysql_set_character_set functiongeorg@lmy002.wdf.sap.corp2005-05-131-0/+1
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-05-132-5/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | concurrent-insert can now be set to 2 for concurrent inserts when there is ho...monty@mishka.local2005-05-132-5/+5
* | | | A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute"konstantin@mysql.com2005-05-121-1/+2
* | | | Mergejimw@mysql.com2005-05-091-0/+6
|\ \ \ \ | | |/ / | |/| |
| * | | a fix (bug #10438: Raid stopped working because of change in atomic add detec...ramil@ram-book.(none)2005-05-091-0/+6
| * | | Merge neptunus.(none):/home/msvensson/mysql/bug10241msvensson@neptunus.(none)2005-05-091-1/+1
| |\ \ \
| * \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug10241msvensson@neptunus.(none)2005-05-092-1/+6
| |\ \ \ \
* | \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug10241msvensson@neptunus.(none)2005-05-091-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | After review fixesmsvensson@neptunus.(none)2005-05-091-1/+1
| | |/ / / | |/| | |
* | | | | Merge neptunus.(none):/home/msvensson/mysql/bug10241msvensson@neptunus.(none)2005-05-092-1/+6
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | BUG#10241 cygwin port: invalid pragma interface directivesmsvensson@neptunus.(none)2005-05-042-1/+6
* | | | Merge mysql.com:/home/ram/work/mysql-4.1ramil@mysql.com2005-05-061-12/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2005-05-061-12/+0
| |\ \ \
| | * | | A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h).ramil@ram-book.(none)2005-05-061-12/+0
* | | | | Merge bk-internal.mysql.com:/users/rburnett/bug9721rburnett@bk-internal.mysql.com2005-05-061-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge bk-internal.mysql.com:/data0/bk/mysql-4.1rburnett@bk-internal.mysql.com2005-05-061-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Added cp932 character setshuichi@mysql.com2005-05-051-0/+2
| * | | | Bug #9721 net_write_timeout not used on Windows rburnett@bk-internal.mysql.com2005-05-051-3/+3
| |/ / /
* | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil@mysql.com2005-05-061-0/+5
|\ \ \ \
| * \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0bar@mysql.com2005-05-061-0/+5
| |\ \ \ \
| | * | | | Bug#9509 Optimizer: wrong result after AND with latin1_german2_cibar@noter.(none)2005-05-051-0/+5
* | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil@mysql.com2005-05-061-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Mergeholyfoot@mysql.com2005-05-051-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | A lot of fixes to Precision mathholyfoot@hf-ibm.(none)2005-05-051-1/+1
* | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ram@ram-book.(none)2005-05-051-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | A fix (bug #10179: error in default value setting).ramil@ram-book.(none)2005-05-051-2/+3
* | | | | | Manual mergekonstantin@mysql.com2005-05-051-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h:kent@mysql.com2005-05-051-0/+4
| | |/ / | |/| |
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-5354jimw@mysql.com2005-05-021-0/+1
|\ \ \ \
| * | | | Add default configuration files to my_print_defaults usage, andjimw@mysql.com2005-04-281-0/+1
* | | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-05-012-2/+17
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge with 4.1monty@mysql.com2005-04-302-2/+17
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-04-301-0/+1
| | |\ \ \
| | * | | | CAST(string_argument AS UNSIGNED) didn't work for big integers above the sign...monty@mysql.com2005-04-292-2/+17
* | | | | | yassl changeset 2:serg@serg.mylan2005-04-301-11/+0
* | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-04-292-7/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge mysql.com:/home/mydev/mysql-4.1-4100ingo@mysql.com2005-04-281-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | |
| | * | | Merge mysql.com:/home/mydev/mysql-4.1-bug5964ingo@mysql.com2005-04-281-0/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | BUG#5964 - 4.1 MERGE tables regression from 4.0ingo@mysql.com2005-04-281-0/+1
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-04-271-4/+5
| | |\ \ \
| | | * | | Final fix for NPTL configuration (bug#2173, bug#5871, and bug#9497).joerg@mysql.com2005-04-261-0/+1
| * | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-04-271-0/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portablemsvensson@neptunus.(none)2005-04-271-0/+6