Merge lp:~brianaker/drizzle/bug_798959 into lp:~drizzle-trunk/drizzle/development

[Brian Aker]

Fix for 798959

=== modified file '.bzrignore'
--- .bzrignore	2011-06-28 21:02:08 +0000
+++ .bzrignore	2011-07-14 22:36:00 +0000
@@ -359,3 +359,4 @@
 drizzled/execute/parser.output
 drizzled/execute/scanner.cc
 drizzled/execute/scanner.h
+plugin/innobase/xtrabackup/drizzlebackup.innobase
 
=== modified file 'drizzled/function/set_user_var.cc'
--- drizzled/function/set_user_var.cc	2011-05-28 16:23:09 +0000
+++ drizzled/function/set_user_var.cc	2011-07-14 22:36:00 +0000
@@ -144,8 +144,10 @@
     {
       save_result.vint= use_result_field ? result_field->val_int() :
         args[0]->val_int();
+
       unsigned_flag= use_result_field ? ((Field_num*)result_field)->unsigned_flag:
         args[0]->unsigned_flag;
+
       break;
     }
   case STRING_RESULT:
 
=== modified file 'drizzled/item/boolean.h'
--- drizzled/item/boolean.h	2011-07-05 09:52:28 +0000
+++ drizzled/item/boolean.h	2011-07-14 22:36:00 +0000
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <drizzled/item/basic_constant.h>
+#include <drizzled/util/backtrace.h>
 
 namespace drizzled {
 namespace item {
@@ -48,6 +49,11 @@
 
   enum Type type() const { return BOOLEAN_ITEM; }
 
+  Item_result result_type() const
+  {
+    return INT_RESULT;
+  }
+
   virtual bool val_bool()
   {
     return value;
@@ -55,6 +61,7 @@
 
   double val_real()
   {
+    call_backtrace();
     return value ? 1 : 0;
   }
 
@@ -66,7 +73,20 @@
   drizzled::String* val_str(drizzled::String *value_buffer)
   {
     value_buffer->realloc(5);
+<<<<<<< TREE
     value_buffer->append(value ? "TRUE" : "FALSE");
+=======
+
+    if (value)
+    {
+      value_buffer->copy("TRUE", 4, default_charset());
+    }
+    else
+    {
+      value_buffer->copy("FALSE", 5, default_charset());
+    }
+
+>>>>>>> MERGE-SOURCE
     return value_buffer;
   }
 
 
=== modified file 'drizzled/item/cmpfunc.cc'
--- drizzled/item/cmpfunc.cc	2011-07-08 21:39:07 +0000
+++ drizzled/item/cmpfunc.cc	2011-07-14 22:36:00 +0000
@@ -26,6 +26,7 @@
 #include <drizzled/cached_item.h>
 #include <drizzled/check_stack_overrun.h>
 #include <drizzled/current_session.h>
+#include <drizzled/display.h>
 #include <drizzled/error.h>
 #include <drizzled/internal/my_sys.h>
 #include <drizzled/item/cache_int.h>
@@ -33,11 +34,11 @@
 #include <drizzled/item/int_with_ref.h>
 #include <drizzled/item/subselect.h>
 #include <drizzled/session.h>
+#include <drizzled/sql_lex.h>
 #include <drizzled/sql_select.h>
+#include <drizzled/system_variables.h>
 #include <drizzled/temporal.h>
 #include <drizzled/time_functions.h>
-#include <drizzled/sql_lex.h>
-#include <drizzled/system_variables.h>
 
 #include <math.h>
 #include <algorithm>
@@ -94,7 +95,9 @@
   for (; item < item_end; item++)
   {
     if ((*item)->type() != Item::NULL_ITEM)
+    {
       *type= item_store_type(*type, *item, unsigned_flag);
+    }
   }
 }
 
@@ -2371,8 +2374,7 @@
 }
 
 
-void
-Item_func_if::fix_length_and_dec()
+void Item_func_if::fix_length_and_dec()
 {
   maybe_null= args[1]->maybe_null || args[2]->maybe_null;
   decimals= max(args[1]->decimals, args[2]->decimals);
@@ -2397,32 +2399,38 @@
   }
   else
   {
-    agg_result_type(&cached_result_type, args+1, 2);
+    agg_result_type(&cached_result_type, args +1, 2);
     if (cached_result_type == STRING_RESULT)
     {
-      if (agg_arg_charsets(collation, args+1, 2, MY_COLL_ALLOW_CONV, 1))
+      if (agg_arg_charsets(collation, args +1, 2, MY_COLL_ALLOW_CONV, 1))
         return;
     }
     else
     {
       collation.set(&my_charset_bin);	// Number
     }
-    cached_field_type= agg_field_type(args + 1, 2);
+    cached_field_type= agg_field_type(args +1, 2);
   }
 
-  if ((cached_result_type == DECIMAL_RESULT )
-      || (cached_result_type == INT_RESULT))
+  switch (cached_result_type)
   {
-    int len1= args[1]->max_length - args[1]->decimals
-      - (args[1]->unsigned_flag ? 0 : 1);
-
-    int len2= args[2]->max_length - args[2]->decimals
-      - (args[2]->unsigned_flag ? 0 : 1);
-
-    max_length= max(len1, len2) + decimals + (unsigned_flag ? 0 : 1);
-  }
-  else
+  case DECIMAL_RESULT: 
+  case INT_RESULT:
+    {
+      int len1= args[1]->max_length -args[1]->decimals -(args[1]->unsigned_flag ? 0 : 1);
+      int len2= args[2]->max_length -args[2]->decimals -(args[2]->unsigned_flag ? 0 : 1);
+      max_length= max(len1, len2) + decimals + (unsigned_flag ? 0 : 1);
+    }
+    break;
+  case REAL_RESULT:
+  case STRING_RESULT:
     max_length= max(args[1]->max_length, args[2]->max_length);
+    break;
+
+  case ROW_RESULT:
+    assert(0);
+    break;
+  }
 }
 
 
