summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ | | | | | | into mysql.com:/home/kent/bk/main/mysql-5.1
| * 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
| * \ 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 bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2006-11-301-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| * \ \ \ Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2006-11-301-2/+7
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | into mysql.com:/home/my/mysql-5.1
| | * | | 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 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
| | * \ \ 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
| * | | | | Fixed compiler warnings (Mostly VC++):monty@mysql.com/narttu.mysql.fi2006-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed not used variables - Changed some ulong parameters/variables to ulonglong (possible serious bug) - Added casts to get rid of safe assignment from longlong to long (and similar) - Added casts to function parameters - Fixed signed/unsigned compares - Added some constructores to structures - Removed some not portable constructs Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown" (Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-11-292-10/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
| * | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2006-11-291-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build
| | * \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2006-11-281-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build
| | | * \ \ \ \ Merge mysql.com:/home/kent/bk/mysql-5.0kent@kent-amd64.(none)2006-11-271-2/+2
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1
| | | | * | | | 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.1gkodinov@dl145s.mysql.com2006-11-281-8/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
| | * | | | | | Merge mysql.com:/home/hf/work/w3475/my50-w3475holyfoot/hf@deer.(none)2006-10-241-8/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | | into mysql.com:/home/hf/work/w3475/my51-w3475
| | | * | | | 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 bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-11-292-10/+12
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
| * | | | | | Merge mysql.com:/home/my/mysql-5.0monty@nosik.monty.fi2006-11-271-0/+3
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| | * | | | | 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()
| * | | | | | Merge mysql.com:/home/my/mysql-5.0monty@nosik.monty.fi2006-11-221-7/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| | * | | | | 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 #)
| * | | | | Added --debug-info to most clients to detect memory leaks in mysql-test-runmonty@mysql.com/nosik.monty.fi2006-11-211-3/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved .progress files into the log directory Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23 Fixed some compiler warnings Fixed small memory leak in libmysql Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
* | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383kroki/tomash@moonlight.intranet2006-11-171-6/+10
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23383
| * | | 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.
* | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50tsmith@maint2.mysql.com2006-09-131-285/+138
|\ \ \ | |/ / | | | | | | into maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51
| * | 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
| | |
* | | Fix for bug #20907georg@lmy002.wdf.sap.corp2006-08-301-1/+1
| | | | | | | | | | | | | | | CMake versions > 2.4 allow linking to STATIC or SHARED libraries only.
* | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-08-121-7/+9
|\ \ \ | |/ / | | | | | | into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
| * | 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.
* | | | Merge rama.(none):/home/jimw/my/tmp_mergejimw@rama.(none)2006-07-281-8/+9
|\ \ \ \ | |/ / / | | | | | | | | into rama.(none):/home/jimw/my/mysql-5.1-clean
| * | | 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 bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-131-4/+3
|\ \ \ \ | |/ / / | | | | | | | | into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
| * | | 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
* | | | Re-apply missing changeset, orignally pushed by elliotmonty@mysql.com2006-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add define YASSL_PREFIX when compiling yassl Import patch from yaSSL - avoid allocating memory for each call to 'EVP_md5' and 'EVP_des_ede3_cbc' which were not released until server was stopped - Those functions are used from the SQL function 'des_encrypt' and 'des_decrypt'. Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases - Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.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. Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c Two threads both try a shutdown sequence which creates a race to the de-init/free of certain resources. This exists in similar form in the client as 17926: "mysql.exe crashes when ctrl-c is pressed in windows." Update after merge to 5.0 BUG#18669: Session COM_STATISTICS breaks mysqladmin status. Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens. - In function 'handle_grant_struct' when searching the memory structures for an entry to modify, convert all entries here host.hostname is NULL to "" and compare that with the host passed in argument "user_from". - A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means that "any host" can connect. Thus is's correct to turn on allow_all_hosts when such a user is found. - Review and fix other places where host.hostname may be NULL. BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated Removed duplication (not a user-visible change)
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newanozdrin@mysql.com2006-05-221-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
| * | | | This is an implementation of two WL items:anozdrin@mysql.com2006-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - WL#3158: IM: Instance configuration extensions; - WL#3159: IM: --bootstrap and --start-default-instance modes The following new statements have been added: - CREATE INSTANCE; - DROP INSTANCE; The behaviour of the following statements have been changed: - SET; - UNSET; - FLUSH INSTANCES; - SHOW INSTANCES; - SHOW INSTANCE OPTIONS;
View Lorry Controller Status