database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Bug#11766191:INVALID MEMORY READ IN DO_DIV_MOD WITH DOUBLY ASSIGNED VARIABLES

Browse Source 
Bug#12608543: CRASHES WITH DECIMALS AND STATEMENT NEEDS TO BE REPREPARED ERRORS

Backporting these two fixes to 5.1 
Added unittest to test my_decimal construtor and assignment operators
This commit is contained in:
Chaithra Gopalareddy
2013-05-22 14:36:43 +05:30
parent 78e1776782
commit d0367abaff
8 changed files with 137 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unittest/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
# 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
@ -13,12 +13,12 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SUBDIRS = mytap . mysys examples strings
SUBDIRS = mytap . mysys examples strings my_decimal
EXTRA_DIST = unit.pl
CLEANFILES = unit
unittests = mytap mysys strings @mysql_se_unittest_dirs@ @mysql_pg_unittest_dirs@
unittests = mytap mysys strings my_decimal @mysql_se_unittest_dirs@ @mysql_pg_unittest_dirs@
test:
perl unit.pl run $(unittests)

32
unittest/my_decimal/Makefile.am Normal file
View File

@ -0,0 +1,32 @@
# 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
AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include
AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
AM_CPPFLAGS += -I$(top_srcdir)/sql
LDADD = $(top_builddir)/unittest/mytap/libmytap.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a
my_decimal_t_SOURCES = my_decimal-t.cc
noinst_PROGRAMS = my_decimal-t
# Don't update the files from bitkeeper
%::SCCS/s.%

72
unittest/my_decimal/my_decimal-t.cc Normal file
View File

@ -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();
}