5.5 merge and fixes for compiler/test errors

3 files changed, 97 insertions, 2 deletions

diff --git a/unittest/my_decimal/CMakeLists.txt b/unittest/my_decimal/CMakeLists.txt
new file mode 100644
index 00000000000..85d203e8f47
--- /dev/null
+++ b/unittest/my_decimal/CMakeLists.txt
@@ -0,0 +1,23 @@
+# 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)
+
+#
+MY_ADD_TESTS(my_decimal EXT "cc" LINK_LIBRARIES strings dbug)
diff --git a/unittest/my_decimal/my_decimal-t.cc b/unittest/my_decimal/my_decimal-t.cc
new file mode 100644
index 00000000000..48d00465af9
--- /dev/null
+++ b/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();
+}
diff --git a/unittest/mysys/explain_filename-t.cc b/unittest/mysys/explain_filename-t.cc
index 096fdf3b168..69ce51c0446 100644
--- a/unittest/mysys/explain_filename-t.cc
+++ b/unittest/mysys/explain_filename-t.cc
@@ -65,7 +65,7 @@ int main(int argc __attribute__((unused)),char *argv[])
 {
   MY_INIT(argv[0]);
   setup();
-  plan(NO_PLAN);
+  plan(22);
 
   test_1("test/t1.ibd",
          "Database \"test\", Table \"t1.ibd\"",
@@ -160,6 +160,6 @@ int main(int argc __attribute__((unused)),char *argv[])
          EXPLAIN_PARTITIONS_AS_COMMENT);
 
   my_end(0);
-  return 0;
+  return exit_status();
 }