Commit graph

65852 commits

Author SHA1 Message Date
Ramil Kalimullin
389c68a8d4 Automerge. 2010-06-24 12:34:05 +04:00
Ramil Kalimullin
0d7eb317b5 Accidentally pushed test changes (#54459) removed. 2010-06-24 12:31:01 +04:00
Ramil Kalimullin
e233dc2bfd Fix for bug #54459: Assertion failed: param.sort_length,
file .\filesort.cc, line 149 (part II)

Problem: the server didn't disregard sort order 
for some zero length tuples.

Fix: skip sort order in such a case 
(zero length NOT NULL string functions).
2010-06-24 12:00:48 +04:00
Vasil Dimov
149d305484 Merge mysql-trunk -> mysql-trunk-merge 2010-06-22 18:58:28 +03:00
Alexander Nozdrin
13495faeb7 Auto-merge from mysql-trunk-bugfixing. 2010-06-22 17:01:39 +04:00
Magne Mahre
b4f77c40ec Post-push fixups for WL#5349 2010-06-22 12:13:47 +02:00
Alexander Nozdrin
bba0a92d03 Auto-merge from mysql-trunk-stage. 2010-06-21 17:08:16 +04:00
Sergey Glukhov
bc401730d6 5.1-bugteam->trunk-merge merge 2010-06-21 15:19:14 +04:00
Sergey Glukhov
f48306344a Bug#50389 Using intersect does not return all rows
In process of record search it is not taken into account
that inital quick->file->ref value could be inapplicable
to range interval. After proper row is found this value is
stored into the record buffer and later the record is
filtered out at condition evaluation stage.
The fix is store a refernce of found row to the handler ref field.
2010-06-21 15:09:58 +04:00
Joerg Bruehe
4d5d3553bf Automerge part of mysql-trunk-bugfixing into mysql-trunk-merge. 2010-06-21 12:52:03 +02:00
Daniel Fischer
915bfb505e Fixed a readability optimization in CMake code that broke IPv6 support. 2010-06-21 10:59:54 +02:00
Alexander Nozdrin
36348425da Fix tree name. 2010-06-21 11:56:43 +04:00
Magne Mahre
eda2ff8103 Post-push fixup for WL#5349
InnoDB came in a new version "simultanously" with the
commit.  This patch is a minor change to the new innodb
regression test suite.
2010-06-20 22:43:34 +02:00
Ramil Kalimullin
936a2b111a Fix for bug #54393: crash and/or valgrind errors in
mysql_client_binlog_statement

Problem: server may read from unassigned memory performing
"wrong" BINLOG queries.

Fix: never read from unassigned memory.
2010-06-18 21:32:23 +04:00
Daniel Fischer
9891642e77 merge 2010-06-18 17:04:15 +02:00
Joerg Bruehe
105b4c38d0 Automerge from parent copy. 2010-06-18 10:29:03 +02:00
Magne Mahre
3ac6a4b451 WL#5349 Change default storage engine to InnoDB
The default storage engine is changed from MyISAM to
InnoDB, in all builds except for the embedded server.

In addition, the following system variables are 
changed:

  * innodb_file_per_table is enabled
  * innodb_strict_mode is enabled
  * innodb_file_format_name_update is changed
    to 'Barracuda'

The test suite is changed so that tests that do not
explicitly include the have_innodb.inc are run with
--default-storage-engine=MyISAM.  This is to ease the
transition, so that most regression tests are run
with the same engine as before.

Some tests are disabled for the embedded server
regression test, as the output of certain statements
will be different that for the regular server
(i.e SELECT @@default_storage_engine).  This is to
ease transition.
2010-06-17 22:51:35 +02:00
Joerg Bruehe
81fda234c7 Bug#54590 "make_binary_distribution" fails because a command
line exceeds the limit

Merge the fix into "trunk-bugfixing".
2010-06-17 20:19:28 +02:00
Joerg Bruehe
e740b826a8 Bug#54590 "make_binary_distribution" fails because a command
line exceeds the limit

Upmerge the fix from 5.1 to 5.5 ("trunk").
2010-06-17 20:10:17 +02:00
Joerg Bruehe
218a15b76a Bug#54590 "make_binary_distribution" fails because a command
line exceeds the limit

Upmerge the fix from 5.0 to 5.1
2010-06-17 19:55:21 +02:00
Joerg Bruehe
d4c4bd6e2f Bug#54590 "make_binary_distribution" fails because a command
line exceeds the limit

The number and/or names of our files for the main test suite
(contents of "mysql-test/t/") now exceeds the command line
length limit on AIX.
Solve the problem by using separate "cp" commands for the
various file name extensions.
2010-06-17 19:47:38 +02:00
Konstantin Osipov
95c86d14b5 Merge. 2010-06-17 17:55:00 +04:00
Konstantin Osipov
484351d108 Merge trunk-bugfixing -> trunk-runtime 2010-06-17 17:31:51 +04:00
Joerg Bruehe
71377f189f Upmerge an empty merge changeset (27072 in the bug DB) from 5.1-bugteam
to trunk-bugfixing, no contents changes (already done separate).
2010-06-17 13:15:00 +02:00
Joerg Bruehe
6e4cdd847f Automerge the fix for bug#27072 into trunk-bugfixing. 2010-06-17 13:11:34 +02:00
Joerg Bruehe
92c57e3dc5 Automerge the fix for bug#27072 into 5.1-bugteam 2010-06-17 13:07:33 +02:00
Vasil Dimov
7e91042981 Merge mysql-trunk-innodb -> mysql-trunk-bugfixing 2010-06-17 13:17:49 +03:00
Vasil Dimov
e368a06464 Adjust innodb_mysql.result after the resolved conflict from the merge 2010-06-17 12:59:53 +03:00
Vasil Dimov
847ea21e82 Merge mysql-trunk-bugfixing -> mysql-trunk-innodb 2010-06-17 12:41:20 +03:00
Vasil Dimov
9989cc8e99 Decrement version number from 1.1.2 to 1.1.1, this latest tree
is going to be 1.1.1.
2010-06-17 12:35:23 +03:00
Jimmy Yang
689d245782 This change splits innodb_file_format_check into innodb_file_format_check
and innodb_file_format_max two system variables. And this also fixes
bug #53654 after 2nd shutdown innodb_file_format_check attains strange
values.

rb://366 approved by Marko
2010-06-17 02:13:53 -07:00
Sunny Bains
146617790b Merge from parent. 2010-06-17 17:48:14 +10:00
Alexander Nozdrin
527446e0a2 Auto-merge from mysql-trunk. 2010-06-17 10:19:37 +04:00
Alexander Nozdrin
1337df3b79 Auto-merge from mysql-trunk. 2010-06-17 10:13:11 +04:00
Sunny Bains
24e30932d6 Revert a change that should have been a part of 3008.2.76..3008.2.78. 2010-06-17 11:06:13 +10:00
Mats Kindahl
c7170276ef BUG#52737: plugin_dir is set to /usr/local/mysql/lib/plugin while starting via mysqld_safe
Incremental patch to fix plugin_dir from .../lib/plugin to .../lib/mysql/plugin.
2010-06-16 11:25:55 +02:00
Dmitry Lenev
451a3810ee Small clean-up and pre-requisite for making
TABLE_SHARE a class.

Remove unused members in TABLE_SHARE.
2010-06-16 13:04:30 +04:00
Konstantin Osipov
db0ee68b38 Merge trunk-bugfixing -> trunk-runtime 2010-06-16 12:50:36 +04:00
Joerg Bruehe
9b42527d55 Fix bug#27072: RPM autostarts the server
This is the fix for 5.5, where the behaviour on both installation
and upgrade is changed:
On installation, we do not start the server, to allow automated
installs (which happen in some indeterminate machine status).
If the server was stopped when the upgrade begins, we assume the
administrator is taking manual action, so we do not start the (new)
server at the end of the upgrade.
We still install the start/stop script, so it will be started on reboot.
2010-06-15 22:46:29 +02:00
Joerg Bruehe
f21625d77d Fix bug#27072: RPM autostarts the server
This is the fix for 5.1, where only the behaviour on upgrade is changed:
If the server was stopped when the upgrade begins, we assume the
administrator is taking manual action, so we do not start the (new)
server at the end of the upgrade.
We still install the start/stop script, so it will be started on reboot.
2010-06-15 22:27:48 +02:00
Alexey Kopytov
48c07a39c4 Bug#52208: gis fails on some platforms (Solaris, HP-UX, Linux)
On [Open]Solaris/x86 the FPU was not switched to 64-bit double
precision mode when the server binary was built with Sun
Studio. That caused GIS test failures due to differences in
expected and actual results.
2010-06-15 18:52:47 +04:00
Vasil Dimov
66c8b4eafc Increment InnoDB version number from 1.1.1 to 1.1.2,
the 1.1.1 release will be included inside MySQL 5.5.5 and is
up to (inclusive):
vasil.dimov@oracle.com-20100602124314-21l3cb27w4rbfqrq
2010-06-15 17:51:57 +03:00
Alexey Kopytov
6497bd3784 Backport of the patch for bug52208 to 5.1 since the
root cause of 52208 resulted in another test failure
in 5.1.
2010-06-15 18:29:53 +04:00
Konstantin Osipov
d482162638 Fix a build break with cmake: remove the custom defines
that prevented hp_test2 to link in non-debug builds.
2010-06-15 15:15:42 +04:00
Bjorn Munch
baf3611a00 null upmerge 53424 2010-06-15 11:08:41 +02:00
Bjorn Munch
bc21a167f6 null upmerge 53424, irrelevant for 5.1 2010-06-15 11:03:52 +02:00
Bjorn Munch
b785819582 Bug #53424 Certain combination of flags give internal error
Reorder code breaks when finding tests skipped due to --skip-rpl etc.
Add simple test that master_opt is non-empty
2010-06-15 11:00:02 +02:00
Alexander Nozdrin
63f529a469 Make perfschema.pfs_upgrade and sys_vars.wait_timeout_func experimental. 2010-06-15 12:58:52 +04:00
Alexander Nozdrin
72584c312d Auto-merge (empty) from mysql-trunk. 2010-06-15 12:31:01 +04:00
Alexander Nozdrin
0b3751be6b Auto-merge from mysql-trunk. 2010-06-15 12:25:44 +04:00