summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/my/mysql-5.0monty@nosik.monty.fi2006-11-221-1/+1
|\ | | | | | | into mysql.com:/home/my/mysql-5.1
| * 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 #)
| * 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 #23427: incompatible ABI change in 5.0.26?mmj@tiger.local[mmj]2006-10-241-1/+0
| | | | | | | | | | Revert 1 June change enough to restore ABI compatibility with previous versions.
* | libmysqld/Makefile.am fixedholyfoot/hf@mysql.com/deer.(none)2006-10-191-3/+3
| |
* | Makefile.am:kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-10-191-3/+3
| | | | | | | | Quote variable in "for"-loop head, in case it can be empty.
* | bug #23369 (Embedded library can't be linked)holyfoot/hf@mysql.com/deer.(none)2006-10-181-2/+12
| | | | | | | | | | | | | | Problem is that some files moved to storage/*/ still are dependent on sql/ code (usually use members of THD structure) that can get different being compiled with another #define-s Code added to recompile these for the embedded server
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1dlenev@mockturtle.local2006-09-141-1/+2
|\ \ | | | | | | | | | into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
| * \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtimeahristov@bk-internal.mysql.com2006-09-061-1/+2
| |\ \ | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337
| | * \ Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337andrey@example.com2006-08-141-1/+2
| | |\ \ | | | | | | | | | | | | | | | into example.com:/work/mysql-5.1-runtime-wl3337
| | | * | first cut of WL#3337 (New event scheduler locking infrastructure).andrey@lmy004.2006-06-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Infrastructure built. Added the foreseen files and change Makefile.am/CMakeLists.txt accordingly.
* | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1rburnett@bk-internal.mysql.com2006-09-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
| * | | | | Moves Innodb handler to the Innodb storage directory.brian@zim.(none)2006-09-071-1/+1
| |/ / / /
* | | | | Merge production.mysql.com:/usersnfs/rburnett/tmp_merge2rburnett@production.mysql.com2006-09-061-0/+1
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | into production.mysql.com:/usersnfs/rburnett/mysql-5.1
| * | | bug #16513 (no mysql_set_server_option in libmysqld.dll export)holyfoot/hf@mysql.com/deer.(none)2006-08-191-0/+1
| | | |
* | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1brian@zim.(none)2006-08-252-4/+5
|\ \ \ \ | | | | | | | | | | | | | | | into zim.(none):/home/brian/mysql/arch-5.1
| * | | | fix for windows buildacurtis/antony@xiphis.org/ltantony.xiphis.org2006-08-241-2/+4
| | | | |
| * | | | This changeset moves the ha_myisam files to their storage directories. It ↵brian@zim.(none)2006-08-191-1/+0
| | | | | | | | | | | | | | | | | | | | also includes updates for all engines include patch for windows builds.
| * | | | Update to push all of merge into the merge storage directory.brian@zim.(none)2006-08-191-1/+1
| | | | |
| * | | | Moved heap into its own directory.brian@zim.(none)2006-08-191-2/+2
| | | | |
* | | | | Many files:kent@mysql.com/g4-2.local2006-08-211-5/+1
|/ / / / | | | | | | | | | | | | | | | | Deleted config/ac-macros/ha_berkeley.m4 Removed more referenses to bdb
* | | | Removed warnings for Windows build issues. Edited Windows README to remove ↵brian@zim.(none)2006-08-141-4/+0
| | | | | | | | | | | | | | | | reference to BDB.
* | | | Removed bdb test cases. baker/brian@zim.(none)2006-08-101-5/+1
| | | |
* | | | First stage removeal of BDB.brian@zim.(none)2006-08-091-1/+1
| |/ / |/| |
* | | Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfootpatg@govinda.patg.net2006-08-081-2/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2 Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
| * | 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
| | | | |
* | | | | Merge rama.(none):/home/jimw/my/tmp_mergejimw@rama.(none)2006-07-283-19/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | into rama.(none):/home/jimw/my/mysql-5.1-clean
| * | | | 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.
* | | | | Add sql_locale.cc to cmake scripts.kostja@bodhi.local2006-07-281-2/+3
| | | | |
* | | | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-261-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
| * | | | 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
| |\ \ \ \ | | |/ / /
* | | | | Fix windows build of libmysqld. Curious why pushbuild did notandrey@lmy004.2006-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | catch that. Stale CMakeLists.txt
* | | | | Merge chilla.local:/home/mydev/mysql-5.0-ateamingo@chilla.local2006-07-062-45/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | into chilla.local:/home/mydev/mysql-5.1-ateam
| * | | | Merge mysql.com:/home/mydev/mysql-4.1-bug14400ingo@mysql.com2006-07-052-45/+10
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / into mysql.com:/home/mydev/mysql-5.0-ateam
| | * | 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
* | | manual mergeandrey@lmy004.2006-06-202-2/+2
|\ \ \
| * | | Reorganize, physically the events codeandrey@lmy004.2006-06-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify method naming -> create/update/drop_event Move class Event_timed to event_timed.h class Events is in events.h (renamed from event.h) The implementation is in events.cc (renamed from event.h)
* | | | Re-apply missing changeset, orignally pushed by elliotmonty@mysql.com2006-06-062-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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:/data0/bk/mysql-5.1-newrburnett@bk-internal.mysql.com2006-05-231-1/+1
|\ \ \ | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
| * \ \ manual mergedandrey@lmy004.2006-05-221-1/+1
| |\ \ \
View Lorry Controller Status