summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1elliot@mysql.com2005-08-192-0/+4
|\
| * Bug#11338 Fixes from review (identical functionality).elliot@mysql.com2005-08-191-1/+0
| * Changes for Netware. This is needed when building against newer Libcjani@a193-229-222-105.elisa-laajakaista.fi2005-08-181-0/+12
| * Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1elliot@mysql.com2005-08-172-0/+2
| |\
| | * BUG#11338 (logging of prepared statement w/ blob type)elliot@mysql.com2005-08-172-0/+2
* | | Fix up definition of new set_timespec_nsec() macro. (Related to bug #12582)jimw@mysql.com2005-08-171-4/+13
* | | Fix SLEEP() to be interruptable. (Bug #12582)jimw@mysql.com2005-08-161-0/+7
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-08-151-1/+1
|\ \ \ | |/ /
| * | Rename rest() macro in my_list.h to list_rest(). (Bug #12327)jimw@mysql.com2005-08-091-1/+1
| |/
* | Merge xiphis.org:/usr/home/antony/work2/mysql-4.1acurtis@xiphis.org2005-08-111-0/+5
|\ \ | |/
| * Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-08-091-0/+5
| |\
| | * Bug#5439 : mysql_server_init() crashes if ShiftJIS path is passedbar@mysql.com2005-08-081-0/+5
* | | Merge mysql.com:/home/jimw/my/mysql-5.0-7003jimw@mysql.com2005-08-021-0/+7
|\ \ \
| * | | Add my_str_malloc and _free function pointers to strings libraryjimw@mysql.com2005-06-241-0/+7
* | | | fix compile warning in Visual Studio 2003reggie@fedora.(none)2005-08-011-1/+0
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-07-312-4/+5
|\ \ \ \
| * | | | Fixes during review of new pushed codemonty@mishka.local2005-07-312-4/+5
* | | | | Mergeigor@rurik.mysql.com2005-07-311-0/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | fix for bug#12665georg@lmy002.wdf.sap.corp2005-07-291-0/+1
* | | | Merge mysql.com:/home/my/mysql-4.1monty@mysql.com2005-07-281-1/+1
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/home/my/mysql-4.0monty@mysql.com2005-07-271-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Review fixes:monty@mysql.com2005-07-261-1/+1
* | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b10201bar@mysql.com2005-07-261-0/+1
|\ \ \ \ | |/ / /
| * | | Undefined RINT for Netware.jani@a193-229-222-105.elisa-laajakaista.fi2005-07-231-0/+1
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-buildjimw@mysql.com2005-07-221-0/+1
|\ \ \ \
| * | | | Add the definition of "floatget".joerg@mysql.com2005-07-221-0/+1
* | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se2005-07-211-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se2005-07-201-1/+1
| |\ \ \ | | |/ /
| | * | Bug #10600mronstrom@mysql.com2005-07-191-1/+1
| * | | Merge grichter@bk-internal.mysql.com:/home/bk/mysql-4.1georg@lmy002.wdf.sap.corp2005-07-201-1/+1
| |\ \ \
| | * | | minor fix (backport from 5.0) - changed function prototype/definitiongeorg@lmy002.wdf.sap.corp2005-07-191-1/+1
| * | | | Added some missing casts and changed a define for alloca().jani@a193-229-222-105.elisa-laajakaista.fi2005-07-201-1/+1
* | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-5906jimw@mysql.com2005-07-191-1/+1
|\ \ \ \ \
| * | | | | Fix number to date conversion so it always honors the NO_ZERO_DATE,jimw@mysql.com2005-07-181-1/+1
* | | | | | Merge bk-internal:/home/bk/mysql-5.0jimw@mysql.com2005-07-191-3/+6
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-07-191-3/+6
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Simple fixes during review of new codemonty@mishka.local2005-07-191-3/+6
| | | |/ / / | | |/| | |
* | | | | | A fix and a test case for Bug#10760 and complementary cleanups. konstantin@mysql.com2005-07-191-4/+37
|/ / / / /
* | | | | Bug#10932 - Building server with key limit of 128, makes test cases failingo@mysql.com2005-07-192-6/+76
* | | | | Fixes to previous changesetmonty@mishka.local2005-07-181-1/+0
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-07-182-3/+7
|\ \ \ \ \
| * | | | | Cleanups during reviewmonty@mishka.local2005-07-182-3/+7
* | | | | | Restore previous used client charset in mysql_reconnectgeorg@lmy002.wdf.sap.corp2005-07-161-1/+1
| |_|/ / / |/| | | |
* | | | | Merge mysql.com:/home/bkroot/mysql-4.1lars@mysql.com2005-07-131-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fixed some vio code that was using ___WIN__ instead of __WIN__reggie@linux.site2005-07-121-1/+1
* | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-07-121-0/+14
|\ \ \ \ \
| * | | | | changes after Bar's review: renamed CHARACTER_SET to MY_CHARSET_INFOgeorg@lmy002.wdf.sap.corp2005-07-121-2/+2
| * | | | | New attempt after Bar's reviewgeorg@lmy002.wdf.sap.corp2005-07-121-0/+14
* | | | | | Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1mskold@mysql.com2005-07-121-4/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Fix for gcc 4.0 (they have removed min/max operators).brian@avenger.(none)2005-07-111-4/+1