3637 Tor Didriksen 2011-11-22
Remove -fno-exceptions from CXX flags
modified:
storage/innobase/CMakeLists.txt
3636 Tor Didriksen 2011-11-22
WL#6012 - Use the same compiler for InnoDB as the server (C++)
Post-push fix, ftsparse(void*) rather than ftsparse()
modified:
storage/innobase/fts/fts0pars.cc
3635 Sunny Bains 2011-11-22
Make the test deterministic by ordering the output on trx_query.
modified:
mysql-test/suite/innodb/r/innodb-ac-non-locking-select.result
mysql-test/suite/innodb/t/innodb-ac-non-locking-select.test
=== modified file 'storage/innobase/CMakeLists.txt'
--- a/storage/innobase/CMakeLists.txt 2011-11-11 10:06:05 +0000
+++ b/storage/innobase/CMakeLists.txt 2011-11-22 07:37:20 +0000
@@ -39,7 +39,9 @@ IF(UNIX)
ENDIF()
IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+# After: WL#5825 Using C++ Standard Library with MySQL code
+# we no longer use -fno-exceptions
+# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
ENDIF()
# Enable InnoDB's UNIV_DEBUG and UNIV_SYNC_DEBUG in debug builds
=== modified file 'storage/innobase/fts/fts0pars.cc'
--- a/storage/innobase/fts/fts0pars.cc 2011-11-16 15:31:08 +0000
+++ b/storage/innobase/fts/fts0pars.cc 2011-11-22 07:26:02 +0000
@@ -1907,7 +1907,7 @@ fts_parse(
/*======*/
fts_ast_state_t* state)
{
- extern int ftsparse(); /* To shutup the compiler */
+ extern int ftsparse(void*); /* To shutup the compiler */
return(ftsparse(state));
}
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (tor.didriksen:3635 to 3637) | Tor Didriksen | 22 Nov |
