Commit graph

61296 commits

Author SHA1 Message Date
Alexander Nozdrin
c04e5bbe70 Auto-merge from mysql-trunk-merge. 2010-03-02 10:24:32 +03:00
Alexander Nozdrin
0c01d8d86c Remove test from experimental because Bug 45578 and 46010 are fixed. 2010-03-02 10:22:33 +03:00
Mattias Jonsson
24bc23ea11 merge 2010-03-02 00:52:33 +01:00
Mattias Jonsson
b2838f1a70 manual merge fix of bug#42438 in mysql-next-mr-merge 2010-03-02 00:05:30 +01:00
Alexander Nozdrin
2ee7f4573b Auto-merge from mysql-trunk-merge. 2010-03-01 21:56:54 +03:00
Alexander Nozdrin
fe6e3bf20a Manual merge from mysql-5.1.
Conflicts:
  - support-files/mysql.spec.sh
  - configure.in
2010-03-01 21:49:06 +03:00
hery.ramilison@sun.com
0bba3928b0 Raise version number after cloning 5.1.45 2010-03-01 11:58:26 +01:00
Joerg Bruehe
158e89792a Spec file for RPMs:
Now that Oracle has legally acquired Sun, change the copyright owner
and the vendor.
2010-03-01 11:42:44 +01:00
Alexander Nozdrin
d73ab35ec9 Auto-merge from mysql-trunk-merge. 2010-03-01 13:15:52 +03:00
Alexander Nozdrin
26de856e5a Auto-merge from mysql-next-mr. 2010-03-01 13:14:34 +03:00
Alexander Nozdrin
4d2360813a Auto-merge from mysql-trunk. 2010-03-01 13:11:57 +03:00
Alexander Nozdrin
ef5ef725e3 Disable partition_debug_sync temporarily awaiting a patch from Mattias. 2010-03-01 13:07:42 +03:00
Alexander Nozdrin
dec27c317b Add configure.am to .bzrignore. 2010-03-01 13:07:06 +03:00
Alexander Nozdrin
b73cba223b Manual merge from mysql-next-mr.
Conflicts:
  - sql/item.cc
2010-03-01 13:06:11 +03:00
Alexander Nozdrin
41110ca1bf Auto-merge (empty) from mysql-trunk-merge. 2010-03-01 12:49:29 +03:00
Alexander Nozdrin
0e380da18b Auto-merge (empty) from mysql-trunk. 2010-03-01 12:47:21 +03:00
Alexander Nozdrin
860ae5d990 Manual merge (empty) from mysql-trunk-merge.
Conflicts:
  - scripts/mysqld_multi.sh
  - sql/item_timefunc.cc
2010-03-01 12:45:36 +03:00
Alexander Nozdrin
26c586008c Auto-merge (empty) from mysql-trunk-merge. 2010-03-01 12:41:28 +03:00
Alexander Nozdrin
1913b715bc Manual merge from mysql-trunk-merge.
Conflicts:
  - sql/share/Makefile.am
2010-03-01 12:39:44 +03:00
Joerg Bruehe
fb8714a170 Upmerge README change from "trunk" to "next-mr". 2010-03-01 10:27:30 +01:00
Joerg Bruehe
c3a6c0f0e3 Update the README file for new contributed software,
as provided by Trudy Pelzer.
2010-03-01 10:19:39 +01:00
Alexander Nozdrin
e6675a2490 Auto-merge from mysql-5.1. 2010-03-01 12:02:15 +03:00
Georgi Kodinov
2e906736eb merge 2010-03-01 10:38:27 +02:00
Georgi Kodinov
f6f5cb4865 merge 2010-03-01 10:37:38 +02:00
Georgi Kodinov
17cb596bb0 tree version change 2010-03-01 10:35:14 +02:00
Alexander Barkov
06ca4ae33d Mergine from mysql-next-me 2010-02-27 11:43:32 +04:00
Georgi Kodinov
5853210e38 merge 5.0-bugteam -> 5.1-bugteam 2010-02-26 15:16:46 +02:00
Georgi Kodinov
a7f6326631 merge 2010-02-26 15:10:25 +02:00
Alexey Kopytov
d097b40773 Null merge of the InnoDB snapshot from mysql-5.1-bugteam
to mysql-trunk-merge.
2010-02-26 16:10:09 +03:00
Alexey Kopytov
031657c694 Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:

Text conflict in scripts/Makefile.am
Text conflict in sql/share/Makefile.am
2010-02-26 16:06:31 +03:00
Georgi Kodinov
6f51e9e4f8 Bug #51468: mysqld_multi is broken in 5.1.44
Fixed a syntax error in mysqld_multi.sh
2010-02-26 14:49:13 +02:00
Sergey Vojtovich
3fcb25d806 Merge innodb-5.1-ss6765 to 5.1-bugteam. 2010-02-26 16:34:13 +04:00
Sergey Glukhov
1bb6ea1727 automerge 2010-02-26 16:19:05 +04:00
Sergey Glukhov
fe94dec679 Bug#50995 Having clause on subquery result produces incorrect results.
The problem is that cond->fix_fields(thd, 0) breaks
condition(cuts off 'having'). The reason of that is
that NULL valued Item pointer is present in the
middle of Item list and it breaks the Item processing
loop.
2010-02-26 15:39:25 +04:00
Evgeny Potemkin
a0723c0665 Auto-merged fox for the bug#50843. 2010-02-26 14:19:44 +03:00
Evgeny Potemkin
cc01fc3f5f Bug#50843: Filesort used instead of clustered index led to
performance degradation.

