Commit graph

56864 commits

Author SHA1 Message Date
Sergey Petrunia
d99215334e Merge 2009-03-11 23:52:22 +03:00
Davi Arnaut
c5bb49d020 Bug#36540: CREATE EVENT and ALTER EVENT statements fail with large server_id
The problem is that creating a event could fail if the value of
the variable server_id didn't fit in the originator column of
the event system table. The cause is two-fold: it was possible
to set server_id to a value outside the documented range (from
0 to 2^32-1) and the originator column of the event table didn't
have enough room for values in this range.

The log tables (general_log and slow_log) also don't have a proper
column type to store the server_id and having a large server_id
value could prevent queries from being logged.

The solution is to ensure that all system tables that store the
server_id value have a proper column type (int unsigned) and that
the variable can't be set to a value that is not within the range.
2009-03-11 17:30:56 -03:00
Sergey Petrunia
7877de39fd Change optimizer_switch from no_xxx to xxx=on/xx=off. 2009-03-11 23:13:39 +03:00
Tatiana A. Nurnberg
727cad6c2a Bug#36751: Segmentation fault in ctype-bin.c:308; Linux 86_64, with-max-indexes=128
mysqld is optimized for the default
case (up to 64-indices); for a greater
number of indices it goes through a
different code path. As that code-path
is a compile-time option and can not
easily be covered in standard tests,
bitrot occurred. key-fields need an
explicit initialization in the non-
optimized case; this setup was
presumably not added when a new key-
vector was added.

Changeset adds the necessary
initialisations.

