[Commits] Rev 3809: MDEV-4786 - merge 10.0-monty - 10.0 in lp:~maria-captains/maria/10.0-serg

Sergey Vojtovich svoj at mariadb.org
Thu Aug 1 16:13:00 EEST 2013


At lp:~maria-captains/maria/10.0-serg

------------------------------------------------------------
revno: 3809
revision-id: svoj at mariadb.org-20130801131258-cpfylti7mxgn0fz0
parent: svoj at mariadb.org-20130801120926-vlx272fuu5oucfos
committer: Sergey Vojtovich <svoj at mariadb.org>
branch nick: 10.0-serg
timestamp: Thu 2013-08-01 17:12:58 +0400
message:
  MDEV-4786 - merge 10.0-monty - 10.0
  
  Fixed main.plugin, main-test_sql_discovery.plugin failures.
  
  storage/example/ha_example.cc:
    Issue a warning independently of DBUG status (needed for testing).
=== modified file 'storage/example/ha_example.cc'
--- a/storage/example/ha_example.cc	2013-07-21 17:24:20 +0000
+++ b/storage/example/ha_example.cc	2013-08-01 13:12:58 +0000
@@ -964,7 +964,6 @@ bool ha_example::check_if_incompatible_d
     DBUG_RETURN(COMPATIBLE_DATA_NO);
   }
 
-#ifndef DBUG_OFF
   for (uint i= 0; i < table->s->fields; i++)
   {
     ha_field_option_struct *f_old, *f_new;
@@ -982,7 +981,6 @@ bool ha_example::check_if_incompatible_d
     else
       DBUG_PRINT("info", ("old field %i did not changed", i));
   }
-#endif
 
   DBUG_RETURN(COMPATIBLE_DATA_YES);
 }



More information about the commits mailing list