Alexander Nozdrin
c06a305001
Backporting revision from mysql-6.0-codebase-bugfixing.
...
Original revision:
------------------------------------------------------------
revno: 3789.1.9
revision-id: serg@mysql.com-20091229134448-phe834ukzmi0k2e3
parent: serg@mysql.com-20091227081418-bgfg952gzumn1k3h
committer: Sergei Golubchik <serg@mysql.com>
branch nick: 6.0-codebase
timestamp: Tue 2009-12-29 14:44:48 +0100
message:
better fix for Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds
use setenv instead of putenv
------------------------------------------------------------
2010-01-11 19:42:35 +03:00
Alexander Nozdrin
7973ab7c36
Auto-merge from mysql-next-mr.
2010-01-11 16:10:51 +03:00
Marc Alff
a4c3bc618b
WL#2360 Performance schema
...
Part IV: sql instrumentation
2010-01-06 22:42:07 -07:00
Marc Alff
b2b055034c
Merge mysql-next-mr (revno 2955) --> mysql-next-mr-marc
2010-01-06 14:26:03 -07:00
Tor Didriksen
42c5cff706
Follup fix for WL#4738
2010-01-06 16:21:43 +01:00
Guilhem Bichot
7382b84f8b
Merge with latest next-mr-bugfixing
2010-01-06 16:31:11 +01:00
Tor Didriksen
9ffdd1cc92
Bug #50087 Interval arithmetic for Event_queue_element is not portable.
...
Subtraction of two unsigned months yielded a (very large) positive value.
Conversion of this to a signed value was not necessarily well defined.
Solution: do the subtraction on signed values.
2010-01-06 15:00:51 +01:00
Guilhem Bichot
03d10b8cd0
Fix for BUG#50081 "Tests: mysqld--help-notwin fails with --parallel":
...
eliminate 3 more "directory path" variables from the test's output (it was already
the case for other similar ones likes slow-query-log-file).
2010-01-06 11:59:01 +01:00
Guilhem Bichot
716c1bce83
WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"
...
"set engine_condition_pushdown" is deprecated, engine condition pushdown is controlled
by a new "set optimizer_switch=engine_condition_pushdown=on|off".
2010-01-06 11:54:45 +01:00
Guilhem Bichot
284b836cd3
fixing wrong indentation in two Makefile.am, which prevented the Anjuta IDE from parsing the MySQL tree.
2010-01-06 11:27:35 +01:00
Alexander Nozdrin
8214891f0e
Merge from bk:ysql-next-mr-bugfixing.
2010-01-06 13:11:57 +03:00
Alexander Nozdrin
561aea29bc
Merge from mysql-next-mr.
2010-01-06 13:07:02 +03:00
Alexander Nozdrin
e698ae0112
Change version tag (to 5.5.99-m3).
2010-01-06 13:02:42 +03:00
Jorgen Loland
76f135966c
local merge
2010-01-04 10:51:05 +01:00
Jorgen Loland
3dab08f157
Bug#48920: COUNT DISTINCT returns 1 for NULL values when in a
...
subquery in the select list
When a dependent subquery with count(distinct <col>) was
evaluated multiple times, the Distinct_Aggregator was reused.
However, the Aggregator was not reset, so when the subquery was
evaluated for the next record in the outer select, old dependent
info was used.
The fix is to clear() the existing aggregator in
Item_sum::set_aggregator(). This ensures that the aggregator is
reevaluated with the new dependent information.
2010-01-04 10:39:42 +01:00
Alexander Nozdrin
c5151a6e9b
Auto-merge from mysql-next-mr.
2010-01-04 12:39:33 +03:00
Alexander Nozdrin
f37f38006b
Auto-merge from mysql-next-mr-serg.
2010-01-04 12:34:59 +03:00
Sergei Golubchik
4949ee3a75
possible fix for sporadic sys_vars.delayed_insert_limit_func failures
2009-12-31 14:05:33 +01:00
Alexander Nozdrin
8050affe24
Auto-merge from mysql-next-mr.
2009-12-29 13:02:43 +03:00
Alexey Kopytov
85d5a08b51
Manual merge of WL#4738 from mysql-next-mr:
...
- backported code that handles %f/%g arguments in
my_vsnprintf.c from 6.0
- backported %f/%g tests in unittest/mysys/my_vsnprintf-t.c
from 6.0
- replaced snprintf("%g") in sql/set_var.cc with my_gcvt()
- removed unnecessary "--replace-result"s for Windows in
mysql-test/suite/sys_vars/t/long_query_time_basic.test
- some test results adjustments
2009-12-28 15:54:16 +03:00
Sergei Golubchik
31cd0643ae
my_once.c: clarify the comment
2009-12-26 21:55:32 +01:00
Sergei Golubchik
825ba2ec8b
don't show the value of open_files_limit
2009-12-26 09:35:42 +01:00
Sergei Golubchik
28056ba204
don't show --ssl* option if ssl is not compiled in
2009-12-25 22:36:59 +01:00
Alexander Nozdrin
ece5ad57e9
Auto-merge from mysql-next-mr.
2009-12-25 16:22:25 +03:00
0c4e5f784b
Backport Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with --slave-load-tm
...
The 'rpl_cross_version' fails on mysql-next-mr-bugfixing as following:
mysqltest: In included file "./include/setup_fake_relay_log.inc": At line 80: query
'select './$_fake_filename-fake.000001\n' into dumpfile '$_fake_relay_index'' failed:
1290: The MySQL server is running with the --secure-file-priv option so it cannot execute
this statement.
To fix the problem by removeing the --secure-file-priv option
for adapting the update of the 'setup_fake_relay_log.inc'.
2009-12-25 14:12:49 +08:00
Alexey Kopytov
ca409d5756
Automerge.
2009-12-25 00:09:18 +03:00
Alexey Kopytov
064ebe5769
Addendum to the backport patch for WL#2934:
...
Unlike other platforms --mfpmath=sse is the default
gcc mode on Mac OS X Intel. So it is unnecessary
to switch FPU to double precision mode (in fact,
it even breaks some math library functions).
2009-12-25 00:06:53 +03:00
Sergei Golubchik
50f9dc6a1d
merged
2009-12-24 21:18:53 +01:00
Sergei Golubchik
b4a39aeb5d
slightly more complete mysqld--help test
2009-12-24 12:30:23 +01:00
Alexander Nozdrin
fa64b359ab
Auto-merge (empty) from mysql-trunk-bugfixing.
2009-12-24 10:31:09 +03:00
Alexander Nozdrin
27e7547bc6
Auto-merge from mysql-next-mr.
2009-12-24 10:30:13 +03:00
Alexander Nozdrin
2af3baceaf
Auto-merge from mysql-trunk.
2009-12-24 10:30:04 +03:00
Alexander Nozdrin
9f335d9e91
Manual merge from mysql-trunk.
...
Conflicts:
- storage/myisam/mi_static.c
2009-12-24 10:12:07 +03:00
Alexander Nozdrin
9721437edf
Postfix for Bug#37408 (fix for Bug#49898).
2009-12-24 10:10:05 +03:00
ff16e34df7
Enable rpl_get_master_version_and clock and rpl_cross_version
...
as the bug#46931 and bug#43913 have been closed.
2009-12-24 11:01:39 +08:00
Sergei Golubchik
dec9ad1e25
backport typos found
2009-12-23 17:51:03 +01:00
Alexander Nozdrin
88642ae7e6
Merge default.conf from mysql-trunk.
2009-12-23 15:10:25 +03:00
Alexander Nozdrin
97412d1d41
Fix default.conf.
2009-12-23 15:09:31 +03:00
Alexander Nozdrin
919f7968e5
Auto-merge (empty) from mysql-trunk-bugfixing.
2009-12-23 15:06:10 +03:00
Sergei Golubchik
a85539a83a
fixed "engine not found" error in open_binary_frm
...
corrected rotten test
2009-12-23 13:06:03 +01:00
Alexey Kopytov
c15b85f26c
Fixed test failures from the 'parts' suite introduced by
...
backporting WL#2934.
2009-12-23 15:04:32 +03:00
Alexander Nozdrin
84caa9480f
Backporting fix for Bug#49834 from mysql-next-mr-bugfixing
...
into mysql-trunk-bugfixing.
Original revision:
------------------------------------------------------------
revision-id: vvaintroub@mysql.com-20091222115311-bam0xorumd8gvjyo
parent: mattias.jonsson@sun.com-20091221104426-x2e6c93x8iik4fo0
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: mysql-next-mr-bugfixing
timestamp: Tue 2009-12-22 12:53:11 +0100
message:
Bug#49834 - fixed a bug introduced by mismerge.
restore original innobase version
------------------------------------------------------------
2009-12-23 15:03:51 +03:00
Alexander Nozdrin
0f8ea111b9
Auto-merge from mysql-trunk-bugfixing.
2009-12-23 13:43:52 +03:00
Alexander Nozdrin
1b7ced0008
Auto-merge from mysql-next-mr.
2009-12-23 13:42:03 +03:00
Alexander Nozdrin
29f54b416f
Auto-merge from mysql-trunk.
2009-12-23 13:41:55 +03:00
Sergei Golubchik
18d082109c
fix atomic/solaris.h to conform
...
remove duplicated boilerplate code
2009-12-23 09:27:41 +01:00
Alexey Kopytov
79c8b38a2b
Fixed more PB2 test failures introduced by backporting WL#2934.
2009-12-23 08:52:18 +03:00
Vladislav Vaintroub
fd14e3dd1e
merge
2009-12-22 22:05:04 +01:00
Alexey Kopytov
0372181e3b
Fixed more PB2 test failures introduced by backporting WL#2934.
2009-12-22 23:55:56 +03:00
Vladislav Vaintroub
2c4015fba5
Fix build error with CMake 2.8 (mysql_stmt_next_result not exported
...
by shared embedded library)
2009-12-22 21:49:37 +01:00
