diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-02-27 03:49:26 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-02-27 03:49:26 +0200 |
| commit | e943ca1fc3765402c35cc918d686c4d37f36903d (patch) | |
| tree | 0be3851671c59db010c557b551f49cc78c27f79a /mysql-test | |
| parent | 669cbe6e5fffb715e117a96273db9c95e229b3a9 (diff) | |
| parent | 3f9ea80268126f8401bd27f03b842cd03cde7c9f (diff) | |
| download | mariadb-git-e943ca1fc3765402c35cc918d686c4d37f36903d.tar.gz | |
Merge with 4.0
mysql-test/r/bigint.result:
Auto merged
mysql-test/t/bigint.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/item.h:
merge (use local copy)
sql/sql_show.cc:
merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/bigint.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/bigint.test | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/mysql-test/r/bigint.result b/mysql-test/r/bigint.result index e49e39bbbf6..12dc146ba2b 100644 --- a/mysql-test/r/bigint.result +++ b/mysql-test/r/bigint.result @@ -7,13 +7,13 @@ select 9223372036854775807,-009223372036854775808; 9223372036854775807 -9223372036854775808 select +9999999999999999999,-9999999999999999999; +9999999999999999999 -9999999999999999999 -10000000000000000000 -10000000000000000000 +9999999999999999999 -10000000000000000000 select cast(9223372036854775808 as unsigned)+1; cast(9223372036854775808 as unsigned)+1 9223372036854775809 select 9223372036854775808+1; 9223372036854775808+1 -9223372036854775808 +9223372036854775809 create table t1 (a bigint unsigned not null, primary key(a)); insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE); select * from t1; diff --git a/mysql-test/t/bigint.test b/mysql-test/t/bigint.test index f583045cea9..060d45c29a4 100644 --- a/mysql-test/t/bigint.test +++ b/mysql-test/t/bigint.test @@ -12,12 +12,6 @@ select 0,256,00000000000000065536,2147483647,-2147483648,2147483648,+4294967296; select 9223372036854775807,-009223372036854775808; select +9999999999999999999,-9999999999999999999; select cast(9223372036854775808 as unsigned)+1; - -# -# We need to do a REPLACE here as the atof() function returns different -# values on True64 and HPUX11 -# ---replace_result 9223372036854775800 9223372036854775808 select 9223372036854775808+1; # # In 3.23 we have to disable the test of column to bigint as |