Commit graph

60276 commits

Author SHA1 Message Date
Alexander Nozdrin
c3eabe01fc Auto-merge from mysql-next-mr. 2009-12-25 16:22:25 +03:00
unknown
7e1e219829 Backport Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with --slave-load-tm
The 'rpl_cross_version' fails on mysql-next-mr-bugfixing as following:
mysqltest: In included file "./include/setup_fake_relay_log.inc": At line 80: query
'select './$_fake_filename-fake.000001\n' into dumpfile '$_fake_relay_index'' failed:
1290: The MySQL server is running with the --secure-file-priv option so it cannot execute
this statement.

To fix the problem by removeing the --secure-file-priv option
for adapting the update of the 'setup_fake_relay_log.inc'.
2009-12-25 14:12:49 +08:00
Vladislav Vaintroub
0940d7d204 merge 2009-12-25 03:24:00 +01:00
Vladislav Vaintroub
f2d4808fbb enable Cygwin build again 2009-12-25 03:22:23 +01:00
Alexey Kopytov
387cb3c99b Automerge. 2009-12-25 00:09:18 +03:00
Alexey Kopytov
ac6b2605ff Addendum to the backport patch for WL#2934:
Unlike other platforms --mfpmath=sse is the default 
gcc mode on Mac OS X Intel. So it is unnecessary
to switch FPU to double precision mode (in fact,
it even breaks some math library functions).
2009-12-25 00:06:53 +03:00
Sergei Golubchik
56deea0dd7 merged 2009-12-24 21:18:53 +01:00
Vladislav Vaintroub
99c9c3bcf2 merge 2009-12-24 16:56:52 +01:00
Luis Soares
c5f7044d1a Valgrind warnings that have poped up ever since WL#5151 was pushed.
This fixes two more warnings for tests: 
  - rpl_row_colSize
  - rpl_typeconv
2009-12-24 15:55:46 +00:00
Alfranio Correia
e284f50681 merge mysql-next-mr --> mysql-5.1-rpl-merge 2009-12-24 11:51:30 +00:00
Sergei Golubchik
025d86a60a slightly more complete mysqld--help test 2009-12-24 12:30:23 +01:00
Alexander Nozdrin
7d720c0df3 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-24 10:31:09 +03:00
Alexander Nozdrin
aef6bb4677 Auto-merge from mysql-next-mr. 2009-12-24 10:30:13 +03:00
Alexander Nozdrin
6b34f35875 Auto-merge from mysql-trunk. 2009-12-24 10:30:04 +03:00
Alexander Nozdrin
10eab6ccb0 Manual merge from mysql-trunk.
Conflicts:
  - storage/myisam/mi_static.c
2009-12-24 10:12:07 +03:00
Alexander Nozdrin
0b74a91126 Postfix for Bug#37408 (fix for Bug#49898). 2009-12-24 10:10:05 +03:00
Vladislav Vaintroub
b3debb1de8 use systemtap on linux if installed, for dtrace functionality 2009-12-24 07:21:05 +01:00
unknown
b71d8c00ba Enable rpl_get_master_version_and clock and rpl_cross_version
as the bug#46931 and bug#43913 have been closed.
2009-12-24 11:01:39 +08:00
Luis Soares
dcf8e11536 BUG#49836: Replication of geometric fields is broken after WL#5151
Metadata for geometric fields was not being properly stored by
the slave in its the table definition. This happened because
MYSQL_TYPE_GEOMETRY was not included in the 'switch... case' that
handles field metadata according to the field type. Therefore, it
would default to 0, leading to always have a mismatch between
master's field and slave fields'. 

We fix this by deploying the missing 'case MYSQL_TYPE_GEOMETRY:'.

mysql-test/extra/rpl_tests/type_conversions.test:
  Added some tests for blob fields and also the particular
  case for replicating from/into BLOB into/from GEOMETRY.
sql/field.h:
  As requested by Mats, reverted function added by him in
  changeset:
  http://lists.mysql.com/commits/95313
2009-12-24 01:07:35 +00:00
Sergei Golubchik
5b9ed28575 backport typos found 2009-12-23 17:51:03 +01:00
Vladislav Vaintroub
b53528c678 recompile partition plugin for embedded server, its behavior depends on WITH_EMBEDDED_SERVER preprocessor definition 2009-12-23 16:37:22 +01:00
Alexander Nozdrin
4a489a2592 Merge default.conf from mysql-trunk. 2009-12-23 15:10:25 +03:00
Alexander Nozdrin
5be5b55ff4 Fix default.conf. 2009-12-23 15:09:31 +03:00
Alexander Nozdrin
d6cc32a047 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-23 15:06:10 +03:00
Sergei Golubchik
b188b1bfcc fixed "engine not found" error in open_binary_frm
corrected rotten test
2009-12-23 13:06:03 +01:00
Alexey Kopytov
924e048e98 Fixed test failures from the 'parts' suite introduced by
backporting WL#2934.
2009-12-23 15:04:32 +03:00
Alexander Nozdrin
ba60b39ca3 Backporting fix for Bug#49834 from mysql-next-mr-bugfixing
into mysql-trunk-bugfixing.

