summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Collapse)AuthorAgeFilesLines
* Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2006-11-271-5/+18
|\ | | | | | | into mysql.com:/home/kent/bk/mysql-5.0-merge
| * Merge mysql.com:/home/kent/bk/mysql-4.1kent@mysql.com/kent-amd64.(none)2006-11-271-5/+18
| |\ | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.0
| | * gen_rec.awk:kent@mysql.com/kent-amd64.(none)2006-11-271-5/+19
| | | | | | | | | | | | | | | | | | Fix undefined behaviour. Many files: Reenabled build outside ource tree
* | | Merge bk-internal:/home/bk/mysql-5.0gkodinov@dl145s.mysql.com2006-11-271-1/+1
|\ \ \ | | | | | | | | | | | | into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
| * | | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-201-1/+1
| |/ / | | | | | | | | | | | | | | | | | | (Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #)
* | | Merge mysql.com:/home/hf/work/mysql-4.1-mrgholyfoot/hf@mysql.com/deer.(none)2006-11-161-0/+1
|\ \ \ | |/ / |/| | | | | into mysql.com:/home/hf/work/mysql-5.0-mrg
| * | Bug #23427 (incompatible ABI change)holyfoot/hf@mysql.com/deer.(none)2006-10-241-5/+5
| |/ | | | | | | | | | | the incompatibility was caused by current_stmt member added to the MYSQL structure. It's possible to move it to THD structure instead which saves ABI
* | Bug #23427: incompatible ABI change in 5.0.26?cmiller@zippy.cornsilk.net2006-10-201-1/+0
| | | | | | | | | | Revert 1 June change enough to restore ABI compatibility with previous versions.
* | bug #16513 (no mysql_set_server_option in libmysqld.dll export)holyfoot/hf@mysql.com/deer.(none)2006-08-191-0/+1
| |
* | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-251-2/+6
|\ \ | |/ | | | | into mysql.com:/home/hf/work/mysql-5.0.mrg
| * Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-201-2/+6
| |\ | | | | | | | | | into mysql.com:/home/hf/work/mysql-4.1.19983
| | * bug #19983 (mysql_client_test_embedded fails)holyfoot@deer.(none)2006-06-021-2/+6
| | |
* | | mergingholyfoot/hf@mysql.com/deer.(none)2006-07-182-16/+1
| | |
* | | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-183-16/+30
|\ \ \ | |/ / | | | | | | into mysql.com:/home/hf/work/mysql-5.0.mrg
| * | Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-133-31/+37
| |\ \ | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-4.1.16017
| | * | bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-013-31/+37
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | There actually was 3 different problems - hash_user_connections wasn't cleaned one strdupped database name wasn't freed and stmt->mem_root wasn't cleaned as it was replased with mysql->field_alloc for result For the last one - i made the library using stmt's fields to store result if it's the case.
* | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-081-1/+1
|\ \ \ | |/ / | | | | | | into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
| * | WL#2928 Date Translation NREbar@mysql.com2006-07-041-1/+1
| | | | | | | | | | | | (implemented by by Josh Chamas)
* | | mergingholyfoot@mysql.com2006-06-262-45/+10
|\ \ \ | |/ /
| * | bug #20318 (ctype_ucs2_def test fails with embedded)holyfoot@deer.(none)2006-06-192-45/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | there was two problems about charsets in embedded server 1. mysys/charset.c - defined there default_charset_info variable is modified by both server and client code (particularly when --default-charset option is handled) In embedded server we get two codelines modifying one variable. I created separate default_client_charset_info for client code 2. mysql->charset and mysql->options.charset initialization isn't properly done for embedded server - necessary calls added
| * Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-12-271-0/+0
| | | | | | | | into mysql.com:/home/mydev/mysql-4.1-bug5390
* | Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_initmsvensson@shellback.(none)2006-05-312-3/+3
| | | | | | | | | | | | | | - Include prefix files that renames all public functions in yaSSLs OpenSSL API to ya<function_name>. They will otherwise conflict with OpenSSL functions if loaded by an application that uses OpenSSL as well as libmysqlclient with yaSSL support.
* | Backport fix for mysql client not using SSl library directlymsvensson@neptunus.(none)2006-04-221-0/+1
| | | | | | | | | | - Add function mysql_get_ssl_cipher - Use function mysql_get_ssl_cipher from mysql
* | compilation fixesserg@serg.mylan2006-03-061-29/+22
| |
* | Fixes to embedded server to be able to run tests with itmonty@mysql.com2006-02-244-214/+462
| | | | | | | | (Needed for "list of pushes" web page and autopush)
* | Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clauseanozdrin@mysql.com2006-01-111-1/+1
| | | | | | | | | | | | | | There are two main idea of this fix: - introduce a common function for server and client to split user value (<user name>@<host name>) into user name and host name parts; - dump DEFINER clause in correct format in mysqldump.
* | Bug #15168 yassl failure on amd64msvensson@devsrv-b.mysql.com2005-11-242-4/+3
| | | | | | | | - Use libtool to build libraries
* | Mergekent@mysql.com2005-11-042-14/+15
|\ \ | |/
| * Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-11-042-15/+16
| |\ | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
| | * Makefile.am, configure.in:kent@mysql.com2005-09-242-15/+16
| | | | | | | | | | | | Enable "make distcheck" to work
* | | Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985msvensson@neptunus.(none)2005-10-281-2/+4
|\ \ \ | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | | BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linkingmsvensson@neptunus.(none)2005-10-271-1/+3
| | | | | | | | | | | | | | | | | | | | - Remove yassl_libsfrom CLIENT_LIBS var - Add yassl_libs to libmysql and libmysqld
| * | | Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linkingmsvensson@neptunus.(none)2005-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | - Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
* | | | Moving archive from example to sql.brian@zim.(none)2005-09-281-2/+2
| | | |
* | | | Fix for bug #13546 "Build errors with --with-embedded-serverdlenev@mysql.com2005-09-281-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | --with-embedded-privilege-control options". One more (hopefully last) build failure which was introduced during work on WL#2787 "Add view definer/owner to the view definition..."
* | | | Merge mysql.com:/home/dlenev/src/mysql-4.1-bg13501dlenev@mysql.com2005-09-281-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-merges
| * | | Fix for bug #13501 "build problem: too many arguments to function my_booldlenev@mysql.com2005-09-271-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | acl_init". Updated calls to acl_init()/grant_init() in init_embedded_server() - their signatures were changed recently, now they don't need argument for passing pointer to THD object (this code was only compiled if one built embedded server library with --with-embedded-privilege-control switch).
* | | Merge mysqldev@production.mysql.com:my/mysql-5.0-releasekonstantin@mysql.com2005-09-231-1/+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-1/+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
* | | postmerge fixesbell@sanja.is.com.ua2005-09-211-1/+1
| | |
* | | WL#2787 (part 2, ver 3 (merged)) changed securety context switchingbell@sanja.is.com.ua2005-09-151-4/+3
|/ /
* | Merge deer.(none):/home/hf/work/mysql-4.1.9110hf@deer.(none)2005-07-271-0/+2
|\ \ | |/ | | | | into deer.(none):/home/hf/work/mysql-5.0.clean
| * Fix for bug #9110 (Max_join_size error)hf@deer.(none)2005-07-261-0/+2
| |
* | Fixes to previous changesetmonty@mishka.local2005-07-181-1/+1
| | | | | | | | get_defaults_file() -> get_defaults_options()
* | Mergekent@mysql.com2005-07-062-4/+4
|\ \ | |/
| * Makefile.am:kent@mysql.com2005-07-052-2/+4
| | | | | | | | | | Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir
* | A fix and a test case for Bug#10794 "mysql_stmt_attr_set no konstantin@mysql.com2005-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | open cursor after mysql_stmt_execute" + post-review fixes. The bug was caused by wrong flags in stmt->server_status on the client side: if there was no cursor, the server didn't send server_status flags to the client, and the old flags were used to set up the fetch function of a statement. Consequently, stmt_read_row_from_cursor was used when there was no cursor. The fix fixes the server to always send server flags to the client.
* | Rename all prepared statements COM_ commands to prefix with COM_STMT_konstantin@mysql.com2005-06-171-1/+1
| |
* | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-06-101-0/+1
|\ \ | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| * | mysql_client_test.dsp, mysql_test_run_new.dsp, mysqltest.dsp:kent@mysql.com2005-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added /FD flag, to avoid include file warnings mysqlclient.dsp: Removed duplicate entry for "strings/ctype-cp932.c" Added missing "mysys/my_access.c" libmysqld.dsp: Added missing "mysys/charset.c" libmysqld.def: Added symbol 'get_charset_name'