summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-08-20 00:52:43 +0200
committerserg@serg.mylan <>2004-08-20 00:52:43 +0200
commit62722e7b0528a97ef0b5831cb27c1acfd4d5e856 (patch)
tree5fff92365d8baf56b0bfb2391843398321d56ee2 /mysql-test
parent22546845f2651074cff2d48aa708365f40c1cfa9 (diff)
parent068a57b12c46b15dd9e8192fe0fb0def468eb5ab (diff)
downloadmariadb-git-62722e7b0528a97ef0b5831cb27c1acfd4d5e856.tar.gz
merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/type_float.result3
-rw-r--r--mysql-test/t/type_float.test8
2 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result
index f6a19a861a1..843bdc2bdc5 100644
--- a/mysql-test/r/type_float.result
+++ b/mysql-test/r/type_float.result
@@ -135,6 +135,9 @@ t1 CREATE TABLE `t1` (
`b` double(200,30) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
+create table t1 (c20 char);
+insert into t1 values (5000.0);
+drop table t1;
create table t1 (f float(54));
ERROR 42000: Incorrect column specifier for column 'f'
drop table if exists t1;
diff --git a/mysql-test/t/type_float.test b/mysql-test/t/type_float.test
index cfaa5d611f2..4b627ea9b99 100644
--- a/mysql-test/t/type_float.test
+++ b/mysql-test/t/type_float.test
@@ -72,6 +72,13 @@ select * from t1;
show create table t1;
drop table t1;
+#
+# float in a char(1) field
+#
+create table t1 (c20 char);
+insert into t1 values (5000.0);
+drop table t1;
+
# Errors
--error 1063
@@ -79,3 +86,4 @@ create table t1 (f float(54)); # Should give an error
--disable_warnings
drop table if exists t1;
--enable_warnings
+