diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2007-01-18 15:28:45 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2007-01-18 15:28:45 +0400 |
| commit | 368d6b2794040a02911dbc9a358575e930691596 (patch) | |
| tree | 663010eb6e8e69295efc65591380f0f2a0e3864f /mysql-test | |
| parent | 7c5a417a4e117358c08a2b40f39c901f58b4c5e2 (diff) | |
| download | mariadb-git-368d6b2794040a02911dbc9a358575e930691596.tar.gz | |
after merge fix.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/range.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/type_bit.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/type_bit_innodb.result | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result index c96173e74cc..9d2da82813f 100644 --- a/mysql-test/r/range.result +++ b/mysql-test/r/range.result @@ -521,8 +521,8 @@ select count(*) from t1 where x = 18446744073709551601; count(*) 1 create table t2 (x bigint not null); -insert into t2(x) values (cast(0xfffffffffffffff0+0 as signed)); -insert into t2(x) values (cast(0xfffffffffffffff1+0 as signed)); +insert into t2(x) values (-16); +insert into t2(x) values (-15); select * from t2; x -16 diff --git a/mysql-test/r/type_bit.result b/mysql-test/r/type_bit.result index bd58e83bb3f..5726501916c 100644 --- a/mysql-test/r/type_bit.result +++ b/mysql-test/r/type_bit.result @@ -568,7 +568,7 @@ create table t1 (a bit(7)); insert into t1 values (0x60); select * from t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def test t1 t1 a a 16 7 1 Y 0 0 63 +def test t1 t1 a a 16 7 1 Y 32 0 63 a ` drop table t1; diff --git a/mysql-test/r/type_bit_innodb.result b/mysql-test/r/type_bit_innodb.result index 1f6857277bd..c4506231f27 100644 --- a/mysql-test/r/type_bit_innodb.result +++ b/mysql-test/r/type_bit_innodb.result @@ -406,7 +406,7 @@ create table t1 (a bit(7)) engine=innodb; insert into t1 values (0x60); select * from t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def test t1 t1 a a 16 7 1 Y 0 0 63 +def test t1 t1 a a 16 7 1 Y 32 0 63 a ` drop table t1; |