From 88dd873de0d5dc6e8f262268f925596a60b58704 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com/narttu.mysql.fi" <>
Date: Fri, 15 Dec 2006 00:51:37 +0200
Subject: Fixed compiler warnings detected by option -Wshadow and -Wunused: -
 Removed not used variables and functions - Added #ifdef around code that is
 not used - Renamed variables and functions to avoid conflicts - Removed some
 not used arguments

Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c

I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
---
 client/sql_string.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'client/sql_string.h')

diff --git a/client/sql_string.h b/client/sql_string.h
index e284301b214..48c550bab17 100644
--- a/client/sql_string.h
+++ b/client/sql_string.h
@@ -24,6 +24,8 @@
 #define NOT_FIXED_DEC			31
 #endif
 
+#define STRING_WITH_LEN(X)  ((const char*) X), ((uint) (sizeof(X) - 1))
+
 class String;
 int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
 String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
@@ -77,13 +79,15 @@ public:
   { /* never called */ }
   ~String() { free(); }
 
-  inline void set_charset(CHARSET_INFO *charset) { str_charset= charset; }
+  inline void set_charset(CHARSET_INFO *charset_arg)
+  { str_charset= charset_arg; }
   inline CHARSET_INFO *charset() const { return str_charset; }
   inline uint32 length() const { return str_length;}
   inline uint32 alloced_length() const { return Alloced_length;}
   inline char& operator [] (uint32 i) const { return Ptr[i]; }
   inline void length(uint32 len) { str_length=len ; }
   inline bool is_empty() { return (str_length == 0); }
+  inline void mark_as_const() { Alloced_length= 0;}
   inline const char *ptr() const { return Ptr; }
   inline char *c_ptr()
   {
-- 
cgit v1.2.1