[Commits] Rev 3224: MDEV-103: 'debug' is disabled in this build warnings causes tests to fail in file:///H:/bzr/5.5/

Vladislav Vaintroub wlad at montyprogram.com
Fri Jan 20 02:57:47 EET 2012


At file:///H:/bzr/5.5/

------------------------------------------------------------
revno: 3224
revision-id: wlad at montyprogram.com-20120120005734-zk161ipkk0a9g9sz
parent: wlad at montyprogram.com-20120119174156-8u0hgcdkgofrw3ea
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 5.5
timestamp: Fri 2012-01-20 01:57:34 +0100
message:
  MDEV-103: 'debug' is disabled in this build warnings causes tests to fail
  
  The root cause is that after recent fixes around --debug variable (lp:909051)
  the variable is now available in both release and debug builds, such that MTR
  cannot tell a debug compiled server from optimized one.
  
  To fix, assign a special default value 'disabled' for 'debug' variable in optimized build
  and fix MTR to check for this special value to recognize optimized build.
-------------- next part --------------
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-01-16 19:58:00 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-01-20 00:57:34 +0000
@@ -2826,8 +2826,9 @@
 
 sub check_debug_support ($) {
   my $mysqld_variables= shift;
-
-  if ( ! $mysqld_variables->{'debug'} )
+  my $debug_var= $mysqld_variables->{'debug'};
+  
+  if ( !$debug_var || $debug_var eq "disabled")
   {
     #mtr_report(" - binaries are not debug compiled");
     $debug_compiled_binaries= 0;

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-01-16 19:16:35 +0000
+++ b/sql/mysqld.cc	2012-01-20 00:57:34 +0000
@@ -1182,7 +1182,7 @@
 #ifndef DBUG_OFF
 static const char* default_dbug_option;
 #endif
-static const char *current_dbug_option;
+static const char *current_dbug_option="disabled";
 #ifdef HAVE_LIBWRAP
 const char *libwrapName= NULL;
 int allow_severity = LOG_INFO;



More information about the commits mailing list