Alexander Nozdrin
4ed388a5b4
Merge from mysql-5.1.
2009-10-19 17:19:37 +04:00
Alexander Nozdrin
f3457a73d6
Merge from mysql-5.1.
2009-10-19 17:17:08 +04:00
Guilhem Bichot
b1f6a8e72f
Back-port from 6.0 of the fix for
...
BUG#38049 "incorrect rows estimations with references from preceding table"
(from revid:sergefp@mysql.com-20090126194259-ue20il3qro529l4d).
Compared to 6.0 where EXPLAIN indicates "Using index condition", here in join_optimizer.result
we see "Using where"; it's normal; 6.0 shows the same if disabling Index Condition Pushdown.
2009-10-19 15:14:43 +02:00
Bjorn Munch
542ffe5e87
merge 48130 and 48133 from 5.1
2009-10-19 15:14:26 +02:00
Sergei Golubchik
ed8aaec764
Bug#34374 mysql generates incorrect warning
...
backport to next-mr
2009-10-19 15:13:45 +02:00
Bjorn Munch
3e43817fca
merge 48130 and 48133 from 5.1
2009-10-19 15:12:16 +02:00
Alexander Nozdrin
af9de4ff6b
Null-merge up to revno:3163 from mysql-5.1 (InnoDB changes).
2009-10-19 17:10:22 +04:00
Sergei Golubchik
6fecc5b726
bug#34741 prepared show master logs without binlogging debug assert
...
s/return/DBUG_RETURN/
2009-10-19 15:04:27 +02:00
Evgeny Potemkin
eb8875d906
Auto-merged fix for the bug#30302.
2009-10-19 15:42:59 +04:00
Evgeny Potemkin
14994d2148
Bug#30302: Tables that were optimized away are printed in the
...
EXPLAIN EXTENDED warning.
Query optimizer searches for the constant tables and optimizes them away. This
means that fields of such tables are substituted for their values and on later
phases they are treated as constants. After this constant tables are removed
from the query execution plan. Nevertheless constant tables were shown in
the EXPLAIN EXTENDED warning thus producing query that might be not an
equivalent of the original query.
Now the print_join function skips all tables that were optimized away from
printing to the EXPLAIN EXTENDED warning. If all tables were optimized away it
produces the 'FROM dual' clause.
2009-10-19 15:13:26 +04:00
Alexander Barkov
1b26332898
Bug#46633 Obsolete Serbian locale name
...
- Renaming sr_YU to sr_RS
- Adding test case
2009-10-19 12:52:29 +05:00
He Zhenxing
f71b836e50
Postfix of bug#45674
...
rpl_semi_sync_master_wait_sessions was reset by FLUSH STATUS,
which could cause the master fail to wake up waiting sessions and
result in master timeout waiting for slave reply.
rpl_semi_sync_master_wait_session should not be reset, this
problem is fixed by this patch.
2009-10-18 20:29:03 +08:00
Bjorn Munch
6c68019899
Bug #48133 MTR should not dump entire history of mysqld log when failing to start server
...
Don't print entire log, but use extract_server_log() introduced by 46007
2009-10-18 13:01:46 +02:00
Bjorn Munch
423dacf3c6
merge from next-mr
2009-10-18 10:08:07 +02:00
Bjorn Munch
2bbe4cc882
merge from trunk
2009-10-18 09:54:50 +02:00
Bjorn Munch
264c330fd0
Bug #48130 Expected failures should not count towards max-test-fail
...
Test batches may be terminated too early
Avoid counting exp-fail tests
2009-10-17 18:34:56 +02:00
Bjorn Munch
6c9cb9ba22
merge from 5.1 main
2009-10-16 23:25:05 +02:00
Timothy Smith
813d8ff6dc
Merge from mysql-5.4.3-beta-release
2009-10-16 20:19:36 +02:00
Timothy Smith
6d569306b4
Update _libdir/plugin to _libdir/mysql/plugin in a few places
2009-10-16 19:59:23 +02:00
Timothy Smith
e1c54dd9ad
Work around a problem in IBM compiler (on aix / i5os) that doesn't
...
use function prototypes from header in conjunction with K&R-style
function definitions. The symptom is a type mismatch between
int and wchar_t.
2009-10-16 19:53:10 +02:00
Joerg Bruehe
ee56b111a0
Upmerge merge changesets.
2009-10-16 16:12:42 +02:00
Joerg Bruehe
9cabf98cb0
Merge a compile fix.
2009-10-16 15:35:39 +02:00
Joerg Bruehe
5c95f2363a
Upmerge the Windows compile fix from 5.0 to 5.1
2009-10-16 15:05:52 +02:00
Joerg Bruehe
f359b258ee
Merge 5.0-bugteam (compile fix) into main 5.0
2009-10-16 14:29:41 +02:00
Joerg Bruehe
11d4eb352d
Merge the Windows compile fix into the push tree.
2009-10-16 14:09:31 +02:00
Joerg Bruehe
9ceeabd9b2
Compile fix for Windows:
...
Use "#ifdef", not plain "#if".
2009-10-16 14:06:33 +02:00
Satya B
a0e12ec269
Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163
...
also merged missing Innodb plugin revisions r5636,r5635 manually
2009-10-16 17:28:02 +05:30
Joerg Bruehe
9c76415a03
Upmerge a merge changeset - no contents change.
2009-10-16 11:33:39 +02:00
Bjorn Munch
d30c25ce14
merge 46007 from 5.1->trunk
2009-10-16 11:15:35 +02:00
Georgi Kodinov
757e641dea
merge
2009-10-16 12:07:50 +03:00
Bjorn Munch
b21c62bedd
merge 46007 from 5.1
2009-10-16 11:02:37 +02:00
Alexander Barkov
ac2a0348a2
A postfix for WL#751
2009-10-16 13:47:34 +05:00
Georgi Kodinov
6b81bff83c
Revert the fix for bug #47123 until test suite failures are resolved.
2009-10-16 11:42:16 +03:00
Joerg Bruehe
d12bd3f794
Merge the bug fixes into the push tree.
2009-10-15 20:28:04 +02:00
Joerg Bruehe
1cd95b6a44
Merge bug fix into push tree.
2009-10-15 20:14:07 +02:00
Alexander Nozdrin
42ea72dbfe
Merge from mysql-5.1.
2009-10-15 17:11:13 +04:00
Sergey Glukhov
7741d9b50d
WL#751 Error message construction, backport
2009-10-15 17:23:43 +05:00
Georgi Kodinov
f79064c4d4
version change
2009-10-15 14:48:12 +03:00
Georgi Kodinov
a3586e2280
merge
2009-10-15 14:45:54 +03:00
Georgi Kodinov
ff5833d346
All NDB tests made experimental after a discussion with Bernhard Ocklin.
2009-10-15 14:22:25 +03:00
Georgi Kodinov
77fd19b5ec
Marked all the NDB related tests experimental as agreed with Bernard Ocklin.
2009-10-15 14:02:29 +03:00
Alexey Kopytov
f98d11ee24
Manual merge.
2009-10-15 14:42:51 +04:00
Alexander Barkov
f8a54c72ff
Backporting WL#4164 Two-byte collation IDs
2009-10-15 15:17:32 +05:00
Sergey Vojtovich
cd69e34ca7
Disabled part of test for BUG#47073 until additional fix is pushed.
2009-10-15 12:31:11 +05:00
Vladislav Vaintroub
68c55462ef
Bug #48047 Can't do normal shutdown
...
Fix a regression that crept in when downporting Windows improvements.
Instead of a shutdown thread, another thread that handledsocket connection was created.
2009-10-15 05:18:52 +02:00
Jorgen Loland
aea42df6f5
merge
2009-10-14 18:24:29 +02:00
Jorgen Loland
a91b18262c
Followup patch for BUG#47280
...
Temporary tables may set join->group to 0 even though there is
grouping. Also need to test if sum_func_count>0 when JOIN::exec()
decides whether to present results in a grouped manner.
2009-10-14 18:20:01 +02:00
Georgi Kodinov
a820c73229
merge
2009-10-14 18:46:45 +03:00
Georgi Kodinov
88aa7af8c8
merge
2009-10-14 18:45:09 +03:00
Georgi Kodinov
8fc8d661a1
version change
2009-10-14 18:44:22 +03:00
