Merge from 5.5 to 5.6

CMakeLists.txt

@@ -302,6 +302,7 @@ ENDIF()
 IF(WITH_UNIT_TESTS)
   ADD_SUBDIRECTORY(unittest/mytap)
   ADD_SUBDIRECTORY(unittest/mysys)
+  ADD_SUBDIRECTORY(unittest/my_decimal)
 ENDIF()
 
 ADD_SUBDIRECTORY(extra)

unittest/my_decimal/CMakeLists.txt

@@ -0,0 +1,32 @@
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
+                    ${CMAKE_SOURCE_DIR}/sql
+                    ${CMAKE_SOURCE_DIR}/regex
+                    ${CMAKE_SOURCE_DIR}/extra/yassl/include
+                    ${CMAKE_SOURCE_DIR}/unittest/mytap)
+
+
+MACRO (MY_ADD_TEST name)
+  ADD_EXECUTABLE(${name}-t ${name}-t.cc)
+  TARGET_LINK_LIBRARIES(${name}-t mytap mysys strings)
+  ADD_TEST(${name} ${name}-t)
+ENDMACRO()
+
+
+FOREACH(testname my_decimal)
+  MY_ADD_TEST(${testname})
+ENDFOREACH()

unittest/my_decimal/my_decimal-t.cc

@@ -0,0 +1,72 @@
+/* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
+#include "my_config.h"
+#include "config.h"
+#include <tap.h>
+#include <my_global.h>
+#include <my_sys.h>
+#include <m_string.h>
+#include <sql_string.h>
+#include <my_decimal.h>
+
+
+
+/*
+  Test my_decimal constuctor and assignement operators
+*/
+static int
+test_copy_and_compare()
+{
+  my_decimal d1,d2;
+
+  ulonglong val= 42;
+
+  ok(ulonglong2decimal(val,&d1) == 0, "Pass");
+  d2= d1;
+  my_decimal d3(d1);
+
+  ok(my_decimal_cmp(&d1, &d2) == 0, "Pass");
+  ok(my_decimal_cmp(&d2, &d3) == 0, "Pass");
+  ok(my_decimal_cmp(&d3, &d1) == 0,"Pass");
+
+  ulonglong val1, val2, val3;
+  ok(decimal2ulonglong(&d1, &val1) == 0, "Pass");
+  ok(decimal2ulonglong(&d2, &val2) == 0,"Pass");
+  ok(decimal2ulonglong(&d3, &val3) == 0,"Pass");
+
+  ok(val == val1,"Pass");
+  ok(val == val2,"Pass");
+  ok(val == val3,"Pass");
+
+  // The CTOR/operator=() generated by the compiler would fail here:
+  val= 45;
+  ok(ulonglong2decimal(val, &d1) == 0,"Pass");
+  ok(my_decimal_cmp(&d1, &d2) == 1,"Pass");
+  ok(my_decimal_cmp(&d1, &d3) == 1,"Pass");
+
+  return 0;
+
+}
+
+int main()
+{
+  plan(13);
+  diag("Testing my_decimal constructor and assignment operators");
+
+  test_copy_and_compare();
+  
+  return exit_status();
+}