@@ -2449,8 +2457,8 @@
 {
   assert(fixed == 1);
   Item *arg= args[0]->val_bool() ? args[1] : args[2];
-  int64_t value=arg->val_int();
-  null_value=arg->null_value;
+  int64_t value= arg->val_int();
+  null_value= arg->null_value;
   return value;
 }
 
@@ -2459,10 +2467,12 @@
 {
   assert(fixed == 1);
   Item *arg= args[0]->val_bool() ? args[1] : args[2];
-  String *res=arg->val_str(str);
+  String *res= arg->val_str(str);
   if (res)
+  {
     res->set_charset(collation.collation);
-  null_value=arg->null_value;
+  }
+  null_value= arg->null_value;
   return res;
 }
 
 
=== modified file 'drizzled/item/cmpfunc.h'
--- drizzled/item/cmpfunc.h	2011-07-05 09:52:28 +0000
+++ drizzled/item/cmpfunc.h	2011-07-14 22:36:00 +0000
@@ -677,17 +677,20 @@
 
 class Item_func_if :public Item_func
 {
-  enum Item_result cached_result_type;
+  Item_result cached_result_type;
   enum_field_types cached_field_type;
+
 public:
-  Item_func_if(Item *a,Item *b,Item *c)
-    :Item_func(a,b,c), cached_result_type(INT_RESULT)
+  Item_func_if(Item *a, Item *b, Item *c) :
+    Item_func(a,b,c),
+    cached_result_type(INT_RESULT)
   {}
+
   double val_real();
   int64_t val_int();
   String *val_str(String *str);
   type::Decimal *val_decimal(type::Decimal *);
-  enum Item_result result_type () const { return cached_result_type; }
+  Item_result result_type () const { return cached_result_type; }
   enum_field_types field_type() const { return cached_field_type; }
   bool fix_fields(Session *, Item **);
   void fix_length_and_dec();
 
=== modified file 'drizzled/message.cc'
--- drizzled/message.cc	2011-04-03 06:02:00 +0000
+++ drizzled/message.cc	2011-07-14 22:36:00 +0000
@@ -207,12 +207,6 @@
   return NO_ACTION;
 }
 
-// This matches SQL standard of using YES/NO not the normal TRUE/FALSE
-const std::string &type(bool type)
-{
-  return type ? YES : NO;
-}
-
 const std::string &type(drizzled::message::Table::Index::IndexType type)
 {
   switch (type)
 
=== modified file 'drizzled/message.h'
--- drizzled/message.h	2011-04-04 21:37:55 +0000
+++ drizzled/message.h	2011-07-14 22:36:00 +0000
@@ -42,7 +42,6 @@
 const std::string &type(const drizzled::message::Table::Field &type);
 const std::string &type(drizzled::message::Table::Field::FieldType type);
 const std::string &type(drizzled::message::Table::ForeignKeyConstraint::ForeignKeyOption type);
-const std::string &type(bool type);
 const std::string &type(drizzled::message::Table::Index::IndexType type);
 const std::string &type(drizzled::message::Table::ForeignKeyConstraint::ForeignKeyMatchOption type);
 const std::string &type(drizzled::message::Table::TableType type);
 
=== modified file 'drizzled/set_var.cc'
--- drizzled/set_var.cc	2011-06-25 13:36:24 +0000
+++ drizzled/set_var.cc	2011-07-14 22:36:00 +0000
@@ -70,6 +70,7 @@
       error|= it->update(session);         // Returns 0, -1 or 1
     }
   }
