summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Collapse)AuthorAgeFilesLines
* Bug#25621 Error in my_thread_global_end(): 1 threads didn't exitiggy@recycle.(none)2007-04-231-1/+2
| | | | | - On Windows, connection handlers while exiting properly did not decrement the server's thread count.
* Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145j.mysql.com2007-03-311-2/+2
|\ | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
| * Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145h.mysql.com2007-03-291-2/+2
| |\ | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
| | * - renaming TMP_TABLE to NON_TRANSACTIONAL_TMP_TABLE because this isguilhem@gbichot3.local2007-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | what it actually means (Monty approved the renaming) - correcting description of transaction_alloc command-line options (our manual is correct) - fix for a failure of rpl_trigger.
* | | Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1serg@sergbook.mysql.com2007-03-241-2/+4
|\ \ \ | | | | | | | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
| * | | nptl: typo fixed. sigaddset restoredserg@sergbook.mysql.com2007-03-241-2/+4
| | | |
* | | | Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1serg@sergbook.mysql.com2007-03-231-15/+8
|\ \ \ \ | |/ / / | | | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
| * | | reverted linuxthreads thr_client_alarm fix (not future-proof)serg@sergbook.mysql.com2007-03-231-15/+8
| | | | | | | | | | | | | | | | fixed differently: wake up select_thread with THR_SERVER_ALARM instead
* | | | Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1serg@sergbook.mysql.com2007-03-231-7/+11
|\ \ \ \ | |/ / / | | / / | |/ / |/| | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1serg@sergbook.mysql.com2007-03-231-7/+11
| |\ \ | | | | | | | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
| | * | move thr_client_alarm initialization to mysqld.ccserg@sergbook.mysql.com2007-03-231-3/+11
| | | | | | | | | | | | | | | | (in thr_alarm.cc it happened too late).
| * | | Fix for bug #25966 "2MB per second endless memory consumption after LOCKdlenev@mockturtle.local2007-03-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TABLE ... WRITE". CPU hogging occured when connection which had to wait for table lock was serviced by thread which previously serviced connection that was killed (note that connections can reuse threads if thread cache is enabled). One possible scenario which exposed this problem was when thread which provided binlog dump to replication slave was implicitly/automatically killed when the same slave reconnected and started pulling data through different thread/connection. In 5.* versions memory hogging was added to CPU hogging. Moreover in those versions the problem also occured when one killed particular query in connection (using KILL QUERY) and later this connection had to wait for some table lock. This problem was caused by the fact that thread-specific mysys_var::abort variable, which indicates that waiting operations on mysys layer should be aborted (this includes waiting for table locks), was set by kill operation but was never reset back. So this value was "inherited" by the following statements or even other connections (which reused the same physical thread). Such discrepancy between this variable and THD::killed flag broke logic on SQL-layer and caused CPU and memory hogging. This patch tries to fix this problem by properly resetting this member. There is no test-case associated with this patch since it is hard to test for memory/CPU hogging conditions in our test-suite.
* | | | Fix for bug #25966 "2MB per second endless memory consumption after LOCKdlenev@mockturtle.local2007-03-151-0/+6
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TABLE ... WRITE". Memory and CPU hogging occured when connection which had to wait for table lock was serviced by thread which previously serviced connection that was killed (note that connections can reuse threads if thread cache is enabled). One possible scenario which exposed this problem was when thread which provided binlog dump to replication slave was implicitly/automatically killed when the same slave reconnected and started pulling data through different thread/connection. The problem also occured when one killed particular query in connection (using KILL QUERY) and later this connection had to wait for some table lock. This problem was caused by the fact that thread-specific mysys_var::abort variable, which indicates that waiting operations on mysys layer should be aborted (this includes waiting for table locks), was set by kill operation but was never reset back. So this value was "inherited" by the following statements or even other connections (which reused the same physical thread). Such discrepancy between this variable and THD::killed flag broke logic on SQL-layer and caused CPU and memory hogging. This patch tries to fix this problem by properly resetting this member. There is no test-case associated with this patch since it is hard to test for memory/CPU hogging conditions in our test-suite.
* | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-081-12/+8
|\ \ \ | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50tsmith@quadxeon.mysql.com2007-03-071-12/+0
| |\ \ \ | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50
| | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimekostja@bodhi.local2007-03-071-12/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-5.0-26750
| | | * | | A fix for Bug#26750 "valgrind leak in sp_head" (and post-reviewkostja@bodhi.local2007-03-071-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes). The legend: on a replication slave, in case a trigger creation was filtered out because of application of replicate-do-table/ replicate-ignore-table rule, the parsed definition of a trigger was not cleaned up properly. LEX::sphead member was left around and leaked memory. Until the actual implementation of support of replicate-ignore-table rules for triggers by the patch for Bug 24478 it was never the case that "case SQLCOM_CREATE_TRIGGER" was not executed once a trigger was parsed, so the deletion of lex->sphead there worked and the memory did not leak. The fix: The real cause of the bug is that there is no 1 or 2 places where we can clean up the main LEX after parse. And the reason we can not have just one or two places where we clean up the LEX is asymmetric behaviour of MYSQLparse in case of success or error. One of the root causes of this behaviour is the code in Item::Item() constructor. There, a newly created item adds itself to THD::free_list - a single-linked list of Items used in a statement. Yuck. This code is unaware that we may have more than one statement active at a time, and always assumes that the free_list of the current statement is located in THD::free_list. One day we need to be able to explicitly allocate an item in a given Query_arena. Thus, when parsing a definition of a stored procedure, like CREATE PROCEDURE p1() BEGIN SELECT a FROM t1; SELECT b FROM t1; END; we actually need to reset THD::mem_root, THD::free_list and THD::lex to parse the nested procedure statement (SELECT *). The actual reset and restore is implemented in semantic actions attached to sp_proc_stmt grammar rule. The problem is that in case of a parsing error inside a nested statement Bison generated parser would abort immediately, without executing the restore part of the semantic action. This would leave THD in an in-the-middle-of-parsing state. This is why we couldn't have had a single place where we clean up the LEX after MYSQLparse - in case of an error we needed to do a clean up immediately, in case of success a clean up could have been delayed. This left the door open for a memory leak. One of the following possibilities were considered when working on a fix: - patch the replication logic to do the clean up. Rejected as breaks module borders, replication code should not need to know the gory details of clean up procedure after CREATE TRIGGER. - wrap MYSQLparse with a function that would do a clean up. Rejected as ideally we should fix the problem when it happens, not adjust for it outside of the problematic code. - make sure MYSQLparse cleans up after itself by invoking the clean up functionality in the appropriate places before return. Implemented in this patch. - use %destructor rule for sp_proc_stmt to restore THD - cleaner than the prevoius approach, but rejected because needs a careful analysis of the side effects, and this patch is for 5.0, and long term we need to use the next alternative anyway - make sure that sp_proc_stmt doesn't juggle with THD - this is a large work that will affect many modules. Cleanup: move main_lex and main_mem_root from Statement to its only two descendants Prepared_statement and THD. This ensures that when a Statement instance was created for purposes of statement backup, we do not involve LEX constructor/destructor, which is fairly expensive. In order to track that the transformation produces equivalent functionality please check the respective constructors and destructors of Statement, Prepared_statement and THD - these members were used only there. This cleanup is unrelated to the patch.
| * | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimetsmith@quadxeon.mysql.com2007-03-071-0/+8
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50
| | * | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2007-03-061-0/+8
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.0-8407_b
| | | * | | Bug#8407 (Stored functions/triggers ignore exception handler)malff/marcsql@weblab.(none)2007-03-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 18914 (Calling certain SPs from triggers fail) Bug 20713 (Functions will not not continue for SQLSTATE VALUE '42S02') Bug 21825 (Incorrect message error deleting records in a table with a trigger for inserting) Bug 22580 (DROP TABLE in nested stored procedure causes strange dependency error) Bug 25345 (Cursors from Functions) This fix resolves a long standing issue originally reported with bug 8407, which affect the behavior of Stored Procedures, Stored Functions and Trigger in many different ways, causing symptoms reported by all the bugs listed. In all cases, the root cause of the problem traces back to 8407 and how the server locks tables involved with sub statements. Prior to this fix, the implementation of stored routines would: - compute the transitive closure of all the tables referenced by a top level statement - open and lock all the tables involved - execute the top level statement "transitive closure of tables" means collecting: - all the tables, - all the stored functions, - all the views, - all the table triggers - all the stored procedures involved, and recursively inspect these objects definition to find more references to more objects, until the list of every object referenced does not grow any more. This mechanism is known as "pre-locking" tables before execution. The motivation for locking all the tables (possibly) used at once is to prevent dead locks. One problem with this approach is that, if the execution path the code really takes during runtime does not use a given table, and if the table is missing, the server would not execute the statement. This in particular has a major impact on triggers, since a missing table referenced by an update/delete trigger would prevent an insert trigger to run. Another problem is that stored routines might define SQL exception handlers to deal with missing tables, but the server implementation would never give user code a chance to execute this logic, since the routine is never executed when a missing table cause the pre-locking code to fail. With this fix, the internal implementation of the pre-locking code has been relaxed of some constraints, so that failure to open a table does not necessarily prevent execution of a stored routine. In particular, the pre-locking mechanism is now behaving as follows: 1) the first step, to compute the transitive closure of all the tables possibly referenced by a statement, is unchanged. 2) the next step, which is to open all the tables involved, only attempts to open the tables added by the pre-locking code, but silently fails without reporting any error or invoking any exception handler is the table is not present. This is achieved by trapping internal errors with Prelock_error_handler 3) the locking step only locks tables that were successfully opened. 4) when executing sub statements, the list of tables used by each statements is evaluated as before. The tables needed by the sub statement are expected to be already opened and locked. Statement referencing tables that were not opened in step 2) will fail to find the table in the open list, and only at this point will execution of the user code fail. 5) when a runtime exception is raised at 4), the instruction continuation destination (the next instruction to execute in case of SQL continue handlers) is evaluated. This is achieved with sp_instr::exec_open_and_lock_tables() 6) if a user exception handler is present in the stored routine, that handler is invoked as usual, so that ER_NO_SUCH_TABLE exceptions can be trapped by stored routines. If no handler exists, then the runtime execution will fail as expected. With all these changes, a side effect is that view security is impacted, in two different ways. First, a view defined as "select stored_function()", where the stored function references a table that may not exist, is considered valid. The rationale is that, because the stored function might trap exceptions during execution and still return a valid result, there is no way to decide when the view is created if a missing table really cause the view to be invalid. Secondly, testing for existence of tables is now done later during execution. View security, which consist of trapping errors and return a generic ER_VIEW_INVALID (to prevent disclosing information) was only implemented at very specific phases covering *opening* tables, but not covering the runtime execution. Because of this existing limitation, errors that were previously trapped and converted into ER_VIEW_INVALID are not trapped, causing table names to be reported to the user. This change is exposing an existing problem, which is independent and will be resolved separately.
* | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781msvensson@pilot.blaudden2007-03-051-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * | | | | Add "have_ssl" as synonym for "have_openssl"msvensson@pilot.blaudden2007-03-051-5/+5
| | | | | |
* | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0msvensson@pilot.blaudden2007-03-011-39/+94
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * | | | Fixes of compilation warnings and errors.rafal@quant.(none)2007-03-011-1/+1
| | | | |
| * | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145j.mysql.com2007-02-251-1/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
| | * \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145h.mysql.com2007-02-241-1/+26
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
| | | * | | | Backport from the Falcon tree.guilhem@gbichot3.local2007-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When opening/creating the transaction coordinator's log, if binlog is used, the tc log is the binlog so we use the binlog's name; otherwise we use the mmap-based log, named after the mandatory argument of the --log-tc option (meant for that).
| | | * | | | Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rplcbell/Chuck@mysql_cab_desk.2007-01-181-0/+25
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_21490
| | | | * | | | BUG#21490 - No warning issued for deprecated replication parameterscbell/Chuck@mysql_cab_desk.2007-01-181-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch deprecates the replication startup options in the configuration file and on the command line. The options deprecated include: MASTER_HOST, MASTER_USER, MASTER_PASSWORD, MASTER_PORT, MASTER_CONNECT_RETRY, MASTER_SSL, MASTER_SSL_CA, MASTER_SSL_CAPATH, MASTER_SSL_CERT, MASTER_SSL_KEY, and MASTER_SSL_CIPHER The code is designed to print the warning message once.
| * | | | | | | Fixed compiler warnings (for linux and win32 and win64)monty@mysql.com/narttu.mysql.fi2007-02-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a couple of usage of not initialized warnings (unlikely cases)
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-211-36/+66
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | * | | | | | Avoid compiler warnings on powermacg5monty@mysql.com/narttu.mysql.fi2007-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compilation error when trying to compile libmysqld on powermac
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-35/+65
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-35/+65
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | | | * | | | | | Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-35/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed not used variables and functions - Added #ifdef around code that is not used - Renamed variables and functions to avoid conflicts - Removed some not used arguments Fixed some class/struct warnings in ndb Added define IS_LONGDATA() to simplify code in libmysql.c I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
* | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166msvensson@pilot.blaudden2007-02-281-1/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * \ \ \ \ \ \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintmsvensson@pilot.blaudden2007-02-281-1/+10
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| | * | | | | | | | | Bug#24878 mysql server doesn't log incident time in "mysqld got signal 11" ↵msvensson@pilot.blaudden2007-02-281-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error messages - Add printout of current time when mysqld is killed by an unhandled signal
| | * | | | | | | | | Merge 192.168.0.10:mysql/mysql-4.1-maintmsvensson@pilot.mysql.com2007-02-061-8/+3
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
| | | * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintcmiller@zippy.cornsilk.net2007-01-311-8/+3
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
| | | | * \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-01-311-0/+1
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b19690/b19690.4.1
* | | | | \ \ \ \ \ \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166msvensson@pilot.blaudden2007-02-271-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * | | | | | | | | | | | | Bug#20166 mysql-test-run.pl does not test system privilege tables creationmsvensson@pilot.blaudden2007-02-201-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Part 2, add @@hostname system variable
* | | | | | | | | | | | | | Merge polly.local:/tmp/maint/bug25137/my50-bug25137kaa@polly.local2007-02-201-4/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into polly.local:/home/kaa/src/maint/mysql-5.0-maint
| * | | | | | | | | | | | | Bug#18743: Several test cases fails if "classic" configuration in 5.0kaa@polly.local2007-02-191-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem happened because those tests were using "cp932" and "ucs2" without checking whether these character sets are available. This fix moves test parts to make character set specific parts be tested only if they are: - some parts were moved to "ctype_ucs.test" and "ctype_cp932.test" - some parts were moved to the newly added tests "innodb-ucs2.test", "mysqlbinglog-cp932.test" and "sp-ucs2.test"
* | | | | | | | | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628msvensson@pilot.mysql.com2007-02-141-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
| * | | | | | | | | | | | | Bug#18628 mysql-test-run: security problem(part1)msvensson@pilot.mysql.com2007-02-141-1/+19
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Implement --secure-file-priv=<dir> option that limits "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work with files in specified dir. - Use above option for mysqld in mysql-test-run.pl
* | | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2007-02-061-15/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-axmrgistruewing@chilla.local2007-02-021-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.0-axmrg
| | * | | | | | | | | | | | After merge fixistruewing@chilla.local2007-02-021-0/+4
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |