summaryrefslogtreecommitdiff
path: root/sql/sql_connect.h
Commit message (Collapse)AuthorAgeFilesLines
* mysql-5.5.18 mergeSergei Golubchik2011-11-031-1/+1
|\
| * Updated/added copyright headersKent Boortz2011-06-301-1/+1
| |
* | merge with 5.3Sergei Golubchik2011-10-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
* | post-merge fixes.Sergei Golubchik2011-07-021-0/+2
| | | | | | | | | | most tests pass. 5.3 merge is next
* | 5.5-mergeSergei Golubchik2011-07-021-2/+4
|\ \ | |/
| * mergeMikael Ronstrom2011-03-041-1/+1
| |\
| | * Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, ↵Alexander Barkov2011-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they crash server Problem: ucs2 was correctly disallowed in "SET NAMES" only, while mysql_real_connect() and mysql_change_user() still allowed to use ucs2, which made server crash. Fix: disallow ucs2 in mysql_real_connect() and mysql_change_user(). @ sql/set_var.cc Using new function. @ sql/sql_acl.cc - Return error if character set initialization failed - Getting rid of pointer aliasing: Initialize user_name to NULL, to avoid double free(). @ sql/sql_connect.cc - in case of unsupported client character set send error and return true - in case of success return false @ sql/sql_connect.h - changing return type for thd_init_client_charset() to bool, to return errors to the caller @ sql/sql_parse.h - introducing a new function, to reuse in all places where we need to check client character set. @ tests/mysql_client_test.c Adding test
| * | Simplify interface to connect methods in serverMikael Ronström2011-02-101-0/+2
| |/
| * merge of mysql-5.5 into mysql-5.5-wl1054Georgi Kodinov2010-09-201-0/+3
| |\
| * | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-0/+4
| | | | | | | | | | | | | | | Merged the implementation to a new base tree.
* | | lots of post-merge changesSergei Golubchik2011-04-251-0/+8
| | |
* | | merge.Sergei Golubchik2010-11-251-4/+14
| |/ |/| | | | | | | | | checkpoint. does not compile.
* | WL#5363: Thread Pool Service InterfaceMats Kindahl2010-06-071-0/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to allow thread schedulers to be dynamically loaded, it is necessary to make the following changes to the server: - Two new service interfaces - Modifications to InnoDB to inform the thread scheduler of state changes. - Changes to the VIO subsystem for checking if data is available on a socket. - Elimination of remains of the old thread pool implementation. The two new service interfaces introduces are: my_thread_scheduler A service interface to register a thread scheduler. thd_wait A service interface to inform thread scheduler that the thread is about to start waiting. In addition, the patch adds code that: - Add a call to thd_wait for table locks in mysys thd_lock.c by introducing a set function that can be used to set a callback to be used when waiting on a lock and resuming from waiting. - Calling the mysys set function from the server to set the callbacks correctly.
* WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-0/+43
This patch: - Moves all definitions from the mysql_priv.h file into header files for the component where the variable is defined - Creates header files if the component lacks one - Eliminates all include directives from mysql_priv.h - Eliminates all circular include cycles - Rename time.cc to sql_time.cc - Rename mysql_priv.h to sql_priv.h