Original revision:
------------------------------------------------------------
revision-id: vvaintroub@mysql.com-20091222115311-bam0xorumd8gvjyo
parent: mattias.jonsson@sun.com-20091221104426-x2e6c93x8iik4fo0
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: mysql-next-mr-bugfixing
timestamp: Tue 2009-12-22 12:53:11 +0100
message:
  Bug#49834 - fixed a bug introduced by mismerge.
  restore original innobase version
------------------------------------------------------------
2009-12-23 15:03:51 +03:00
Alfranio Correia
3543244a12 merge mysql-5.1-rep+2 --> mysql-5.1-rep+2-delivery1 2009-12-23 12:02:57 +00:00
Alfranio Correia
2a765c87e6 merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 2009-12-23 11:52:03 +00:00
Vladislav Vaintroub
bd7f0c79a5 merge 2009-12-23 12:47:14 +01:00
Vladislav Vaintroub
ee34d32734 merge 2009-12-23 12:44:40 +01:00
Alexander Nozdrin
cb8b607187 Auto-merge from mysql-trunk-bugfixing. 2009-12-23 13:43:52 +03:00
unknown
f87816b450 Bug #47863 binlog_format should be writable only at transaction boundaries
When @@session.binlog_format is modified inside a transaction,
it can cause slave to go out of sync.
      
To fix the problem, make the session variable 'binlog_format' 
read-only inside a transaction.


mysql-test/suite/binlog/r/binlog_format_switch_inside_trans.result:
  Test result for bug#47863.
mysql-test/suite/binlog/t/binlog_format_switch_inside_trans.test:
  Added test file to verify if the session variable 'binlog_format' 
  is read-only inside a transaction and in sub-statements.
sql/set_var.cc:
  Added code to make the session variable 'binlog_format'
  read-only inside a transaction.
2009-12-23 18:43:45 +08:00
Alexander Nozdrin
8cdcb078d3 Auto-merge from mysql-next-mr. 2009-12-23 13:42:03 +03:00
Alexander Nozdrin
a987a27dc7 Auto-merge from mysql-trunk. 2009-12-23 13:41:55 +03:00
Sergei Golubchik
3bfb8797d0 fix atomic/solaris.h to conform
remove duplicated boilerplate code
2009-12-23 09:27:41 +01:00
Alexey Kopytov
b8db5f5c74 Fixed more PB2 test failures introduced by backporting WL#2934. 2009-12-23 08:52:18 +03:00
Vladislav Vaintroub
9ba35b040b restore flaky loadxml test, fix solaris plugin load using -lpthread instead of -lthread 2009-12-23 04:44:25 +01:00
Vladislav Vaintroub
d7df4abf4e fix loadxml test, it tries to disconnect without reading results. when EXTRA_DEBUG is enabled, mtr complains 2009-12-23 02:00:18 +01:00
Vladislav Vaintroub
4e84444e01 merge 2009-12-22 22:24:55 +01:00
Vladislav Vaintroub
f415cd2911 merge 2009-12-22 22:05:04 +01:00
Alexey Kopytov
c9855862f7 Fixed more PB2 test failures introduced by backporting WL#2934. 2009-12-22 23:55:56 +03:00
Vladislav Vaintroub
dcdaa8f4fc Fix build error with CMake 2.8 (mysql_stmt_next_result not exported
by shared embedded library)
2009-12-22 21:49:37 +01:00
Alexey Kopytov
4f3e6f7a6a Fixed a Windows build failure 2009-12-22 21:10:31 +03:00
Alexey Kopytov
12f364ece7 Backport of WL #2934: Make/find library for doing float/double
to string conversions and vice versa" 
Initial import of the dtoa.c code and custom wrappers around it 
to allow its usage from the server code. 
 
Conversion of FLOAT/DOUBLE values to DECIMAL ones or strings 
and vice versa has been significantly reworked. As the new 
algoritms are more precise than the older ones, results of such 
conversions may not always match those obtained from older 
server versions. This in turn may break compatibility for some 
applications. 
 
This patch also fixes the following bugs: 
- bug #12860 "Difference in zero padding of exponent between 
Unix and Windows" 
- bug #21497 "DOUBLE truncated to unusable value" 
- bug #26788 "mysqld (debug) aborts when inserting specific 
numbers into char fields" 
- bug #24541 "Data truncated..." on decimal type columns 
without any good reason"
2009-12-22 19:23:13 +03:00
Alexey Botchkov
01b8186b06 merging. 2009-12-22 16:39:06 +04:00
Alexey Botchkov
4431827f2a Bug#46570 test udf fails with valgrind
the value obtained by String::c_ptr() method not always
    has the ending zero. Particularly in this bug the
    dlsym() expects zero-ending string.
    The String::c_ptr_safe() is more correct here.

per-file comments:
  sql/item_func.cc
Bug#46570      test udf fails with valgrind
    c_ptr_safe() used for UDF parameters as the library expects
    zero-ending strings.
2009-12-22 16:37:21 +04:00
Luis Soares
444b24eec2 Fixing tree_name. 2009-12-22 12:31:36 +00:00
Vladislav Vaintroub
7c8220a136 merge 2009-12-22 13:06:31 +01:00
Vladislav Vaintroub
0d0ff32c6e Bug#49834 - fixed a bug introduced by mismerge.
restore original innobase version
2009-12-22 12:53:11 +01:00