From: Date: November 16 2008 12:30pm Subject: bzr commit into mysql-6.0-falcon-team branch (olav:2917) Bug#39260 List-Archive: http://lists.mysql.com/commits/58885 X-Bug: 39260 Message-Id: <20081116113057.15620.qmail@khepri11> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/os136802/mysql/develop/repo/falcon-bug39260/ 2917 Olav Sandstaa 2008-11-16 Fix to bug#39260 Falcon should detect that it has been compiled without support for C++ exception This is the second patch for handling the problem of Falcon being compiled without support for C++ exceptions. Changes how Falcon behaves when it detects that it has been compiled without exception support from returning an error code to the server (as implemeneted in first patch) to crash the process. The rationale for this is that this should only happen in rare occations where configure and/or compile has been done with wrong compiler options. modified: storage/falcon/ha_falcon.cpp per-file messages: storage/falcon/ha_falcon.cpp Change the handling of lack of C++ exception support in the binary from returning an error code from intialization of Falcon to crash the process. === modified file 'storage/falcon/ha_falcon.cpp' === modified file 'storage/falcon/ha_falcon.cpp' --- a/storage/falcon/ha_falcon.cpp 2008-11-13 13:27:13 +0000 +++ b/storage/falcon/ha_falcon.cpp 2008-11-16 11:30:45 +0000 @@ -182,8 +182,8 @@ if (!checkExceptionSupport()) { - sql_print_error("Falcon must be compiled with C++ exceptions enabled to work"); - DBUG_RETURN(1); + sql_print_error("Falcon must be compiled with C++ exceptions enabled to work. Please adjust your compile flags."); + FATAL("Falcon exiting process.\n"); } StorageHandler::setDataDirectory(mysql_real_data_home);