summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\
| | * fix for bug #17619 Scheduler race conditionsandrey@lmy004.2006-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Scheduler is either initialized at server start or never. Starting & stopping is now suspending & resuming. - The scheduler has clear OO interface - Now all calls to the scheduler are synchronous - GLOBAL event_scheduler uses thd::sys_var_tmp (see set_var.cc) - External API is encapsulated into class Events - Includes fixes for all comments of Kostja's review of 19.05.2005 Starting to merge into 5.1-release (5.1.10) and push
* | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-newrburnett@bk-internal.mysql.com2006-05-221-5/+5
|\ \ \ | |/ / | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
| * | Makefile.am:kent@mysql.com2006-05-201-5/+5
| | | | | | | | | | | | | | | Specify yaSSL .a file, not .la (bug#19966) Don't use Mac OS X "__.SYMDEF SORTED" file in archives
* | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-newrburnett@bk-internal.mysql.com2006-05-171-1/+1
|\ \ \ | |/ / |/| | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
| * | patch to get archive test working on Windows.reggie@big_geek.2006-05-151-1/+1
| | |
* | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newtomas@poseidon.ndb.mysql.com2006-05-151-4/+7
|\ \ \ | |/ / |/| / | |/ into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
| * libmysqld/Makefile.am : Another undetected typo ...joerg@mysql.com2006-05-091-1/+1
| |
| * libmysqld/Makefile.am : Silly typo: Lacking a trailing semicolon after ↵joerg@mysql.com2006-05-091-1/+1
| | | | | | | | shell "if".
| * libmysqld/Makefile.am : Workaround against the empty variable ↵joerg@mysql.com2006-05-081-4/+7
| | | | | | | | | | | | "$sqlstoragesources", shell "for" loops without values to loop over cause syntax errors.
* | performing a set of bk mv on each CMakeLists.txt file to try and restore the ↵reggie@big_geek.2006-05-112-0/+0
|/ | | | | | mixed case filenames since this seems to be required with Cmake 2.4 beta 1. This is being pushed to a private tree and tested before being sent to the mainline.
* Merge xiphis.org:/home/antony/work2/wl3201.3acurtis@xiphis.org2006-04-241-15/+9
|\ | | | | | | into xiphis.org:/home/antony/work2/wl3201.merge
| * WL#3201acurtis@xiphis.org2006-04-131-15/+9
| | | | | | | | " Configure support for server plugins "
* | Fix compilation failure when compiling with BUILD/compile-pentium-debug-maxmonty@mysql.com2006-04-191-2/+5
| | | | | | | | | | | | (Problem with embedded server and ndb) Fix broken mysql-test-run.sh Removed memory leak in ha_example.cc
* | Auto mergedserg@serg.mylan2006-04-121-2/+8
|\ \
| * | fixes for 'make dist' and 'make distcheck'serg@serg.mylan2006-04-121-2/+8
| | |
* | | Add 'mysql_get_ssl_cipher' list of functions to export from libmysqldmsvensson@neptunus.(none)2006-04-111-0/+1
| |/ |/|
* | Merge 192.168.0.10:mysql/mysql-5.1msvensson@shellback.2006-04-111-2/+0
|\ \ | | | | | | | | | into shellback.:C:/mysql/my51-bug17368
| * | Remove unused variables and labelmsvensson@shellback.2006-04-101-2/+0
| |/
* | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-newkent@mysql.com2006-04-111-1/+1
|\ \ | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
| * \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03kent@mysql.com2006-04-081-1/+1
| |\ \ | | |/ | |/| | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
| | * Makefile.am:kent@mysql.com2006-03-251-1/+1
| | | | | | | | | | | | Strip ending ".libs/" in search path for objects
* | | fix cmake generation errorreggie@big_geek.2006-04-101-2/+8
|/ /
* | Makefile.am:kent@mysql.com2006-04-051-1/+5
| | | | | | | | After merge correction
* | Missing file in last commit.knielsen@mysql.com2006-04-031-0/+11
| |
* | Add embedded server build to the CMake build files.knielsen@mysql.com2006-04-033-1/+88
| |
* | Some changes to make it possible to build for Windows with CMake fromknielsen@mysql.com2006-03-241-0/+1
|/ | | | a normal 'make dist' source .tar.gz.
* mergedserg@serg.mylan2006-03-061-32/+22
|\
| * 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)
* | BUG #15408 - Partitions: subpartition names are not uniquereggie@linux.site2006-02-211-1/+1
| |
* | BUG# 15408 Partitions: subpartition names are not uniquereggie@linux.site2006-02-161-1/+1
| | | | | | | | THis patch goes along with 1.2098.23.1 to form the complete patch
* | gcc295 fixes for embeddedserg@serg.mylan2006-01-261-0/+3
| |
* | Fixes about the embedded-server in 5.1holyfoot@deer.(none)2006-01-231-0/+6
| |
* | Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.embholyfoot@mysql.com2006-01-194-215/+462
|\ \
| * | Big patch to make embedded-server working in 5.xholyfoot@deer.(none)2006-01-044-215/+462
| | | | | | | | | | | | | | | Now it supports queries returning several results (particularly important with the SP)
* | | Merge BUG#15110 from 5.0 into 5.1.anozdrin@mysql.com2006-01-131-1/+1
|\ \ \ | | |/ | |/| | | | | | | Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110 into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
| * | 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.
* | | wl2325 wl2324tomas@poseidon.ndb.mysql.com2006-01-121-1/+6
| | |
* | | delete the stale file and this should fix the buildandrey@lmy004.2006-01-121-210/+0
| | | | | | | | | | | | after my push of WL#1034 (Internal CRON) into 5.1
* | | manual mergeandrey@lmy004.2006-01-111-2/+4
|\ \ \
| * | | wl2723 - ndb opt. nrjonas@perch.ndb.mysql.com2006-01-111-1/+2
| | |/ | |/|
* | | WL #1034 (Internal CRON)andrey@lmy004.2006-01-102-3/+212
|\ \ \ | |/ / |/| | | | | merge before push
| * | WL#1034 updateandrey@lmy004.2005-12-151-1/+1
| | | | | | | | | | | | make compile-pentium-debug-max work
| * | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl1034andrey@lmy004.2005-12-142-2/+212
| |\ \ | | | | | | | | | | | | into lmy004.:/work/mysql-5.1-tt-copy-works
| | * | add these, forgotten in the previous commitandrey@lmy004.2005-12-021-0/+210
| | | |
| | * | WL1034 update for latest 5.1 sourcesandrey@lmy004.2005-12-021-2/+2
| | | |
* | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newbrian@zim.(none)2005-12-221-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | into zim.(none):/home/brian/mysql/archive-5.1