Commit graph

56981 commits

Author SHA1 Message Date
Chad MILLER
b00e7d2d97 Merge fix and upstream. 2009-03-12 11:57:47 -04:00
Chad MILLER
8744675faf Merge fix for bug 42635, which is no change for 5.1 except addition of
test and (slightly different than 5.0) results.
2009-03-12 11:39:40 -04:00
Bjorn Munch
6f7f233b6c Bug #43597 Fix for Bug 43410 breaks build on Power Mac due to incomplete sys/resource.h
Added include of sys/time.h
2009-03-12 16:07:13 +01:00
Leonard Zhou
6db08f8df5 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-12 17:48:41 +08:00
Timothy Smith
2ca84a4c6f Applying InnoDB snashot 5.1-ss4350, part 5. Fixes
Bug #43203  	Overflow from auto incrementing causes server segv

Detailed revision comments:

r4325 | sunny | 2009-03-02 02:28:52 +0200 (Mon, 02 Mar 2009) | 10 lines
branches/5.1: Bug#43203: Overflow from auto incrementing causes server segv
It was not a SIGSEGV but an assertion failure. The assertion was checking
the invariant that *first_value passed in by MySQL doesn't contain a value
that is greater than the max value for that type. The assertion has been
changed to a check and if the value is greater than the max we report a
generic AUTOINC failure.

rb://93
Approved by Heikki
2009-03-11 18:18:44 -06:00
Timothy Smith
071cd48967 Applying InnoDB snashot 5.1-ss4350, part 4. Fixes
Bug #42714  	AUTO_INCREMENT errors in 5.1.31

Detailed revision comments:

r4287 | sunny | 2009-02-25 05:32:01 +0200 (Wed, 25 Feb 2009) | 10 lines
branches/5.1: Fix Bug#42714 AUTO_INCREMENT errors in 5.1.31. There are two
changes to the autoinc handling.

1. To fix the immediate problem from the bug report, we must ensure that the
   value written to the table is always less than the max value stored in
   dict_table_t.

2. The second related change is that according to MySQL documentation when
   the offset is greater than the increment, we should ignore the offset.
2009-03-11 18:17:53 -06:00
Timothy Smith
4e42869a0a Applying InnoDB snashot 5.1-ss4350, part 3. No functional changes.
Detailed revision comments:

r4165 | calvin | 2009-02-12 01:34:27 +0200 (Thu, 12 Feb 2009) | 1 line
branches/5.1: minor non-functional changes.
2009-03-11 18:16:53 -06:00
Timothy Smith
ff8b3d81bf Applying InnoDB snashot 5.1-ss4350, part 2. Fixes
Bug #42400  	InnoDB autoinc code can't handle floating-point columns

Detailed revision comments:

r4065 | sunny | 2009-01-29 16:01:36 +0200 (Thu, 29 Jan 2009) | 8 lines
branches/5.1: In the last round of AUTOINC cleanup we assumed that AUTOINC
is only defined for integer columns. This caused an assertion failure when
we checked for the maximum value of a column type. We now calculate the
max value for floating-point autoinc columns too.

Fix Bug#42400 - InnoDB autoinc code can't handle floating-point columns
rb://84 and Mantis issue://162

r4111 | sunny | 2009-02-03 22:06:52 +0200 (Tue, 03 Feb 2009) | 2 lines
branches/5.1: Add the ULL suffix otherwise there is an overflow.
2009-03-11 18:15:46 -06:00
Timothy Smith
556135a1a1 Applying InnoDB snashot 5.1-ss4350, part 1. Fixes
Bug #42279  	Race condition in btr_search_drop_page_hash_when_freed()

Detailed revision comments:

r4032 | marko | 2009-01-23 15:43:51 +0200 (Fri, 23 Jan 2009) | 10 lines
branches/5.1: Merge r4031 from branches/5.0:

btr_search_drop_page_hash_when_freed(): Check if buf_page_get_gen()
returns NULL.  The page may have been evicted from the buffer pool
between buf_page_peek_if_search_hashed() and buf_page_get_gen(),
because the buffer pool mutex will be released between these two calls.
(Bug #42279)

rb://82 approved by Heikki Tuuri
2009-03-11 18:14:24 -06:00
Tatiana A. Nurnberg
e58840fc85 Bug#40657: assertion with out of range variables and traditional sql_mode
normalize error-messages
2009-03-11 23:32:53 +01:00
Timothy Smith
5c21142855 Auto-merge from upstream 2009-03-11 15:43:15 -06:00
Timothy Smith
9c9a9b5e39 Up-merge from 5.0 2009-03-11 15:03:25 -06:00
Timothy Smith
b756503262 Bug #32625: Make test type_bit_innodb more robust
Since there is more than one duplicate value in the table, when adding the
unique index it is not deterministic which value will be reported as causing a
problem.  Replace the reported value with '' so that it doesn't affect the
results.
2009-03-11 14:54:57 -06:00
Timothy Smith
333e7f3e15 Remove outdated and now useless TODO file from sql-bench. Requested by sales. 2009-03-11 14:52:53 -06:00
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
Chad MILLER
8961b82ac7 Accept wide-character version of libncurses also. 2009-03-11 11:46:21 -04: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
kent.boortz@sun.com
e60cecab80 Back patched libedit portability changes from 5.1.32 2009-03-09 22:16:24 +01:00
Patrick.Crews@Sun.COM
67239e07f0 Test cases adjusted, precision changes "error Corrupt" changed to "status Operation failed" 2009-03-09 22:14:52 +01: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