summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Collapse)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-08-031-29/+40
|\ | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-021-29/+40
| |\ | | | | | | | | | into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
| | * A fix and a test case for Bug#15752 "Lost connection to MySQL server kostja@bodhi.local2006-07-241-29/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when calling a SP from C API" The bug was caused by lack of checks for misuse in mysql_real_query. A stored procedure always returns at least one result, which is the status of execution of the procedure itself. This result, or so-called OK packet, is similar to a result returned by INSERT/UPDATE/CREATE operations: it contains the overall status of execution, the number of affected rows and the number of warnings. The client test program attached to the bug did not read this result and ivnoked the next query. In turn, libmysql had no check for such scenario and mysql_real_query was simply trying to send that query without reading the pending response, thus messing up the communication protocol. The fix is to return an error from mysql_real_query when it's called prior to retrieval of all pending results.
* | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-07-241-1/+3
|\ \ \ | |/ / |/| | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/myoffice.izhnet.ru2006-07-231-1/+3
| |\ \ | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/5.0.b19370
| | * | Fix for bug #19370: DateTime datatype in MySQL has two bugs in itramil/ram@mysql.com/myoffice.izhnet.ru2006-07-121-1/+3
| | |/
* | | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-181-1/+2
|\ \ \ | |/ / |/| | | | | 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-131-1/+2
| |\ \ | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-4.1.16017
| | * | bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 mysql.com:/usr/home/bar/mysql-4.1.b7192bar@mysql.com2006-07-071-2/+31
|\ \ \ \ | |_|_|/ |/| | | | | | | into mysql.com:/usr/home/bar/mysql-5.0-kt
| * | | Bug#7192 Specify --with-collation doesn't work for connections?bar@mysql.com2006-06-301-2/+31
| |/ / | | | | | | | | | | | | | | | --with-collation worked only on the server side. Client side ignored this argument, so collation_connection was not properly set (remained latin1_swedish_ci).
* | | client.c:kent@mysql.com2006-07-031-0/+7
| | | | | | | | | | | | Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def
* | | mergingholyfoot@mysql.com2006-06-261-37/+49
|\ \ \ | |/ /
| * | bug #20318 (ctype_ucs2_def test fails with embedded)holyfoot@deer.(none)2006-06-191-36/+48
| |/ | | | | | | | | | | | | | | | | | | | | | | 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
* | Remove C++ commentsmsvensson@neptunus.(none)2006-05-031-5/+5
| | | | | | | | Formatting
* | Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208msvensson@neptunus.(none)2006-04-261-19/+107
|\ \ | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * | Bug#17208 SSL: client does not verify server certificatemsvensson@neptunus.(none)2006-04-181-2/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add new function 'ssl_verify_server_cert' which is used if we are connecting to the server with SSL. It will compare the hostname in the server's cert against the hostname that we used when connecting to the server. Will reject the connection if hostname does not match. - Add new option "OPT_SSL_VERIFY_SERVER_CERT" to be passed to mysql_options which will turn on checking of servers cert. - Add new argument "ssl-verify-server-cert" to all mysql* clients which will activate the above option. - Generate a new server cert with 1024 bits that has "localhost" as the server name.
| * | Fix up patchmsvensson@neptunus.(none)2006-04-121-67/+1
| | |
| * | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-04-121-17/+89
| |\ \ | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
| | * | Cleanup SSL implementationmsvensson@neptunus.(none)2006-03-101-17/+89
| | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate code Merge common functions Enforce MySQL coding standard
* | | | Backport fix for mysql client not using SSl library directlymsvensson@neptunus.(none)2006-04-221-0/+21
|/ / / | | | | | | | | | | | | - Add function mysql_get_ssl_cipher - Use function mysql_get_ssl_cipher from mysql
* | | Moving mysql_get_server_version() from libmysql.c to client.c,bar@mysql.com2006-04-061-0/+30
| | | | | | | | | | | | as it is now required by mysql_set_character_set()
* | | client.c:bar@mysql.com2006-04-061-0/+3
| | | | | | | | | | | | | | | | | | Bug#18830 incompatibility new libraries with old server Additional 5.0 fix: applying the same patch to client.c.
* | | Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"monty@mysql.com2006-03-271-6/+0
| | | | | | | | | | | | | | | This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared library
* | | Make usage of the MYSQL struct in shared libraries compatible with MySQL ↵monty@mysql.com2006-03-231-2/+11
|/ / | | | | | | | | | | 5.0.17 and 5.0.18 by not reseting or accessing the info_buffer member
* | Fixes to embedded server to be able to run tests with itmonty@mysql.com2006-02-241-4/+5
| | | | | | | | (Needed for "list of pushes" web page and autopush)
* | Merge neptunus.(none):/home/msvensson/mysql/bug15719/my50-bug15719msvensson@neptunus.(none)2006-01-301-17/+18
|\ \ | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | Bug #15719 MYSQL_OPT_RECONNECT option is modified by mysql_real_connectmsvensson@neptunus.(none)2006-01-261-17/+18
| | | | | | | | | | | | | | | - Move init of "reconnect" variable to mysql_init - Add test case to mysql_client_test.
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0serg@serg.mylan2006-01-161-1/+1
|\ \ \ | |/ / |/| | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| * | mergedserg@serg.mylan2006-01-031-1/+1
| |\ \
| | * | many warnings (practically safe but annoying) correctedserg@serg.mylan2006-01-031-1/+1
| | | |
* | | | Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clauseanozdrin@mysql.com2006-01-112-1/+58
|/ / / | | | | | | | | | | | | | | | | | | 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.
* | | Merge mysql.com:/home/alexi/dev/mysql-4.1-12440aivanov@mysql.com2005-12-151-6/+22
|\ \ \ | |/ / |/| / | |/ into mysql.com:/home/alexi/dev/mysql-5.0-12440
| * Fixed BUG #12440: "Incorrect processing of time values containingaivanov@mysql.com2005-12-151-6/+22
| | | | | | | | long fraction and/or large exponent part".
* | Fix value returned by mysql_warning_count() after fetching a preparedjimw@mysql.com2005-12-061-1/+1
| | | | | | | | statement that generated a warning. (Bug #15510)
* | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2005-11-251-1/+6
|\ \ | |/ | | | | into mysql.com:/opt/local/work/mysql-5.0-root
| * Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabledgluh@eagle.intranet.mysql.r18.ru2005-11-211-1/+5
| |
* | Improved testing of ssl and compressionmsvensson@neptunus.(none)2005-10-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | - Added show status variable "compression" for checking that compression is turned on. - Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections. - Setup server to accept ssl connections from clients ig that is supported by server - New tests - ssl - Run with ssl turned on - ssl_compress - Run with ssl and compression turned on - compress - Run with compression turned in - Updated test - openssl_1, rpl_openssl1 - Changed to run if server supports ssl
* | Added option --valgrind-mysqltest to mysql-test-runmonty@mishka.mysql.fi2005-09-141-2/+9
| | | | | | | | | | | | | | Added flag to Field::store(longlong) to specify if value is unsigned. This fixes bug #12750: Incorrect storage of 9999999999999999999 in DECIMAL(19, 0) Fixed warning from valgrind in CREATE ... SELECT Fixed double free of mysql.options if reconnect failed
* | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-09-121-1/+1
|\ \ | |/ | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * Fixes bug #5588. Additions after merge from 4.0.SergeyV@selena.2005-09-071-1/+1
| |
* | Merge mysql.com:/home/jimw/my/mysql-5.0-11787jimw@mysql.com2005-09-031-0/+3
|\ \ | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | Make it possible to change reconnect setting withjimw@mysql.com2005-07-061-0/+3
| | | | | | | | | | | | mysql_options(..., MYSQL_OPT_RECONNECT, ...). (Bug #11787)
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-08-151-2/+3
|\ \ \ | | |/ | |/| | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | Fix mysql_info() returning bad data in the results of a multi-statementjimw@mysql.com2005-08-101-2/+3
| | | | | | | | | | | | query that mixed statements that do and do not return info. (Bug #11688)
* | | Merge xiphis.org:/usr/home/antony/work2/mysql-4.1acurtis@xiphis.org2005-08-111-2/+4
|\ \ \ | |/ / | | | | | | into xiphis.org:/usr/home/antony/work2/merge-5.0
| * | Review of new pushed codemonty@mysql.com2005-08-091-2/+4
| | | | | | | | | | | | | | | | | | - Fixed some error condtion when handling dates with 'T' - Added extra test for bug #11867 (Wrong result with "... WHERE ROW( a, b ) IN ( SELECT DISTINCT a, b WHERE ...)" to show it's not yet fixed - Safety fixes and cleanups
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-08-041-5/+7
|\ \ \ | |/ / | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | Fix parsing of dates with 'T' between date and time, as in ISO-8601jimw@mysql.com2005-08-021-5/+7
| | | | | | | | | | | | date format. (Bug #7308)
| * | fix for bug#12001georg@lmy002.wdf.sap.corp2005-07-191-1/+1
| | |