Commit graph

61409 commits

Author SHA1 Message Date
Alexander Barkov
a388efbffa An additional fix for WL#1213 4-byte UTF8
- Fixing crash on attempt to create a fulltext index with an utf8mb4 column
- fixing wrong border width  for supplementary characters in mysql client:

  mysql --default-character-set=utf8mb4 -e "select concat(_utf32 0x20000,'a')"
2010-03-11 14:34:11 +04:00
He Zhenxing
99d1b2bd9a Auto merge 2010-03-11 10:58:20 +08:00
He Zhenxing
9d28e0f361 Enable rpl_semi_sync test on Windows 2010-03-11 10:56:46 +08:00
He Zhenxing
3760845b72 Auto merge from 5.1-rep-semisync 2010-03-11 10:22:18 +08:00
Davi Arnaut
09f9014238 Automatic merge. 2010-03-10 15:44:58 -03:00
Joerg Bruehe
b016f1b2ce Automerge into next-mr-bugfixing. 2010-03-10 17:26:49 +01:00
Alexander Nozdrin
5c7687c2ef Auto-merge from mysql-next-mr-bugfixing. 2010-03-10 17:58:35 +03:00
Konstantin Osipov
861b86d678 A fix and a test case for Bug#51710 FLUSH TABLES <view> WITH READ
LOCK kills the server.

Prohibit FLUSH TABLES WITH READ LOCK application to views or
temporary tables.
Fix a subtle bug in the implementation when we actually
did not remove table share objects from the table cache after 
acquiring exclusive locks.
2010-03-10 17:35:25 +03:00
Davi Arnaut
30cb1779ed Bug#33669: Transactional temporary tables do not work under --read-only
The problem was that in read only mode (read_only enabled),
the server would mistakenly deny data modification attempts
for temporary tables which belong to a transactional storage
engine (eg. InnoDB).

The solution is to allow transactional temporary tables to be
modified under read only mode. As a whole, the read only mode
does not apply to any kind of temporary table.
2010-03-10 10:36:40 -03:00
Joerg Bruehe
4d75f6e251 Part of the fixes for bug#49022
Plugins included into bin release cannot be
    installed on debug version of server

Ensure that the plugin files of the debug build
get into the optimized tree, so that they find
their way into the final RPMs.
2010-03-10 14:36:27 +01:00
Alexander Nozdrin
93e4d17412 Auto-merge (empty) from mysql-trunk-bugfixing. 2010-03-10 16:35:38 +03:00
Alexander Nozdrin
29577eddfb Auto-merge (empty) from mysql-next-mr. 2010-03-10 16:34:45 +03:00
Alexander Nozdrin
9661d1ef34 Auto-merge from mysql-trunk. 2010-03-10 16:34:12 +03:00
Alexander Nozdrin
feb9835245 Auto-merge (empty) from mysql-trunk. 2010-03-10 16:27:18 +03:00
Alexander Nozdrin
9ad6cb15ad Auto-merge from mysql-next-mr. 2010-03-10 16:26:34 +03:00
Alexander Nozdrin
f9b0b01466 Auto-merge from mysql-next-mr-bugfixing. 2010-03-10 16:22:52 +03: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