Commit graph

60276 commits

Author SHA1 Message Date
Vladislav Vaintroub
ba23a0139d merge 2010-01-18 23:00:48 +01:00
Vladislav Vaintroub
10a7c78ed4 just in case old linux is used, add _GNU_SOURCE preprocessor constant to be able to see pthread_rwlock_t 2010-01-18 21:38:30 +01:00
Vladislav Vaintroub
a87f4e1bbb Fix some problems found by kent.
-lm is sometimes not linked, which causes errors about undefined rint()
- FreeBSD embedded library does not link with the flags returned by mysql_config
 (added -lcrypt to LIBS, whereby causing overlinking in case of normal non-embedded client)
2010-01-18 21:19:24 +01:00
Alexander Nozdrin
33c075e842 Enable sys_vars and perfschema test suites
for regular PB builds.
2010-01-18 15:01:11 +03:00
Alexander Nozdrin
3408d7c2da Auto-merge from mysql-5.1-rpl-merge. 2010-01-18 14:53:35 +03:00
Vladislav Vaintroub
508959134b Bug#50362:
Init MY_PTHREAD_MUTEX_FAST prior to first usage to avoid crash on
FreeBSD
2010-01-16 05:04:02 +01:00
Vladislav Vaintroub
e0b7046b4f storage/innobase/CMakeLists.txt:
Bring innobase's CMakeLists.txt  in sync with latest
  plug.in (fix preprocessor macro names and feature tests). Thanks to Vasil Dimov for spotting this.
2010-01-16 04:56:35 +01:00
Vladislav Vaintroub
0bdd08d996 Fix output name of embedded library,
honor OUTPUT_NAME in MERGE_LIBRARIES macro
2010-01-15 19:07:45 +01:00
Kent Boortz
2ed249e9e0 Added support for product names in package names 2010-01-15 15:11:59 +01:00
unknown
5d27920514 Fix for perfschema.binlog_stmt failure:
Problem: The test case failed because: (i) warning text in 
         result file differed from the warning output by the 
         server, and (ii) binlog contents in result file did
         not show the statements logged wrapped in BEGIN/COMMIT
         as it is the case after WL 2687.
      
Solution: We update the result file, but first we change the
          unsafe warning text to also refer to performance_schema
          table(s). This required changing the result files for
          existing test cases that provide output for warnings 
          related to ER_BINLOG_UNSAFE_SYSTEM_TABLE. "Grepping" in
          result files, shows that only binlog_unsafe contained
          reference to such a warning.
      
          We also update the result file with the missing 
          BEGIN/COMMIT statements.
2010-01-15 13:06:33 +08:00
Vladislav Vaintroub
76630626a2 port some mysql_binary_distribution hacks to cmake 2010-01-15 01:21:43 +01:00
Vladislav Vaintroub
ab9d822350 fix for 32 bit Linux problem reported by Timothy 2010-01-15 00:54:43 +01:00
Vladislav Vaintroub
cd45a44180 Post-merge fixes , define HAVE_RWLOCK_T on Solaris define
DISABLE_MYSQL_THREAD_H for strings
Also, enable unittests for perfschema
2010-01-14 18:42:28 +00:00
Alfranio Correia
3f1899e858 Removed garbage from the mysqld--help-win 2010-01-14 16:50:45 +00:00
Alfranio Correia
dd5d5d32fc merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-14 16:44:33 +00:00
Alfranio Correia
b4c0c1550c merge mysql-next-mr --> mysql-5.1-rpl-merge
Conflicts:
  Text conflict in sql/sql_insert.cc