+
 err:
   free_underlaid_joins(session, &session->lex().select_lex);
   return error;
 
=== modified file 'drizzled/signal_handler.cc'
--- drizzled/signal_handler.cc	2011-04-20 09:27:49 +0000
+++ drizzled/signal_handler.cc	2011-07-14 22:36:00 +0000
@@ -153,7 +153,7 @@
                     "Hope that's ok; if not, decrease some variables in the "
                     "equation.\n\n"));
 
-  drizzled::util::custom_backtrace();
+  call_backtrace();
 
   write_core(sig);
 
 
=== modified file 'drizzled/sql_string.cc'
--- drizzled/sql_string.cc	2011-07-04 18:16:24 +0000
+++ drizzled/sql_string.cc	2011-07-14 22:36:00 +0000
@@ -286,14 +286,14 @@
 
 void String::append(const char *s,size_t arg_length)
 {
-  if (!arg_length)
+  if (arg_length == 0)
     return;
 
   /*
     For an ASCII compatinble string we can just append.
   */
   realloc(str_length+arg_length);
-  memcpy(Ptr+str_length,s,arg_length);
+  memcpy(Ptr +str_length, s, arg_length);
   str_length+=arg_length;
 }
 
 
=== modified file 'drizzled/sql_string.h'
--- drizzled/sql_string.h	2011-07-04 17:50:09 +0000
+++ drizzled/sql_string.h	2011-07-14 22:36:00 +0000
@@ -137,6 +137,7 @@
     Ptr= str; str_length=Alloced_length=arg_length ; alloced=0;
     str_charset=cs;
   }
+
   inline void set(const char *str,size_t arg_length, const charset_info_st * const cs)
   {
     free();
@@ -145,6 +146,7 @@
     str_charset=cs;
   }
   void set_ascii(const char *str, size_t arg_length);
+
   inline void set_quick(char *str,size_t arg_length, const charset_info_st * const cs)
   {
     if (!alloced)
@@ -153,6 +155,7 @@
     }
     str_charset= cs;
   }
+
   void set_int(int64_t num, bool unsigned_flag, const charset_info_st * const cs);
   void set(int64_t num, const charset_info_st * const cs)
   { set_int(num, false, cs); }
@@ -243,7 +246,13 @@
   void copy(const String&);			// Allocate new string
   void copy(const std::string&, const charset_info_st*);	// Allocate new string
   void copy(const char*, size_t, const charset_info_st*); // Allocate new string
+<<<<<<< TREE
   static bool needs_conversion(size_t arg_length, const charset_info_st* cs_from, const charset_info_st* cs_to);
+=======
+  static bool needs_conversion(size_t arg_length,
+                               const charset_info_st* cs_from, const charset_info_st* cs_to,
+                               size_t *offset);
+>>>>>>> MERGE-SOURCE
   void set_or_copy_aligned(const char *s, size_t arg_length, const charset_info_st*);
   void copy(const char*s,size_t arg_length, const charset_info_st& csto);
   void append(const String &s);
 
=== modified file 'drizzled/sql_yacc.yy'
--- drizzled/sql_yacc.yy	2011-07-01 18:59:28 +0000
+++ drizzled/sql_yacc.yy	2011-07-14 22:36:00 +0000
@@ -2999,7 +2999,9 @@
             }
           }
         | IF '(' expr ',' expr ',' expr ')'