Filesort + join cache combination is preferred to full index scan because it
is usually faster. But it's not the case when the index is clustered one.

Now test_if_skip_sort_order function prefers filesort only if index isn't
clustered.
2010-02-26 14:17:00 +03:00
Alexander Nozdrin
93287d6162 Auto-merge from mysql-next-mr. 2010-02-26 12:33:19 +03:00
Sergey Vojtovich
42d5617950 Applying InnoDB snapshot, fixes BUG#50691
Detailed revision comments:

r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines
branches/5.1: Fix bug #50691, AIX implementation of readdir_r
causes InnoDB errors. readdir_r() returns an non-NULL value
in the case of reaching the end of a directory. It should
not be treated as an error return.

rb://238 approved by Marko
2010-02-26 13:04:24 +04:00
Sergey Vojtovich
757a1ff33a Applying InnoDB snapshot, fixes BUG#38901
Detailed revision comments:

r6613 | inaam | 2010-02-09 20:23:09 +0200 (Tue, 09 Feb 2010) | 11 lines
branches/5.1: Fix Bug #38901
InnoDB logs error repeatedly when trying to load page into buffer pool

In buf_page_get_gen() if we are unable to read a page (because of
corruption or some other reason) we keep on retrying. This fills up
error log with millions of entries in no time and we'd eventually run
out of disk space. This patch limits the number of attempts that we
make (currently set to 100) and after that we abort with a message.

rb://241 Approved by: Heikki
2010-02-26 13:03:58 +04:00
Sergey Vojtovich
167888c6c3 Applying InnoDB snapshot, fixes BUG#49001
Detailed revision comments:

r6545 | jyang | 2010-02-03 03:57:32 +0200 (Wed, 03 Feb 2010) | 8 lines
branches/5.1: Fix bug #49001, "SHOW INNODB STATUS deadlock info
incorrect when deadlock detection aborts". Print the correct
lock owner when recursive function lock_deadlock_recursive()
exceeds its maximum depth LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK.

rb://217, approved by Marko.
2010-02-26 13:03:23 +04:00
Sergey Vojtovich
6d4e34cabb Applying InnoDB snapshot
Detailed revision comments:

r6538 | sunny | 2010-01-30 00:43:06 +0200 (Sat, 30 Jan 2010) | 6 lines
branches/5.1: Check *first_value every time against the column max
value and  set *first_value to next autoinc if it's > col max value.
ie.  not rely on what is passed in from MySQL.

[49497] Error 1467 (ER_AUTOINC_READ_FAILED) on inserting a negative value
rb://236
2010-02-26 13:02:57 +04:00
Sergey Vojtovich
ac68d90faa Applying InnoDB snapshot
Detailed revision comments:

r6537 | sunny | 2010-01-30 00:35:00 +0200 (Sat, 30 Jan 2010) | 2 lines
branches/5.1: Undo r6536.
2010-02-26 13:02:26 +04:00
Sergey Vojtovich
91c42548c8 Applying InnoDB snapshot
Detailed revision comments:

r6536 | sunny | 2010-01-30 00:13:42 +0200 (Sat, 30 Jan 2010) | 6 lines
branches/5.1: Check *first_value everytime against the column max
value and  set *first_value to next autoinc if it's > col max value.
ie.  not rely on what is passed in from MySQL.

[49497] Error 1467 (ER_AUTOINC_READ_FAILED) on inserting a negative value
rb://236
2010-02-26 13:02:05 +04:00
Sergey Vojtovich
ffad156254 Applying InnoDB snapshot
Detailed revision comments:

r6535 | sunny | 2010-01-30 00:08:40 +0200 (Sat, 30 Jan 2010) | 11 lines
branches/5.1: Undo the change from r6424. We need to return DB_SUCCESS even
if we were unable to initialize the tabe autoinc value. This is required for
the open to succeed. The only condition we currently treat as a hard error
is if the autoinc field instance passed in by MySQL is NULL.

Previously if the table autoinc value was 0 and the next value was requested
we had an assertion that would fail. Change that assertion and treat a value
of 0 to mean that the autoinc system is unavailable. Generation of next
value will now return failure.

rb://237
2010-02-26 13:01:31 +04:00
Alexander Barkov
da2e47a533 After-fix for WL#2649 Number-to-string conversion.
This change fixes test failure for partition_repair_myisam
and partition_recover_myisam.

The problem was that:
- the file std_data/corrupt_crash.MYI
  contains charsetnr=63 (binary) for index segments.
- the new .frm file contains charsetnr=8 (latin1) for
  the same segments.
As a result REPAIR refused to repair frm+MYI files
with different segment definition.

This fix restores the old behavior for frm and MYI files:
they now store charsetnr=63 for numeric/datetime data types.
2010-02-26 10:28:44 +04:00
Alexander Nozdrin
6e4f3deb72 Disable rpl_semi_sync on Windows due to Bug 49557. 2010-02-26 09:06:43 +03:00
Alexander Nozdrin
bf87590104 Fix mysqld--help-notwin.result. 2010-02-25 23:10:42 +03:00
Alexander Nozdrin
16fd5b9b05 Auto-merge from mysql-next-mr. 2010-02-25 23:00:37 +03:00
Alexander Nozdrin
c962fdf25c Auto-merge from mysql-next-mr. 2010-02-25 22:58:57 +03:00
Alexander Nozdrin
f381d58ca1 Fix default.conf. 2010-02-25 22:43:05 +03:00