Kristofer Pettersson
cae61b1ce4
Bug#46486 warnings produced when running mysql_install_db
...
During start up some plugins are disabled by default. This caused an additional
warning level message to be emitted as a result of a previous bug patch. Since
there is risk of unnecessary confusion regarding the operation level of the server
the redundant information is removed.
2009-09-03 12:08:55 +02:00
Bjorn Munch
51c0f1fce6
3rd merge from main
2009-09-03 08:44:22 +02:00
Bjorn Munch
051c787dda
merge
2009-09-03 08:39:29 +02:00
Bjorn Munch
aabcb80e95
A few suppression follow-ups
2009-09-03 08:38:06 +02:00
Bjorn Munch
5cdf8392b5
Bug #47075 Wildcards in experimental test names destroyed when tested first time
...
Extract substr into local variable
2009-09-03 08:19:54 +02:00
Jonathan Perkin
b74d8fa21e
Merge from mysql-5.1.38-release
2009-09-03 01:48:06 +02:00
Bjorn Munch
39fca129fb
second merge from main, with adaptions
2009-09-02 23:29:11 +02:00
Bjorn Munch
588e9930b4
first merge from main
2009-09-02 18:58:17 +02:00
Georgi Kodinov
80d872bd9d
back to -bugteam
2009-09-02 19:42:46 +03:00
Georgi Kodinov
b14439985f
null merge of 5.0 fixes backported from 5.1
2009-09-02 18:45:33 +03:00
Georgi Kodinov
21a01bd60e
fixed a valgrind warning in partition_pruning
2009-09-02 18:42:08 +03:00
Georgi Kodinov
db8471aa85
Backported the --parallel=str option from mtr2 for backward compatibility
...
with the newer pb2 testing environments
2009-09-02 16:36:52 +03:00
Georgi Kodinov
e254a67787
merge
2009-09-02 16:07:52 +03:00
Georgi Kodinov
bb4c5acfb3
merge
2009-09-02 15:33:18 +03:00
Georgi Kodinov
f68c3c0a6e
automerge
2009-09-02 15:22:32 +03:00
Georgi Kodinov
7d9f97f5ee
fixed a valgrind warning in partitioning code
2009-09-02 15:20:47 +03:00
Davi Arnaut
f076ba2803
Manual merge.
2009-09-02 09:12:18 -03:00
Davi Arnaut
ca96ac5351
Post-merge fix. Observe C declaration placement rules.
2009-09-02 09:02:22 -03:00
Davi Arnaut
5109313e66
Increase thread stack size on HP-UX when built with debug.
2009-09-02 08:45:48 -03:00
Sergey Vojtovich
f30480a695
BUG#46483 - drop table of partitioned table may leave
...
extraneous file
Online/fast ALTER TABLE of a partitioned table may leave
temporary file in database directory.
Fixed by removing unnecessary call to
handler::ha_create_handler_files(), which was creating
partitioning definition file.
2009-09-02 16:19:28 +05:00
Georgi Kodinov
6cfe48d727
moved version to 5.0-main
2009-09-02 13:23:37 +03:00
Georgi Kodinov
8f5b17f529
Fixed win32 compilation warnings
2009-09-02 13:22:47 +03:00
Georgi Kodinov
f7fa5d5a02
fixed compilation warnings
2009-09-02 13:09:01 +03:00
Bjorn Munch
d65168fdda
Bug #32296 mysqltest fails to parse "append_file" inside a "while", it works inside
...
a "if"
Bug #41913 mysqltest cannot source files from if inside while
Some commands require additional processing which only works first time
Keep content for write_file or append_file with the st_command struct
Add tests for those cases to mysqltest.test
2009-09-02 11:17:33 +02:00
Bjorn Munch
5703baad97
merge
2009-09-01 19:31:28 +02:00
Mattias Jonsson
a04801b6fc
merge to update with latest mysql-5.1-bugteam
2009-09-01 15:54:59 +02:00
Georgi Kodinov
dfcbeee1b4
Fixed a problem in how BUILD/check_cpu handles Core 2 Duo processors.
...
This fixes the regression introduced in 5.1 that prevents 64 bit builds on Intel while still keeping the core2 hack operational so the cluster can build.
2009-09-01 16:39:13 +03:00
Mattias Jonsson
02585b608a
post push fix for bug#20577 and bug#46362, disabling warnings
2009-09-01 14:53:27 +02:00
Davi Arnaut
004427a9bb
Bug#45611: Minor code cleanup
...
Remove a self assignment.
Rework a few constructs to avoid a potential overflow.
Based upon patch contributed by Michal Hrusecky
2009-09-01 09:32:26 -03:00
Bjorn Munch
202984236a
46996 workaruond
2009-09-01 13:38:17 +02:00
Mattias Jonsson
35ba36d13d
Post fix patch for bug#20577 and bug#46362.
...
On 64-bits machines the calculation gets the wrong types and results
in very large numbers. Fixed by explicitly cast month to (int)
2009-09-01 13:04:56 +02:00
Jonathan Perkin
0af1cf8ef9
Only install the innodb plugin if the plugin directory exists.
2009-09-01 08:40:13 +02:00
Tatiana A. Nurnberg
cdea23eba4
auto-merge
2009-08-31 12:56:01 -07:00
Tatiana A. Nurnberg
a88c86f67f
auto-merge
2009-08-31 12:54:22 -07:00
Tatiana A. Nurnberg
e8d45e1be7
manual merge
2009-08-31 12:40:33 -07:00
Tatiana A. Nurnberg
c3aac11c08
Bug#35132: MySQLadmin --wait ping always crashes on Windows systems
...
Failing to connect would release parts of the MYSQL struct.
We would then proceed to try again to connect without re-
initializing the struct.
We prevent the unwanted freeing of data we'll still need now.
2009-08-31 10:01:13 -07:00
Georgi Kodinov
b1dbd5c50f
automerge
2009-08-31 17:11:54 +03:00
Georgi Kodinov
e926c448b8
automerge 5.1-main -> 5.1-bugteam
2009-08-31 17:09:09 +03:00
Georgi Kodinov
0366cbd563
merge 5.0-main -> 5.0-bugteam
2009-08-31 17:08:10 +03:00
Georgi Kodinov
4adb05e282
automerge
2009-08-31 16:40:35 +03:00
Bjorn Munch
84bd45c849
merge
2009-08-31 15:22:54 +02:00
Anurag Shekhar
600703e50a
merging bugfix from 5.0
2009-08-31 13:26:09 +05:30
Anurag Shekhar
9b97856d82
merging with changes in bugteam branch.
2009-08-31 13:02:31 +05:30
Bjorn Munch
86a3262d26
forgot : in rpl's disabled.def
2009-08-31 09:24:59 +02:00
f37a5879b4
Bug #44331 Restore of database with events produces warning in replication
...
Update the test case for BUG#44331 to fix the push build failure.
2009-08-31 10:26:01 +08:00
Staale Smedseng
7aa88fcb95
Merge from 5.1-bugteam
2009-08-30 19:01:48 +02:00
Bjorn Munch
2194a927a9
yet another 42408 followup
2009-08-30 12:01:08 +02:00
Alexey Kopytov
6070491d4e
Automerge.
2009-08-30 11:38:49 +04:00
Alexey Kopytov
62b95b90df
Bug #46607 : Assertion failed: (cond_type == Item::FUNC_ITEM)
...
results in server crash
check_group_min_max_predicates() assumed the input condition
item to be one of COND_ITEM, SUBSELECT_ITEM, or FUNC_ITEM.
Since a condition of the form "field" is also a valid condition
equivalent to "field <> 0", using such a condition in a query
where the loose index scan was chosen resulted in a debug
assertion failure.
Fixed by handling conditions of the FIELD_ITEM type in
check_group_min_max_predicates().
2009-08-30 11:03:37 +04:00
Bjorn Munch
7941f3c3a0
even more suppression fixes
2009-08-29 23:29:47 +02:00
