Georgi Kodinov
f6d66bd6f1
merge of 5.1-main to 5.1-bugteam
2008-07-25 18:06:47 +03:00
Davi Arnaut
ca4698274f
Null merge of mysql-5.0-bugteam into mysql-5.1-bugteam.
2008-07-25 12:12:47 -03:00
Georgi Kodinov
b467c15e36
Disabled 5.1 tests (and reported bugs)
2008-07-25 13:32:05 +03:00
Kristofer Pettersson
874a38c6b7
auto merged
2008-07-24 22:50:47 +02:00
Kristofer Pettersson
5c1f8d1836
Bug#38002 table_cache consumes too much memory with blobs
...
Tables in the table definition cache are keeping a cache buffer for blob
fields which can consume a lot of memory.
This patch introduces a maximum size threshold for these buffers.
2008-07-24 22:38:44 +02:00
Chad MILLER
27699fac9c
Make community features (including profiling) on by default.
2008-07-24 13:43:14 -04:00
Davi Arnaut
8ce74569f7
Cherry-pick Bug#33362 from mysql-5.1
2008-07-24 11:14:34 -03:00
Horst Hunger
5f3c15c2fe
Merge from parent.
2008-07-24 09:49:29 +02:00
Sven Sandberg
7750753312
BUG#37733: rpl.rpl_flushlog_loop 'row' fails sporadically on pushbuild
...
BUG#37884: rpl_row_basic_2myisam and rpl_row_basic_3innodb fail sporadically in pushbuild
These have been fixed in 5.1-rpl. Re-applying fix for BUG#37884
in 5.1-bugteam, and disabling rpl_flushlog_loop for BUG#37733 in
5.1-bugteam.
2008-07-23 16:34:02 +02: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
Georgi Kodinov
436f1dc49c
Bug#37830 : ORDER BY ASC/DESC - no difference
...
Range scan in descending order for c <= <col> <= c type of
ranges was ignoring the DESC flag.
However some engines like InnoDB have the primary key parts
as a suffix for every secondary key.
When such primary key suffix is used for ordering ignoring
the DESC is not valid.
But we generally would like to do this because it's faster.
Fixed by performing only reverse scan if the primary key is used.
Removed some dead code in the process.
2008-07-23 14:25:00 +03:00
Horst Hunger
62b41dddd9
fix of bug#37708: removed a forgotten include file.
2008-07-23 08:51:04 +02:00
Horst Hunger
1259663d77
merge from parent
2008-07-23 08:49:41 +02:00
Davi Arnaut
cf586451df
Merge 5.1-bugteam into main.
2008-07-22 15:24:31 -03:00
Davi Arnaut
58daa8d50a
Silence warning due to unused function.
2008-07-22 14:53:36 -03:00
Davi Arnaut
aa21daf60a
Merge from mysql-5.1.27 release tree.
2008-07-22 14:41:26 -03:00
Horst Hunger
7a6d7491b5
Fix for bug#37708:
...
Deleted the removed tests.
2008-07-22 19:00:27 +02:00
Horst Hunger
497c97905e
2008-07-22 18:56:50 +02:00
Horst Hunger
d9fc253c47
Fix for bug#37708:The result files of the removed 64 bit tests.
2008-07-22 18:50:36 +02:00
Horst Hunger
cb7d9b27d4
Fix for bug#37708: Result files of removed 32 bit tests.
2008-07-22 18:48:47 +02:00
Horst Hunger
ac73d3b48b
Fix for bug#37708:The allocation of very large buffer must not be done in the pushbuild.
...
hhunger.
2008-07-22 18:45:55 +02:00
Horst Hunger
83231398d0
merge from parent.
2008-07-22 18:39:56 +02:00
Sergei Golubchik
821683a19c
merge
2008-07-22 16:42:03 +02:00
Horst Hunger
bb6e6e3bb9
Fix for bug#37708:The allocation of very large buffer must not be done in the pushbuild.
2008-07-22 15:58:21 +02:00
Kristofer Pettersson
597fe73cb8
auto merge
2008-07-22 13:33:37 +02:00
Kristofer Pettersson
906f061c76
Disabled two test cases in 5.1 because of random failures.
2008-07-22 13:04:32 +02:00
Kristofer Pettersson
9d83bfb469
merge 5.1->5.1-bugteam
2008-07-22 12:56:36 +02:00
Kristofer Pettersson
25dd8b33d7
merge 5.0->5.0-bugteam
2008-07-22 12:55:15 +02:00
Kristofer Pettersson
de4d31f2ac
2008-07-22 12:41:55 +02:00
Tatiana A. Nurnberg
0fc2eeb67d
auto-merge
2008-07-22 08:54:07 +02:00
Sven Sandberg
5ca789693b
BUG#38269: pushbuild gives valgrind error in ha_statistic_increment for rpl_temporary
...
This does not fix the bug. It only disables the failing test.
2008-07-21 21:05:06 +02:00
Kristofer Pettersson
f5668bc865
Corrected merge misstake.
2008-07-21 16:41:17 +02:00
Kristofer Pettersson
3f332ceae5
Auto merge
2008-07-21 14:00:13 +02:00
Kristofer Pettersson
df89855e70
Auto merge
2008-07-21 12:24:31 +02:00
Kristofer Pettersson
71930db28f
Bug#37027 expire_logs_days and missing binlogs cause a crash !
...
If the server failed to expired log files during start up it could crash.
2008-07-24 14:28:21 +02:00
Sergei Golubchik
50e23ee8ee
Bug#34409 LOCK_plugin contention via ha_release_temporary_latches/plugin_foreach
...
use thread-local data structures in ha_release_temporary_latches()
2008-07-21 12:01:22 +02:00
Tatiana A. Nurnberg
c990f5d378
auto-merge + post-merge fixies
2008-07-21 11:20:03 +02:00
Kristofer Pettersson
d8eb66127b
Manual merge
2008-07-21 11:18:35 +02:00
Kristofer Pettersson
e443cafb09
Null merge
2008-07-24 15:41:55 +02:00
Timothy Smith
91d19a1bea
Up-merge latest changes from 5.0-build
2008-07-20 22:01:25 -06:00
Timothy Smith
528b3105f5
Merge latest changes from 5.0-build
2008-07-20 21:59:47 -06:00
Timothy Smith
6e8eaa8e21
Up-merge of merges, some criss-cross resolved with --weave.
2008-07-19 02:31:33 -06:00
Timothy Smith
e6f3e65a3a
Merge in changes from 5.0.66a (via mysql-5.0)
2008-07-18 21:48:18 -06:00
Timothy Smith
f44c3210ce
Merge 5.0.66a-release changes
2008-07-18 21:46:03 -06:00
kent@mysql.com
18e0e280e4
Merge from mysql-5.0.66-release
2008-07-19 02:52:13 +02:00
Andrei Elkin
209e3395d2
merge
2008-07-18 17:02:42 +03:00
Georgi Kodinov
38dcc057c2
merge of 38158 to 5.1-bugteam
2008-07-18 15:00:45 +03:00
Andrei Elkin
a5d1e6101e
Bug #36818 rpl_server_id1 fails expecting slave has stopped
...
the reason for the failure is that io thread passes through a sequence of state
changes before it eventually got stuck at the expect running state as NO.
It's unreasonble to wait for the running status while the whole idea of the test is
to get to the IO thread error.
Fixed with changing the waiting condition.
2008-07-18 14:53:16 +03:00
Georgi Kodinov
5c256ec67a
Bug 38158: mysql client regression, can't read dump files
...
- Revert the fix for bug 33812
- fixed a win32 warning
2008-07-18 13:24:59 +03:00
Alexander Barkov
e390f843d5
Bug#27934 test client_xml misssing initialization
...
Problem: missing initialization, if the previous test
fails leaving table t1, client_xml fails as well.
Fix: adding initialization.
2008-07-18 14:07:16 +05:00
