summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysqldev@production.mysql.com:my/mysql-5.0-releasekonstantin@mysql.com2005-09-231-0/+1
|\ | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root
| * A fix and a test case for Bug#6513 "Test Suite: Values inserted by using konstantin@mysql.com2005-09-221-0/+1
| | | | | | | | | | | | | | | | | | | | cursor is interpreted latin1 character and Bug#9819 "Cursors: Mysql Server Crash while fetching from table with 5 million records." A fix for a possible memory leak when fetching into an SP cursor in a long loop. The patch uses a common implementation of cursors in the binary protocol and in stored procedures and implements materialized cursors. For implementation details, see comments in sql_cursor.cc
* | aftermerge fixserg@serg.mylan2005-09-211-1/+1
| |
* | mergedserg@serg.mylan2005-09-212-0/+18
|\ \
| * \ Merge mysql.com:/home/psergey/bk-trees/mysql-4.1sergefp@mysql.com2005-09-211-0/+15
| |\ \ | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-csc6030-r3
| | * | BUG#12232: Add a server option to treat NULL values as equal when ↵sergefp@mysql.com2005-09-211-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | calculating MyISAM index statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)
| * | | Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1SergeyV@selena.2005-09-201-0/+3
| |\ \ \ | | | | | | | | | | | | | | | into selena.:H:/MYSQL/src/#12929-mysql-4.1
| | * | | Fixes bug #12929. Uses my_cgets instead of _cgets function, thus eliminatingSergeyV@selena.2005-09-161-0/+3
| | |/ / | | | | | | | | | | | | a restriction to 255 chars for editable buffer.
* | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0bar@mysql.com2005-09-191-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | into mysql.com:/usr/home/bar/mysql-5.0.b10504
| * | | Bug#10504bar@mysql.com2005-09-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Character set does not support traditional mode ctype_utf8.result, ctype_utf8.test: adding test case. password.c, mysql_com.h Changeing octet2hex availability from static to public. item_strfunc.cc: Result string is now checked to be well-formed. Warning/error is generated, depending on sql_mode.
* | | | Compile problem about "madvise()" on Solaris (bug#7156). (Patch supplied by ↵joerg@mysql.com2005-09-151-0/+8
| | | | | | | | | | | | | | | | Kent)
* | | | Merge mysql.com:/home/mydev/mysql-4.1-4100ingo@mysql.com2005-09-142-7/+4
|\ \ \ \ | |/ / / |/| / / | |/ / into mysql.com:/home/mydev/mysql-5.0-5000
| * | Bug#12920 - key_read_requests counter appears to re-setingo@mysql.com2005-09-142-7/+4
| | | | | | | | | | | | After merge fix.
| * | Merge mysql.com:/home/mydev/mysql-4.0-4000ingo@mysql.com2005-09-141-2/+2
| |\ \ | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| | * | Bug#12920 - key_read_requests counter appears to re-setingo@mysql.com2005-09-141-2/+2
| | | | | | | | | | | | | | | | Enlarged the counter variables to ulonglong.
| | * | Merge mysql.com:/M40/clone-4.0 into mysql.com:/M40/upward-4.0joerg@mysql.com2005-09-081-0/+5
| | |\ \
| | | * | my_global.h:kent@mysql.com2005-09-021-0/+5
| | | | | | | | | | | | | | | | | | | | Back port of QNX work around for rint()
* | | | | Fix QNX warningmsvensson@neptunus.(none)2005-09-141-1/+3
| | | | |
* | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-09-123-5/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | | Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-09-122-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * \ \ \ Merge selena.:H:/MYSQL/src/#05588-mysql-4.0SergeyV@selena.2005-09-072-0/+7
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| | into selena.:H:/MYSQL/src/#05588-mysql-4.1
| | | * | Fixes bug #5588. vio_was_interrupted() function was added to detectSergeyV@selena.2005-08-302-0/+7
| | | |/ | | | | | | | | | | | | read timeout properly on win32.
| | | * Several fixes for Netware.jani@a193-229-222-105.elisa-laajakaista.fi2005-08-242-0/+3
| | | |
| | | * Some minor fixes for Netware. These were required after we started buildingjani@a193-229-222-105.elisa-laajakaista.fi2005-08-181-0/+12
| | | | | | | | | | | | | | | | against a later version of libc.
| * | | Merge mysqldev@production.mysql.com:jimw/mysql-4.1-scojimw@mysql.com2005-09-121-5/+0
| |\ \ \ | | |/ / | |/| | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * | Port to SCO OpenServer 6. May require running ./configure withjimw@mysql.com2005-09-071-5/+0
| | | | | | | | | | | | | | | | --build=i686-unknown-sysv5SCO_SV6.0.0
| | * | Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)joerg@mysql.com2005-03-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Originally contained in 2005/03/03 19:51:29+01:00 serg@serg.mylan; contained in MySQL 4.1.10a; re-committed for archival purposes.
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-11787jimw@mysql.com2005-09-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | | Make it possible to change reconnect setting withjimw@mysql.com2005-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | mysql_options(..., MYSQL_OPT_RECONNECT, ...). (Bug #11787)
* | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-08-311-0/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | | Merge mysql.com:/home/jimw/my/mysql-4.1-7156jimw@mysql.com2005-08-311-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * | | | Add test for madvise() being declared in C++ code, because it is notjimw@mysql.com2005-08-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on Solaris even though it is available, and declare it ourselves in that case. (Bug #7156)
* | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-08-311-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | | | Fix incorrect spellings of "dropped" in source and tests. (Bug #12828)jimw@mysql.com2005-08-301-1/+1
| |/ / / /
* | | | | Fixes bug #11815. Convert file path to UNIX format to build correct query SergeyV@selena.2005-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | string while replicating LOAD DATA INFILE statement.
* | | | | libmysqld.vcproj:kent@mysql.com2005-08-251-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed spelling "Commerical" to "Commercial" mysqld.vcproj: Aligned engines with Unix version sql_class.cc: VC7 needs my_free() cast of first arg to be (gptr) my_global.h: Can't assume macro set_timespec_nsec exists if set_timespec does
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-08-221-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mishka.local:/home/my/mysql-5.0
| * | | | | Cleanup during review of new pushed codemonty@mishka.local2005-08-221-7/+7
| | | | | |
* | | | | | Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1elliot@mysql.com2005-08-192-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / into mysql.com:/home/emurphy/src/work/mysql-5.0
| * | | | 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
| | | | | | | | | | | | | | | | | | | | than we've used before.
| * | | | Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1elliot@mysql.com2005-08-172-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/Users/emurphy/src/work/mysql-4.1-bug11338
| | * | | | BUG#11338 (logging of prepared statement w/ blob type)elliot@mysql.com2005-08-172-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cp932, '\' character can be the second byte in a multi-byte character stream. This makes it difficult to use mysql_escape_string. Added flag to indicate which languages allow '\' as second byte of multibyte sequence so that when putting a prepared statement into the binlog we can decide at runtime whether hex encoding is really needed.
* | | | | | 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
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | | | 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
|\ \ \ \ \ | |/ / / / | | | | | | | | | | into xiphis.org:/usr/home/antony/work2/merge-5.0
| * | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-08-091-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b5439
| | * | | | Bug#5439 : mysql_server_init() crashes if ShiftJIS path is passedbar@mysql.com2005-08-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (important for Adobe). mf_pack.c, mf_dirname.c, charset.c, my_sys.h: - adding fs_character_set() function on Windows - ignoring fake slashes which are just multibyte parts in several functions in /mysys Verified by Shu to work on WinXP and Win2k. Test is not possible, or very hard to do.