2010-01-14 16:02:55 +00:00
Vladislav Vaintroub
6b6f0ca461 merge 2010-01-14 16:07:27 +01:00
Vladislav Vaintroub
905f48b6f3 fix syntax error in INSTALL cmake command 2010-01-14 15:02:27 +01:00
Vladislav Vaintroub
4d49915cf2 Remove support for "make install" DESTDIR - did not work as expected 2010-01-14 14:54:32 +01:00
Alfranio Correia
1b09e10508 merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 2010-01-14 12:59:58 +00:00
Alfranio Correia
eef6ea03d2 Augmented the rpl_ndb_binlog_format_errors to verify if a slave running in the
STMT mode aborts the SQL Thread if it receives changes in ROW mode and such
changes are not processed.
2010-01-14 12:52:28 +00:00
Alexander Nozdrin
a6165accb3 Auto-merge from mysql-next-mr. 2010-01-14 12:00:08 +03:00
Vladislav Vaintroub
b4959030e4 merge 2010-01-14 00:37:44 +00:00
Vladislav Vaintroub
0c4446c617 Fix CFLAGS passed to mysql_config, in case makefile generator is Makefile based 2010-01-14 00:35:07 +00:00
Luis Soares
18a8f3c8cc Disabled binlog_unsafe due to BUG#50312. 2010-01-13 23:27:22 +00:00
Vladislav Vaintroub
bcb73f8c75 WITH_MYSQLD_LIBS=>WITH_MYSQLD_LDFLAGS 2010-01-14 00:09:40 +01:00
Vladislav Vaintroub
3940981757 Do not link with mtmalloc on Solaris.
add WITH_MYSQLD_LIBS for extra linker flags for mysqld
2010-01-13 21:56:51 +01:00
Vladislav Vaintroub
2da394c645 adjust test result file 2010-01-13 21:31:33 +01:00
Vladislav Vaintroub
937bea7551 merge 2010-01-13 21:16:20 +01:00
Vladislav Vaintroub
b84abb3c40 merge 2010-01-13 21:14:42 +01:00
Vladislav Vaintroub
31f1d18e2c merge 2010-01-13 16:53:22 +01:00
Vladislav Vaintroub
8807608561 use _GNU_SOURCE on Linux to have all useful definitions (pthread_rwlock_t) for example 2010-01-13 16:52:14 +01:00
Alfranio Correia
85df1ce4b4 merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-13 13:27:25 +00:00
Mats Kindahl
9b4470ecd4 Merging with mysql-5.1-rep+2-delivery1 2010-01-13 14:00:48 +01:00
Mats Kindahl
cf40bc3f56 Replacing error variable that was lost. 2010-01-13 13:59:58 +01:00
Mats Kindahl
4abdd9f14a Merging with mysql-5.1-rep+2-delivery1 2010-01-13 13:37:01 +01:00
Vladislav Vaintroub
f3460b2132 Add WITH_FAST_MUTEXES option (non-debug configurations only) 2010-01-13 13:33:32 +01:00
Alfranio Correia
40949a3110 merge mysql-next-mr --> mysql-5.1-rpl-merge
Conflicts:
  Text conflict in sql/log.cc
  Text conflict in sql/slave.cc
  Text conflict in sql/sql_base.cc
2010-01-13 12:22:34 +00:00
Mats Kindahl
a561e53943 WL#5151: Conversion between different types when
replicating

Replace c_ptr() calls with c_ptr_safe() calls to
avoid valgrind warnings.

Adding code to to handle the case that no metadata
was present in the table map for the column.

Allow first parameter to unpack_row() to be NULL,
in which case no source tables is used and hence
no checks nor conversions are done.

Clarifying some comments and fixing documentation
for unpack_row().
2010-01-13 12:58:42 +01:00
Luis Soares
26b12adb5d Makes slave_type_conversions_basic to be skipped in embedded
run in PB2 as it ought to be. Otherwise test will fail because
variable is no recognized:

1193: Unknown system variable 'slave_type_conversions'
2010-01-13 08:29:23 +00:00
Luis Soares
5f42365a93 Fixes two remaining test failures:
- mysqld--help-win
    Updated result so that it contains missing
    value for slave-type-conversions

  - rpl_idempotency
    This seems a bad merge. In BUG#39934, the contents of
    this file had been split into rpl_row_idempontency and
    rpl_idempotency. The patch was pushed to 5.1-rep+3 which
    was later merged in rep+2-delivery1 which in turn was
    merged in 5.1-rpl-merge. Now while merging next-mr in
    5.1-rpl-merge, the file got back it's old content (which
    is in rpl_row_idempotency now because of BUG#39934). This
    cset reverts the bad merge:

    bzr merge -r revid:dao-gang.qu@sun.com-20100112120709-ioxp11yl9bvquaqd..\
    before:revid:dao-gang.qu@sun.com-20100112120709-ioxp11yl9bvquaqd\
    suite/rpl/t/rpl_idempotency.test
2010-01-13 00:23:07 +00:00
Luis Soares
9d89069d64 Fixes one more failure in gcov run:
- sys_vars.rpl_init_slave_func
    Added suppression for the unsafe warning.
2010-01-12 23:22:34 +00:00
Marc Alff
253d7f2501 Merge mysql-next-mr (revno 2958) --> mysql-next-mr-marc 2010-01-12 10:58:38 -07:00
Luis Soares
ca15e2779f Fixes for three test failures:
- sys_vars.all_vars:
   Added test case for slave_type_conversions variable
 - rpl_row_idempotency
   Removed ER_SLAVE_AMBIGOUS_EXEC_MODE (which was removed by WL 4738)
   from the test case. Using ER_WRONG_VALUE_FOR_VAR instead.
 - mysqld--help-win
   Added missing help for --slave-type-conversions from the
   result file.
2010-01-12 17:52:02 +00:00
Alexander Nozdrin
50561ab010 Enable WL#4435. 2010-01-12 19:48:28 +03:00
Alexander Nozdrin
51caeae915 Auto-merge from mysql-next-mr-bugfixing. 2010-01-12 19:21:42 +03:00
unknown
802ba52bc5 Auto merge. 2010-01-12 20:13:45 +08:00
unknown
16e15e6952 Manual merge from next-mr. 2010-01-12 20:07:09 +08:00
Marc Alff
e0e0f9e3d4 WL#2360 Performance schema
Part V: performance schema implementation
2010-01-11 18:47:27 -07:00
Vladislav Vaintroub
5c871c9017 Workaround a linker problem on OSX 10.4 2010-01-12 00:31:50 +01:00