diff options
| author | unknown <ingo@mysql.com> | 2005-09-29 14:07:32 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-09-29 14:07:32 +0200 |
| commit | a3c014caf0a081b9ab0c37ccf52b6d9a02e72417 (patch) | |
| tree | 43f77b316fa66122320faf96cb092c8bc4c6ea1e /mysql-test/t/merge.test | |
| parent | b65c76cb1bb7bd2fb5fd267ca7405be0205abb15 (diff) | |
| parent | 48838170c7d160b618713a698e33884e3fb10c98 (diff) | |
| download | mariadb-git-a3c014caf0a081b9ab0c37ccf52b6d9a02e72417.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/sql_mode.test:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/sql_mode.result:
SCCS merged
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 549aabeb13e..ff05867b7c1 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -314,7 +314,7 @@ create table t3 ( ) engine=myisam; insert into t2 values ( null, ''); -insert into t2 values ( 9999999999.9999, ''); +insert into t2 values ( 9999999999.999, ''); insert into t3 select * from t2; select min(a), max(a) from t1; flush tables; |