Commit graph

61447 commits

Author SHA1 Message Date
Alexander Nozdrin
f9b0b01466 Auto-merge from mysql-next-mr-bugfixing. 2010-03-10 16:22:52 +03:00
Luis Soares
fccd3c1a1f BUG#50442: MTR check for rpl_sync fails
The test case crashes and recovers the server twice, and while 
recovering InnoDB sets innodb_file_format_check to different
format on second restart. This makes the test case clean up
check to fail.

We fix this by deploying the option "--innodb_file_format_check='ON'"
in slave startup configuration. This makes the innodb_file_format_check
to not change on secod restart.
2010-03-10 12:40:29 +00:00
Joerg Bruehe
d15dfba1fb Automerge part of the fixes for bug#49022 into "next-mr-bugfixing". 2010-03-10 12:10:21 +01:00
He Zhenxing
b2e3fb8a6f Post fix for Bug#49557 2010-03-10 18:32:21 +08:00
Joerg Bruehe
c2676e2b5d Part of the fixes for bug#49022
Plugins included into bin release cannot be
    installed on debug version of server

IF    the build process was split into separate "debug" and
      "optimized" builds
   AND
      the plugin files of the debug build got copied into
      "plugin/debug/"
(both is done for MySQL release builds starting from 5.5.3),
THEN these debug plugin files are to be included in the
     final binary package.

This change deals with the inclusion only,
the other parts are done in different changesets.
2010-03-10 10:48:43 +01:00
Mats Kindahl
5cc3792fd3 Merging with mysql-next-mr-bugfixing 2010-03-10 10:41:19 +01:00
Marc Alff
dbdd83a4da Bug#51878 Build break in HPUX involving mysql_prlock on a client
This is a fix specific for HPUX,
for which the compiler does not resolve properly dependencies
involving unused inline functions.
(See existing comments in mysql_thread.h)

In include/mysql/psi/mysql_thread.h,
the instrumentation helpers for mysql_prlock_*
uses the pr lock apis.

These apis are implemented in mysys/thr_rwlock.c,
which is not linked to client code.

As a result, the code does not link in libmysql_r, on HPUX.

The fix is to cut dependencies explicitely,
by introducing -DDISABLE_MYSQL_RWLOCK_H,
when building client code.
2010-03-09 11:03:02 -07:00
Tor Didriksen
58d05caec1 Bug#50888 valgrind warnings in Field_timestamp::val_str
Ensure that we store the correct cached_field_type whenever we cache Field items
(in this case it allows us to compare dates as dates, rather than strings)
2010-03-09 15:54:12 +01:00
Alexander Nozdrin
cfffc11dd7 pfs_upgrade.test is a case-sensitive test. 2010-03-09 18:05:19 +03:00
Alexander Nozdrin
9c6482afc6 Auto-merge from mysql-next-mr-bugfixing. 2010-03-09 13:00:28 +03:00
Alexander Nozdrin
e37d1caf80 Auto-merge from mysql-trunk-bugfixing. 2010-03-09 12:57:58 +03:00
Alexander Nozdrin
f64f809e7b Auto-merge from mysql-next-mr. 2010-03-09 12:57:11 +03:00
Alexander Nozdrin
5f359837d3 Auto-merge from mysql-trunk. 2010-03-09 12:57:04 +03:00
Alexander Nozdrin
e8ef8a3efa Auto-merge from mysql-trunk. 2010-03-09 12:53:13 +03:00
Alexander Nozdrin
35f5e9c78c Bug#51832 mysql_upgrade failing on performance_schema tables in mysql-trunk
Before this fix, client tools (mysql_upgrade, mysqlcheck, mysqldump)
would try to process performance schema tables, leading to failures.

The fix is to align FIRST_PERFORMANCE_SCHEMA_VERSION to 5.5.3,
which is the version number of mysql-trunk where the
performance schema is first available.
2010-03-09 12:52:11 +03:00
Vladislav Vaintroub
7b67a275ad merge 2010-03-08 00:33:07 +01:00
Vladislav Vaintroub
4c9f3504f8 Fix typo (CMAKE_SIZEOF_VOIDP=>CMAKE_SIZEOF_VOID_P) 2010-03-08 00:31:06 +01:00
Marc Alff
2399b61443 Bug#51295 Build warnings in mdl.cc
Before this fix, the performance schema instrumentation
in mdl.h / mdl.cc was incomplete, causing:
- build warnings,
- no data collection for the performance schema

This fix:
- added instrumentation helpers for the new preferred
  reader read write lock, mysql_prlock_*
- implemented completely the performance schema
  instrumentation of mdl.h / mdl.cc
2010-03-07 10:50:47 -07:00
Marc Alff
2e5e7bb538 local merge 2010-03-07 10:41:51 -07:00
Marc Alff
0bbf27bd12 local merge 2010-03-07 10:21:59 -07:00
Marc Alff
9b406e6928 local merge 2010-03-07 10:10:24 -07:00
Bjorn Munch
f1ba0b4975 Bug #51511 MTRv1 unable to find mysqld binary in out-of-source cmake builds
Set $glob_bindir, like $bindir in v2
Removed some obsolete IM code rather than changing it
2010-03-06 20:22:04 +01:00
Alexander Nozdrin
ac41201cb0 Auto-merge (empty) from mysql-trunk-bugfixing. 2010-03-06 14:05:50 +03:00
Alexander Nozdrin
e8d51e0164 Auto-merge from mysql-trunk. 2010-03-06 13:49:16 +03:00
Alexander Nozdrin
994aaa8887 Auto-merge from mysql-next-mr. 2010-03-06 13:48:21 +03:00
Alexander Nozdrin
b1dab20425 Merge from mysql-trunk. 2010-03-06 13:39:56 +03:00
Alexander Nozdrin
f9a8fa19b7 Fix version & default.conf. 2010-03-06 13:38:49 +03:00
Alexander Nozdrin
c7d9455804 Merge from mysql-trunk. 2010-03-06 13:26:38 +03:00
Alexander Nozdrin
488f693c1b Fix default.conf. 2010-03-06 13:25:14 +03:00
Alexander Nozdrin
516632890d Auto-merge (empty) from mysql-trunk-bugfixing. 2010-03-06 13:22:16 +03:00
Alexander Nozdrin
b2554f59b1 Auto-merge from mysql-next-mr. 2010-03-06 13:20:51 +03:00
Alexander Nozdrin
9fe06befa0 Auto-merge from mysql-trunk. 2010-03-06 13:20:40 +03:00
Marc Alff
51f7f7f43e Bug#45194 mysql_upgrade deletes existing data in performance_schema database/schema
Before this fix, mysql_upgrade would always drop and re create
the performance_schema database.
This in theory could destroy user data created using 5.1 or older versions.