No test case added due to dependence
on compile-time option.
2009-03-11 19:09:56 +01:00
Georgi Kodinov
cd7d25f4b9 merge of bug 42434 to 5.1-bugteam 2009-03-11 18:13:42 +02:00
Georgi Kodinov
3fb74f93d8 Revert the push for bug #39858 2009-03-11 17:19:18 +02:00
Bjorn Munch
3038fa5b21 back-merge of merge to main 2009-03-11 14:56:52 +01:00
Bjorn Munch
44db33e0eb Bug #43532 mtr should not rely on diff to report test results
mtr on Windows does not give decent diff due to missing diff install
Modified to look for 'mtrdiff' if diff not available.
2009-03-11 14:52:50 +01:00
Georgi Kodinov
06177be9a5 merged 5.0-bugteam->5.1-bugteam 2009-03-11 15:04:57 +02:00
Georgi Kodinov
68fcdd97da merged 5.1-main -> 5.1-bugteam 2009-03-11 15:03:25 +02:00
Georgi Kodinov
f01890898b merged 5.0-main -> 5.0-bugteam 2009-03-11 15:01:35 +02:00
Georgi Kodinov
4dde424e95 merged bug 43354 to 5.1-bugteam 2009-03-11 14:29:59 +02:00
Georgi Kodinov
e546077ee8 Bug #43354: Use key hint can crash server in explain extended query
The copy of the original arguments of a aggregate function was not
initialized until after fix_fields().
Sometimes (e.g. when there's an error processing the statement)
the print() can be called with no corresponding fix_fields() call.
      
Fixed by adding a check if the Item is fixed before using the arguments
copy.
2009-03-11 14:10:44 +02:00
Narayanan V
b741553087 Bug#42937 strings/CHARSET_INFO.txt not included in source distributions
The reference manual has instructions for adding new character
sets, and refers to the string/CHARSET_INFO.txt file. This file
is currently not present in the distribution.

Modify the build to include this file in the distribution.
2009-03-11 12:41:59 +05:30
Leonard Zhou
77ffa795bd Merge 2009-03-11 14:10:50 +08:00
Leonard Zhou
cd80cee780 BUG#39858 rpl.rpl_rotate (rpl.rpl_rotate_logs) failed on pushbuild: result mismatch
The method to purge binary log files produces different results in some platforms.
The reason is that the purge time is calculated based on table modified time and
that can't guarantee to purge master-bin.000002 in all platforms.(eg. windows)

Use a new way that sets the time to purge binlog file 1 second after the last modified time of master-bin.000002.
That can be sure that the file is always deleted in any platform.
2009-03-11 13:35:58 +08:00
Matthias Leich
5ff475b1dd Merge 5.0 -> 5.1, no conflicts, no modified files 2009-03-10 18:27:33 +01:00
Matthias Leich
62adf8953a Merge of fix into actual tree 2009-03-10 18:21:35 +01:00
Chad MILLER
6b72857803 Merge from bugfix tree. 2009-03-10 12:53:43 -04:00
Matthias Leich
b63c7b2bb0 Merge into actual tree 2009-03-10 16:54:24 +01:00
Bjorn Munch
f501645e51 merge from 5.1-mtr 2009-03-10 14:48:06 +01:00
Sergey Vojtovich
77d957af67 Merge 5.1-ibmdb2isee to 5.1-bugteam. 2009-03-10 16:27:53 +04:00
Sergey Petrunia
4961e008c6 Post-merge fixes 2009-03-10 11:49:30 +03:00
Patrick Crews
4a0c1c7ac4 merge 2009-03-09 20:47:58 -04:00
Sergey Petrunia
614f227020 Merge 2009-03-10 00:53:38 +03:00
Timothy Smith
5d1f153e30 Import the ibmdb2i-ga4-src snapshot from IBM 2009-03-09 15:20:14 -06:00
Chad MILLER
0d9589a433 Bug#42635: mysqldump includes views that were excluded using the \
--ignore-table option

mysqldump would correctly omit temporary tables for views, but would
incorrectly still emit all CREATE VIEW statements.

Backport a fix from 5.1, where we capture the names we want to emit
views for in one pass (the placeholder tables) and in the pass where
we actually emit the views, we don't emit a view if it wasn't in that
list.
2009-03-09 16:58:47 -04:00
Chad MILLER
0693a99cfd Fix non-DBUG return. 2009-03-09 16:56:46 -04:00
Georgi Kodinov
5b9a33aafe Bug #42434: license of mysys MD5 implementation is not GPL-compatible
Took the Xfree implementation (based on the same rewrite as the NDB one)
and added it instead of the current implementation.
Added a macro to make the calls to MD5 more streamlined.
2009-03-09 20:57:03 +02:00
kent.boortz@sun.com
e400c54a06 Raise version number after cloning 5.0.79 2009-03-09 19:33:01 +01:00
Patrick Crews
b69c44a91c merge 5.0 -> 5.1 2009-03-09 13:45:40 -04:00
Patrick Crews
1c39d5ff8f Fix of failing funcs_1 tests.
Changes are due to changes in precision.
Re-record of .result files to account for new server precision.
2009-03-09 11:32:07 -04:00
Tatiana A. Nurnberg
eb330039ad automerge 2009-03-09 15:57:34 +01:00
Tatiana A. Nurnberg
dec80f3ee5 Bug#40657: assertion with out of range variables and traditional sql_mode
test-fixes for 32-bit
2009-03-09 15:26:53 +01:00
Georgi Kodinov
abdd2fe67a set the tree name to 5.0-main 2009-03-09 15:59:22 +02:00
Bjorn Munch
8179ed2649 Bug #43410 --skip-core-file has no effect if core file size is set
Would not prevent mysqld from core dumping
Passes --nocore arg to safe_process, which then sets rlimit core to 0 for child
2009-03-09 14:31:39 +01:00
Bjorn Munch
739d5775b1 Bug #43148 MTR2 + PB2 should display correct number of failures
Retried tests are reported the same as ordinary ones
Prepend "retry-" to fail or pass for retried tests
2009-03-09 12:59:34 +01:00
Georgi Kodinov
4976ec08a3 merge 5.0-pe-stage -> 5.1-pe-stage 2009-03-09 13:15:46 +02:00
Georgi Kodinov
93a58abe87 merged 5.1-main -> 5.1-pe-stage 2009-03-09 12:52:08 +02:00
Georgi Kodinov
df0fc2ea6a fixed a typo 2009-03-09 12:49:18 +02:00
Daniel Fischer
a732b40951 merge from parent 2009-03-09 11:33:08 +01:00
Georgi Kodinov
9870864a88 fixed a win32 compile warning 2009-03-09 12:22:52 +02:00
Daniel Fischer
6c0308f6b7 merge 42888 to 5.1-mtr 2009-03-09 11:11:27 +01:00
Anurag Shekhar
9eba69618d fixing warning during compilation. 2009-03-09 15:03:02 +05:30
He Zhenxing
6ddec9a50b Auto merge 2009-03-09 16:44:18 +08:00
He Zhenxing
ea7a84bf7e Auto merge 2009-03-09 16:42:31 +08:00
Anurag Shekhar
fa0b8098f3 merging with latest changes. 2009-03-09 13:58:48 +05:30
Bjorn Munch
affe300a48 merge from 5.1 main 2009-03-07 20:42:11 +01:00
Andrei Elkin
f36a37af7b Bug #40559 assertion failed in check_binlog_magic
The reason of the bug is in that the test makes a trick with relay log files and
did not reset fully at the end.
If mtr does not restart the test the new SQL thread tried to work with the old time
session data.

Fixed with deploying RESET slave at the clean-up.
2009-03-06 20:19:29 +02:00
Tatiana A. Nurnberg
6d5ccfa1f2 manual merge 2009-03-06 16:11:34 +01:00