after-merge

*correct* disabling of dbug in mysql-test-run


include/atomic/gcc_builtins.h:
  after-merge
mysql-test/lib/mtr_report.pl:
  after-merge
mysql-test/mysql-test-run.pl:
  *correct* disabling of dbug in mysql-test-run
mysql-test/r/ps_maria.result:
  after-merge
mysql-test/t/crash_commit_before-master.opt:
  *correct* disabling of dbug in mysql-test-run
mysql-test/t/maria-recovery-big-master.opt:
  *correct* disabling of dbug in mysql-test-run
mysql-test/t/maria-recovery-bitmap-master.opt:
  *correct* disabling of dbug in mysql-test-run
mysql-test/t/maria-recovery-master.opt:
  *correct* disabling of dbug in mysql-test-run
sql/mysqld.cc:
  --disable-debug

include/atomic/gcc_builtins.h

@@ -25,7 +25,10 @@
 #ifdef MY_ATOMIC_MODE_DUMMY
 #define make_atomic_load_body(S)   ret= *a
 #define make_atomic_store_body(S)  *a= v
+#define MY_ATOMIC_MODE "gcc-builtins-up"
+
 #else
+#define MY_ATOMIC_MODE "gcc-builtins-smp"
 #define make_atomic_load_body(S)                    \
   ret= __sync_fetch_and_or(a, 0);
 #define make_atomic_store_body(S)                   \

mysql-test/lib/mtr_report.pl

@@ -386,7 +386,7 @@ sub mtr_report_stats ($) {
                 # rpl_temporary has an error on slave that can be ignored
                 ($testname eq 'rpl.rpl_temporary' and
                  (/Slave: Can\'t find record in \'user\' Error_code: 1032/
-                 ))
+                 )) or
                 # maria-recovery.test has warning about missing log file
                 /Can't get stat of '.*maria_log.00/ or
                 # and about marked-corrupted table

mysql-test/mysql-test-run.pl

@@ -427,7 +427,7 @@ sub main () {
     my $tests= collect_test_cases($opt_suites);
 
     # Turn off NDB and other similar options if no tests use it
-    my ($need_ndbcluster,$need_im);
+    my ($need_ndbcluster,$need_im, $need_debug);
     foreach my $test (@$tests)
     {
       next if $test->{skip};
@@ -435,6 +435,7 @@ sub main () {
       if (!$opt_extern)
       {
 	$need_ndbcluster||= $test->{ndb_test};
+        $need_debug||=$test->{need_debug};
 	$need_im||= $test->{component_id} eq 'im';
 
 	# Count max number of slaves used by a test case
@@ -460,6 +461,11 @@ sub main () {
       $opt_skip_ndbcluster_slave= 1;
     }
 
+    if ( !$need_debug && !$opt_debug)
+    {
+      $opt_debug=0;
+    }
+
     # Check if slave cluster can be skipped
     if ($max_slave_num == 0)
     {
@@ -3127,8 +3133,8 @@ sub install_db ($$) {
   mtr_add_arg($args, "--datadir=%s", $data_dir);
   mtr_add_arg($args, "--loose-skip-innodb");
   mtr_add_arg($args, "--loose-skip-ndbcluster");
-  mtr_add_arg($args, "--sync-frm=0");
-  mtr_add_arg($args, "--loose-debug-on=0");
+  mtr_add_arg($args, "--disable-sync-frm");
+  mtr_add_arg($args, "--loose-disable-debug");
   mtr_add_arg($args, "--tmpdir=.");
   mtr_add_arg($args, "--core-file");
 
@@ -3922,8 +3928,7 @@ sub mysqld_arguments ($$$$) {
   mtr_add_arg($args, "%s--datadir=%s", $prefix,
 	      $mysqld->{'path_myddir'});
 
-  mtr_add_arg($args, "--sync-frm=0");  # Faster test
-  mtr_add_arg($args, "--loose-debug-on=0");
+  mtr_add_arg($args, "--disable-sync-frm");  # Faster test
 
   if ( $mysql_version_id >= 50106 )
   {
@@ -4052,10 +4057,17 @@ sub mysqld_arguments ($$$$) {
 
   } # end slave
 
-  if ( $opt_debug )
+  if ( defined $opt_debug )
   {
-    mtr_add_arg($args, "%s--debug=d:t:i:A,%s/log/%s%s.trace",
-		$prefix, $path_vardir_trace, $mysqld->{'type'}, $sidx);
+    if ( $opt_debug )
+    {
+      mtr_add_arg($args, "%s--debug=d:t:i:A,%s/log/%s%s.trace",
+                  $prefix, $path_vardir_trace, $mysqld->{'type'}, $sidx);
+    }
+    else
+    {
+      mtr_add_arg($args, "--disable-debug");
+    }
   }
 
   mtr_add_arg($args, "%s--key_buffer_size=1M", $prefix);

mysql-test/r/ps_maria.result

@@ -1304,12 +1304,11 @@ a	b
 set @arg00=NULL;
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
-Warnings:
-Warning	1048	Column 'a' cannot be null
+ERROR 23000: Column 'a' cannot be null
 select a,b from t1 order by a;
 a	b
-0	two
 1	one
+2	two
 3	three
 4	four
 set @arg00=0;

mysql-test/t/crash_commit_before-master.opt

---skip-stack-trace --skip-core-file --loose-debug-on=1
+--skip-stack-trace --skip-core-file

mysql-test/t/maria-recovery-big-master.opt

---skip-stack-trace --skip-core-file --loose-debug-on=1
-
+--skip-stack-trace --skip-core-file

mysql-test/t/maria-recovery-bitmap-master.opt

---skip-stack-trace --skip-core-file --loose-debug-on=1
-
+--skip-stack-trace --skip-core-file

mysql-test/t/maria-recovery-master.opt

---skip-stack-trace --skip-core-file --loose-debug-on=1 --maria-log-dir-path=../tmp
-
+--skip-stack-trace --skip-core-file --maria-log-dir-path=../tmp

sql/mysqld.cc

@@ -7444,7 +7444,14 @@ mysqld_get_one_option(int optid,
 {
   switch(optid) {
   case '#':
+    if (*argument == '0')
+    {
+      DEBUGGER_OFF;
+      break;
+    }
     DEBUGGER_ON;
+    if (*argument == '1')
+      break;
     DBUG_SET_INITIAL(argument ? argument : default_dbug_option);
     opt_endinfo=1;				/* unireg: memory allocation */
     break;