bzr push into mysql-5.1-bugteam branch (alik:3118 to 3119)

[Alexander Nozdrin]

 3119 Alexander Nozdrin	2009-09-10
      Add DBUG_VIOLATION_HELPER_LEAVE definition to non-debug build.

    modified:
      include/my_dbug.h
 3118 Sergey Glukhov	2009-09-10 [merge]
      5.0-bugteam->5.1-bugteam merge
     @ mysql-test/r/func_str.result
        5.0-bugteam->5.1-bugteam merge
     @ mysql-test/t/func_str.test
        5.0-bugteam->5.1-bugteam merge
     @ sql/item_strfunc.cc
        5.0-bugteam->5.1-bugteam merge

    modified:
      mysql-test/r/func_str.result
      mysql-test/t/func_str.test
      sql/item_strfunc.cc
=== modified file 'include/my_dbug.h'
--- a/include/my_dbug.h	2009-09-10 07:40:57 +0000
+++ b/include/my_dbug.h	2009-09-10 12:18:54 +0000
@@ -128,6 +128,7 @@ extern FILE *_db_fp_(void);
 
 #define DBUG_ENTER(a1)
 #define DBUG_LEAVE
+#define DBUG_VIOLATION_HELPER_LEAVE
 #define DBUG_RETURN(a1)             do { return(a1); } while(0)
 #define DBUG_VOID_RETURN            do { return; } while(0)
 #define DBUG_EXECUTE(keyword,a1)    do { } while(0)


Attachment: [text/bzr-bundle] bzr/[e-mail]