summaryrefslogtreecommitdiff
path: root/storage/tokudb
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-12-27 21:39:05 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2016-12-27 21:39:05 -0500
commit901f7ebcf3aa45c99f82e655a8482c50f10b840e (patch)
tree091845fdaadfeb3dbafaca03acec1fdeeffefead /storage/tokudb
parent5ddd8149e44122feb0989b9944113d2b92d6f84a (diff)
parentec6d8dadc01269451332e5b24b12a5350a2a4896 (diff)
downloadmariadb-git-901f7ebcf3aa45c99f82e655a8482c50f10b840e.tar.gz
Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54
Diffstat (limited to 'storage/tokudb')
-rw-r--r--storage/tokudb/mysql-test/tokudb/r/type_decimal.result2
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/tokudb/mysql-test/tokudb/r/type_decimal.result b/storage/tokudb/mysql-test/tokudb/r/type_decimal.result
index 5d271bc73fa..4540c24238b 100644
--- a/storage/tokudb/mysql-test/tokudb/r/type_decimal.result
+++ b/storage/tokudb/mysql-test/tokudb/r/type_decimal.result
@@ -222,7 +222,6 @@ drop table t1;
create table t1 (a decimal(10,2) unsigned);
insert into t1 values ("0.0"),("-0.0"),("+0.0"),("01.0"),("+01.0"),("-01.0");
Warnings:
-Warning 1264 Out of range value for column 'a' at row 2
Warning 1264 Out of range value for column 'a' at row 6
insert into t1 values ("-.1"),("+.1"),(".1");
Warnings:
@@ -281,7 +280,6 @@ drop table t1;
create table t1 (a decimal(10,2) zerofill);
insert into t1 values ("0.0"),("-0.0"),("+0.0"),("01.0"),("+01.0"),("-01.0");
Warnings:
-Warning 1264 Out of range value for column 'a' at row 2
Warning 1264 Out of range value for column 'a' at row 6
insert into t1 values ("-.1"),("+.1"),(".1");
Warnings: