1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Commit Graph

15 Commits

Author SHA1 Message Date
Bjorn Munch
38e811b839 merge from 5.1-mtr 2010-02-22 14:52:11 +01:00
Staale Smedseng
c1a6dc5084 Bug #47905 stored procedures with conditional statements not
being logged to slow query log

The problem is that the execution time for a multi-statement
stored procedure as a whole may not be accurate, and thus not
be entered into the slow query log even if the total time
exceeds long_query_time. The reason for this is that
THD::utime_after_lock used for time calculation may be reset
at the start of each new statement, possibly leaving the total
SP execution equal to the time spent executing the last
statement in the SP.

This patch stores the utime on start of SP execution, and
restores it on exit of SP execution. A test is added.
2010-02-11 21:10:13 +01:00
Bjorn Munch
9ab9c73a87 Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'
Undid amendment allowing pending reap after switching connections
Moved check for pending reap earlier; failed if running with ps-protocol
2010-01-07 11:22:45 +01:00
Gleb Shchepa
387a54fbbd Bug #42778: delete order by null global variable causes
assertion .\filesort.cc, line 797

A query with the "ORDER BY @@some_system_variable" clause,
where @@some_system_variable is NULL, causes assertion
failure in the filesort procedures.

The reason of the failure is in the value of
Item_func_get_system_var::maybe_null: it was unconditionally
set to false even if the value of a variable was NULL.
2009-05-22 01:22:46 +05:00
Horst Hunger
fcf6712e21 Merge to be able to push. 2009-03-24 11:48:38 +01:00
Horst Hunger
004662b194 Reviewed fix for bug#37962 also including the revised result files for failing system variable tests. 2009-03-20 18:11:22 +01:00
Horst Hunger
07ce37f6b4 Reviewed patch for Bug#39862. 2009-03-19 12:21:38 +01:00
Patrick Crews
64c32d5a09 Bug#40178: Test main.completion_type_func does not clean up / needs to be rewritten
Revised the test to include a test of completion_type = 1 as well as making the test more readable / worthwhile
Removed the master.opt file as it was redundant / unnecessary.
2009-02-24 16:20:00 +02:00
Horst Hunger
690dc721b8 Fix for bug#39382 including review results after pulling the bugteam tree now using the new mtr. 2009-01-30 17:59:10 +01:00
Georgi Kodinov
3aec7ca415 merged 5.1-main -> 5.1-bugteam 2009-01-30 15:44:49 +02:00
Luis Soares
16a6158c47 merge: 5.1 -> 5.1-rpl-merge
conflicts:
  Text conflict in mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
  Text conflict in mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test
2009-01-29 17:59:46 +01:00
Horst Hunger
37f9da15ac Changes to WL#4681 to merge to 5.1-main tree. 2009-01-22 11:14:16 +01:00
Horst Hunger
82c4b6e679 WL#4681: Took the system variable tests out of the main test suite, put them into "sys_vars", updated some reult files and tests. 2008-12-19 16:03:32 +01:00
Horst Hunger
3677288f6f Fix for Bug#36878 after review by Matthias: Only one line in the result files of 32 bit and 64 bit platforms differed and made problems on 64 bit machine with 32 bit mysqld. The removal of the separation into 32 bit and 64 bit versions of that test fixes also this problem. 2008-12-05 16:43:13 +01:00
Horst Hunger
c199b9d51d Final fix for bug#36522 in 5.1. This new fix was necessary due to fix of bug 37708. 2008-07-23 16:06:44 +02:00