bzr push into mysql-6.0-runtime branch (kostja:2749 to 2750)

[Konstantin Osipov]

 2750 Konstantin Osipov	2008-11-19
      Fix a build failure in pushbuild, sapsrv1.
modified:
  include/m_string.h
  include/my_sys.h
  sql/sql_list.h

 2749 Konstantin Osipov	2008-11-19
      Wl#4264 "Backup: Stabilize Service Interface", a prerequisite patch: 
      move Warning_info class declaration and implementation from
      sql_class.{h,cc} to sql_error.{h,cc} and make sql_error.h a
      self-sufficient header.
modified:
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_error.cc
  sql/sql_error.h
  sql/sql_list.cc
  sql/sql_list.h

=== modified file 'include/m_string.h'
--- a/include/m_string.h	2008-06-26 18:29:30 +0000
+++ b/include/m_string.h	2008-11-19 12:53:52 +0000
@@ -383,4 +383,10 @@ static inline const uchar *skip_trailing
   return (end);
 }
 
-#endif
+#ifdef SAFEMALLOC
+#define TRASH(A,B) bfill(A, B, 0x8F)
+#else
+#define TRASH(A,B) /* nothing */
+#endif /* SAFEMALLOC */
+
+#endif /* _m_string_h */

=== modified file 'include/my_sys.h'
--- a/include/my_sys.h	2008-10-20 19:13:22 +0000
+++ b/include/my_sys.h	2008-11-19 12:53:52 +0000
@@ -150,7 +150,6 @@ extern int NEAR my_errno;		/* Last error
 #define my_memdup(A,B,C) _my_memdup((A),(B), __FILE__,__LINE__,C)
 #define my_strdup(A,C) _my_strdup((A), __FILE__,__LINE__,C)
 #define my_strndup(A,B,C) _my_strndup((A),(B),__FILE__,__LINE__,C)
-#define TRASH(A,B) bfill(A, B, 0x8F)
 #define QUICK_SAFEMALLOC sf_malloc_quick=1
 #define NORMAL_SAFEMALLOC sf_malloc_quick=0
 extern uint sf_malloc_prehunc,sf_malloc_endhunc,sf_malloc_quick;
@@ -178,7 +177,6 @@ extern char *my_strndup(const char *from
 #define CALLER_INFO_PROTO   /* nothing */
 #define CALLER_INFO         /* nothing */
 #define ORIG_CALLER_INFO    /* nothing */
-#define TRASH(A,B) /* nothing */
 #endif
 
 #ifdef HAVE_LARGE_PAGES

=== modified file 'sql/sql_list.h'
--- a/sql/sql_list.h	2008-11-18 22:30:59 +0000
+++ b/sql/sql_list.h	2008-11-19 12:53:52 +0000
@@ -16,7 +16,8 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "my_global.h"
-#include "my_sys.h"
+#include "my_sys.h"   /* for MEM_ROOT, operator new */
+#include "m_string.h" /* for TRASH */
 
 
 #ifdef USE_PRAGMA_INTERFACE