-          { $$= new (YYSession->mem_root) Item_func_if($3,$5,$7); }
+          { 
+            $$= new (YYSession->mem_root) Item_func_if($3,$5,$7);
+          }
         | KILL_SYM kill_option '(' expr ')'
           {
             List<Item> *args= new (YYSession->mem_root) List<Item>;
 
=== modified file 'drizzled/util/backtrace.cc'
--- drizzled/util/backtrace.cc	2011-02-17 00:14:13 +0000
+++ drizzled/util/backtrace.cc	2011-07-14 22:36:00 +0000
@@ -18,7 +18,6 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #include <config.h>
 #include <drizzled/util/backtrace.h>
 
@@ -33,14 +32,14 @@
 #endif // HAVE_BACKTRACE
 #endif // __GNUC__
 
-
 namespace drizzled
 {
 namespace util
 {
 
-void custom_backtrace(void)
+void custom_backtrace(const char *file, int line, const char *func)
 {
+  std::cerr << std::endl << "call_backtrace() began at " << file << ":" << line << " for " << func << "()" << std::endl;
 #ifdef __GNUC__
 #ifdef HAVE_BACKTRACE
   void *array[50];
 
=== modified file 'drizzled/util/backtrace.h'
--- drizzled/util/backtrace.h	2011-03-14 05:40:28 +0000
+++ drizzled/util/backtrace.h	2011-07-14 22:36:00 +0000
@@ -22,6 +22,8 @@
 
 #include <drizzled/visibility.h>
 
+#define call_backtrace() drizzled::util::custom_backtrace(__FILE__, __LINE__, __func__)
+
 namespace drizzled
 {
 
@@ -29,7 +31,7 @@
 {
 
 DRIZZLED_API
-void custom_backtrace(void);
+void custom_backtrace(const char *file, int line, const char *func);
 
 } /* namespace util */
 } /* namespace drizzled */
 
=== modified file 'plugin/debug/module.cc'
--- plugin/debug/module.cc	2011-02-17 00:14:13 +0000
+++ plugin/debug/module.cc	2011-07-14 22:36:00 +0000
@@ -101,7 +101,7 @@
 
   bool val_bool()
   {
-    util::custom_backtrace();
+    call_backtrace();
     return true;
   }
 
 
=== modified file 'plugin/utility_functions/tests/r/result_type.result'
--- plugin/utility_functions/tests/r/result_type.result	2010-12-30 04:59:36 +0000
+++ plugin/utility_functions/tests/r/result_type.result	2011-07-14 22:36:00 +0000
@@ -3,10 +3,10 @@
 STRING
 SELECT RESULT_TYPE(FALSE);
 RESULT_TYPE(FALSE)
-REAL
+INTEGER
 SELECT RESULT_TYPE(TRUE);
 RESULT_TYPE(TRUE)
-REAL
+INTEGER
 SELECT RESULT_TYPE("");
 RESULT_TYPE("")
 STRING
 
=== modified file 'plugin/utility_functions/tests/r/typeof.result'
--- plugin/utility_functions/tests/r/typeof.result	2010-12-30 06:23:25 +0000
+++ plugin/utility_functions/tests/r/typeof.result	2011-07-14 22:36:00 +0000
@@ -3,10 +3,10 @@
 DRIZZLE_TYPE_NULL
 SELECT TYPEOF(FALSE);
 TYPEOF(FALSE)
-DRIZZLE_TYPE_DOUBLE
+DRIZZLE_TYPE_LONGLONG
 SELECT TYPEOF(TRUE);
 TYPEOF(TRUE)
-DRIZZLE_TYPE_DOUBLE
+DRIZZLE_TYPE_LONGLONG
 SELECT TYPEOF("");
 TYPEOF("")
 DRIZZLE_TYPE_VARCHAR
 
=== added file 'tests/suite/regression/r/798959.result'
--- tests/suite/regression/r/798959.result	1970-01-01 00:00:00 +0000
+++ tests/suite/regression/r/798959.result	2011-07-14 22:36:00 +0000
@@ -0,0 +1,18 @@
+SELECT IF(true, result_type(1), 'yes');
+IF(true, result_type(1), 'yes')
+INTEGER
+SELECT IF(true, typeof(1), 'yes');
+IF(true, typeof(1), 'yes')
+DRIZZLE_TYPE_LONGLONG
+SELECT IF(true, result_type(true), 'yes');
+IF(true, result_type(true), 'yes')
+INTEGER
+SELECT IF(true, typeof(true), 'yes');
+IF(true, typeof(true), 'yes')
+DRIZZLE_TYPE_LONGLONG
+SELECT IF(true, true, 'yes');
+IF(true, true, 'yes')
+TRUE
+SELECT IF(true, true, '');
+IF(true, true, '')
+TRUE
 
=== added file 'tests/suite/regression/t/798959.test'
--- tests/suite/regression/t/798959.test	1970-01-01 00:00:00 +0000
+++ tests/suite/regression/t/798959.test	2011-07-14 22:36:00 +0000
@@ -0,0 +1,6 @@
+SELECT IF(true, result_type(1), 'yes');
+SELECT IF(true, typeof(1), 'yes');
+SELECT IF(true, result_type(true), 'yes');
+SELECT IF(true, typeof(true), 'yes');
+SELECT IF(true, true, 'yes');
+SELECT IF(true, true, '');