summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Collapse)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518msvensson@neptunus.(none)2007-01-161-3/+11
|\ | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * Bug#15518 Reusing a stmt that has failed during prepare does not clear errormsvensson@neptunus.(none)2007-01-161-3/+11
| | | | | | | | | | | | | | | | - Always reset error when calling mysql_stmt_prepare a second time - Set stmt->state to MYSQL_STMT_INIT_DONE before closing prepared stmt in server. - Add test to mysql_client_test - Remove mysql_stmt_close in mysqltest after each query - Close all open statements in mysqltest if disable_ps_protocol is called.
* | my_strtoll10-x86.s:kent@mysql.com/kent-amd64.(none)2006-12-313-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected spelling in copyright text Makefile.am: Don't update the files from BitKeeper Many files: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header Many files: Added GPL copyright text Removed files: Docs/Support/colspec-fix.pl Docs/Support/docbook-fixup.pl Docs/Support/docbook-prefix.pl Docs/Support/docbook-split Docs/Support/make-docbook Docs/Support/make-makefile Docs/Support/test-make-manual Docs/Support/test-make-manual-de Docs/Support/xwf
* | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| | | | | | | | Changed header to GPL version 2 only
* | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marveldf@kahlann.erinye.com2006-12-011-3/+7
|\ \ | | | | | | | | | into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
| * | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2006-11-301-3/+7
| |/ | | | | | | Don't assert if my_thread_end() is called twice (common case)
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-11-293-17/+12
|\ \ | |/ | | | | into bodhi.local:/opt/local/work/mysql-5.0-runtime
| * Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2006-11-271-2/+2
| |\ | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.0-merge
| | * ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4:kent@mysql.com/kent-amd64.(none)2006-11-271-2/+2
| | | | | | | | | | | | Reenabled build outside source tree
| * | Merge bk-internal:/home/bk/mysql-5.0gkodinov@dl145s.mysql.com2006-11-272-7/+10
| |\ \ | | | | | | | | | | | | into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
| | * | Added some missing DBUG_RETURNmonty@mysql.com/nosik.monty.fi2006-11-231-0/+3
| | | | | | | | | | | | | | | | | | | | Fixed that --valgrind works again with mysql-test-run.sh Extended error messages when loosing connection during mysql_real_connect()
| | * | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-201-7/+7
| | |/ | | | | | | | | | | | | | | | | | | (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/w3475/my41-w3475holyfoot/hf@mysql.com/deer.(none)2006-10-231-8/+0
| |\ \ | | |/ | |/| | | | into mysql.com:/home/hf/work/w3475/my50-w3475
| | * WL#3475 (Threads for the embedded server in mysqltest)holyfoot/hf@mysql.com/deer.(none)2006-10-231-7/+0
| | | | | | | | | | | | | | | Necessary code added to mysqltest.c. Disabled tests are available now.
* | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383kroki/tomash@moonlight.intranet2006-11-171-6/+10
|\ \ \ | |/ / |/| | | | | into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383
| * | BUG#23383: mysql_affected_rows() returns different values thankroki/tomash@moonlight.intranet2006-11-171-5/+9
| |/ | | | | | | | | | | | | | | mysql_stmt_affected_rows() The problem was that affected_rows for prepared statement wasn't updated in the client library on the error. The solution is to always update affected_rows, which will be equal to -1 on the error.
* | make dist changes for Cmake buildgeorg@lmy002.wdf.sap.corp2006-09-012-1/+176
| |
* | Additional files for cmake supportgeorg@lmy002.wdf.sap.corp2006-08-311-0/+54
| |
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-021-7/+9
|\ \ | | | | | | | | | 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-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | mergingholyfoot/hf@mysql.com/deer.(none)2006-07-181-2/+3
| | |
* | | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-181-6/+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-131-6/+7
| |\ | | | | | | | | | into mysql.com:/home/hf/work/mysql-4.1.16017
| | * bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-011-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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:/home/my/mysql-4.1monty@mysql.com2006-06-301-4/+3
|\ \ \ | |/ / | | | | | | into mysql.com:/home/my/mysql-5.0
| * | bug #20152: mysql_stmt_execute() overwrites parameter bufferskroki@mysql.com2006-06-301-4/+3
| |/ | | | | | | | | | | | | | | When using a parameter bind MYSQL_TYPE_DATE in a prepared statement, the time part of the MYSQL_TIME buffer was written to zero in mysql_stmt_execute(). The param_store_date() function in libmysql.c worked directly on the provided buffer. Changed to use a copy of the buffer.
| * libmysql.c:bar@mysql.com2006-04-061-0/+3
| | | | | | | | | | Bug#18830: incompatibility new libraries with old server Don't execute SET NAMES with pre-4.1 server.
| * Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error":konstantin@mysql.com2006-03-051-1/+1
| | | | | | | | | | it breaks binary compatibility. The patch will be left intact in 5.1.
* | Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_initmsvensson@shellback.(none)2006-05-311-1/+1
| | | | | | | | | | | | | | - 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.
* | Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfixknielsen@mysql.com2006-05-151-1/+1
|\ \ | | | | | | | | | into mysql.com:/usr/local/mysql/tmp-5.0
| * | Fix two Valgrind memory leak warnings.knielsen@mysql.com2006-05-151-1/+1
| | |
* | | Remove valgrind and compiler warningsmsvensson@neptunus.(none)2006-05-081-0/+1
| | | | | | | | | | | | Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.
* | | 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
* | Merge 192.168.0.20:mysql/bug15069/my50-bug15069msvensson@neptunus.(none)2006-04-101-0/+1
|\ \ | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | Bug#15069 [patch] my_print_defaults does'nt care --sysconfdirmsvensson@shellback.(none)2006-04-101-0/+1
| | | | | | | | | | | | | | | | | | | | | - Grab the path from "configure --sysconfdir=<path>" and set it as the first place to look for my.cnf files Do this both in Makefiles for libmysql and mysys - Patch provided by Francesco Riosa. Thank you!
* | | Moving mysql_get_server_version() from libmysql.c to client.c,bar@mysql.com2006-04-061-29/+0
| | | | | | | | | | | | as it is now required by mysql_set_character_set()
* | | yassl link problem fixedserg@serg.mylan2006-04-032-5/+6
| | |
* | | Makefile.am, yassl.m4:kent@mysql.com2006-04-011-1/+5
|/ / | | | | | | | | | | Enable automake to determine dependency on yaSSL, by explicitly listing the .la files in Makefile.am, instead of using 'yassl_libs_with_path', bug#18273
* | Undo the patch for Bug#16144 "mysql_stmt_attr_get type error",konstantin@mysql.com2006-03-041-1/+1
| | | | | | | | | | | | | | it breaks binary compatibility. The patch will be left intact in 5.1. Warning: this changeset should be null-merged into 5.1. A separate commit in order to push into the release clone of 5.0.19.
* | Fixes to embedded server to be able to run tests with itmonty@mysql.com2006-02-241-6/+6
| | | | | | | | (Needed for "list of pushes" web page and autopush)
* | Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057msvensson@neptunus.(none)2006-02-211-1/+5
|\ \ | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | Bug#14057 mysql_ping() handles TCP and UNIX socket connections in different waysmsvensson@neptunus.(none)2006-02-161-1/+5
| | | | | | | | | | | | - Retry the ping if reconnect is turned on and the error was CR_SERVER_LOST
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-02-151-0/+1
|\ \ \ | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | | Bug#16143 mysql_stmt_sqlstate returns an empty string instead of '00000'msvensson@devsrv-b.mysql.com2006-02-151-0/+1
| | | | | | | | | | | | | | | | - Init sql_state in mysql_stmt_init
* | | | Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013msvensson@neptunus.(none)2006-02-131-2/+33
|\ \ \ \ | |/ / / |/| | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | | Bug#14013 mysql_stmt_store_result() bombs if a cursor is openmsvensson@neptunus.(none)2006-02-101-2/+33
| |/ / | | | | | | | | | | | | | | | - Add code to 'mysql_stmt_store_result' to allow it to be called on a prepared statement with open server side cursor. - Add tests to mysql_client_test that uses 'mysql_stmt_store_result'
* | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2006-02-021-0/+6
|\ \ \ | | |/ | |/| | | | into mysql.com:/opt/local/work/mysql-5.0-root
| * | fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection ↵andrey@lmy004.2006-02-011-0/+6
| | | | | | | | | | | | reset)
* | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2006-01-183-2/+3
|\ \ \ | |/ / | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root
| * | A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":konstantin@mysql.com2006-01-171-1/+1
| | | | | | | | | | | | use the right type in mysql_stmt_attr_get
View Lorry Controller Status