With this fix, mysql_upgrade checks the content of the
performance_schema database before droping it.
2010-03-05 08:31:01 -07:00
Guilhem Bichot
39e30ed9e0 Fix for BUG#51215 "log-error partially works with version 5.5": WL 4738 (reengineering of server variables)
had broken the 5.1 behaviour of --log-error: --log-error without argument sent to stderr instead of writing
to a file with an autogenerated name.
2010-03-05 14:08:21 +01:00
Alexander Nozdrin
dad94c24af Make funcs_1.myisam_views experimental on Solaris due to Bug 50595. 2010-03-05 12:28:45 +03:00
Alexander Barkov
a45955793e Fixing non-determenistic results. 2010-03-05 12:17:19 +04:00
Marc Alff
7ceb3b42e4 Bug#51738 Unit test pfs_instr-t crashes
The unit test pfs_instr-t:
- generates a very long (10,000) bytes file name
- calls find_or_create_file.

This leads to a buffer overflow in mysys in my_realpath(),
because my_realpath and mysys file APIs in general do not
test for input parameters: mysys assumes every file name
is less that FN_REFLEN in length.

Calling find_or_create_file with a very long file name is likely
to happen when instrumenting third party code that does not use mysys,
so this test is legitimate.

The fix is to make find_or_create_file in the performance schema
more robust in this case.
2010-03-04 18:36:54 -07:00
Marc Alff
f6a8202311 Bug#51741 Unit test pfs-t failing in mysql-next-mr-bugfixing
The root cause of the failure is that when
Bug#51447 performance schema evil twin files
was fixed, instrumented file names got normalized.

The pfs-t unit test depends on this file normalization,
but it was not updated.

This fix aligns pfs-t.cc lookup_file_by_name()
with the logic in pfs_instr.cc find_or_create_file().
2010-03-04 18:10:27 -07:00
Alexander Nozdrin
732103fcb5 Auto-merge from mysql-next-mr-bugfixing. 2010-03-04 18:39:32 +03:00
Alexander Nozdrin
2155847a29 Auto-merge from mysql-next-mr-bugfixing. 2010-03-04 18:34:29 +03:00
Joerg Bruehe
4667d673d6 Upmerge changes to "COPYING" (formatting, FSF addressi, still GPL v2 as of 1991)
and "README" (header part: "This is a release of MySQL ...")
from "trunk" to "next-mr".
2010-03-04 14:55:08 +01:00
Joerg Bruehe
e1a0e7b545 Update "README" (the list of contributed software and their licenses)
by adding the header part "This is MySQL ...".
2010-03-04 14:45:11 +01:00
Joerg Bruehe
1d6f05b866 Upmerge the new formatting of "COPYING" from 5.1 to "trunk",
the license remains to be the GPL Version 2, June 1991
2010-03-04 14:35:14 +01:00
Joerg Bruehe
fc4d400a3e Use a new version of "COPYING", the GPL text.
This is *no* change in contents, the differences are formatting only
and an address update of the FSF. It continues to be Version 2, June 1991.
2010-03-04 14:26:27 +01:00
Alexander Barkov
79cecfb55e Bug#51675 Server crashes on inserting 4 byte char. after ALTER TABLE to 'utf8mb4'
Bug#51676 Server crashes on SELECT, ORDER BY on 'utf8mb4' column
An additional fix. We should use 0xFFFD as a weight for supplementary
characters, not the "weight for character U+FFFD".
2010-03-04 16:02:30 +04:00
Alexander Barkov
19bda05a3c Bug#51166 mysql client defaults to charset 'ascii'
Using latin1 client character set for ASCII locales:
- because ascii is not a build-in character set
- for better backward compatibility
2010-03-04 15:13:46 +04:00
Alexander Barkov
2b0ff48baa A joint patch for:
Bug#51675 Server crashes on inserting 4 byte char. after ALTER TABLE to 'utf8mb4' 
Bug#51676 Server crashes on SELECT, ORDER BY on 'utf8mb4' column
2010-03-04 15:00:32 +04:00
Mattias Jonsson
71cc817b29 Bug#51347: assertion with show create table + partition by columns
on decimal column

The problem was that there was no check to disallow DECIMAL
columns in the code (it was accepted as if it was INTEGER).

Solution was to correctly disallow DECIMAL columns in
COLUMNS partitioning. As documented.
2010-03-04 11:24:39 +01:00
Horst.Hunger
37c3268cc1 Push the test to next-mr-bar2 to let them run in pushbuild. 2010-03-04 08:34:44 +01:00
Alexander Nozdrin
4f08c6d0e5 A follow-up on WL#5154 and WL#5182: remove forgotten options. 2010-03-03 22:22:02 +03:00