diff options
| author | unknown <gluh@eagle.(none)> | 2007-02-26 15:54:43 +0400 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-02-26 15:54:43 +0400 |
| commit | b10600528dfd92a4d1dcd5d3bff1e0c0f41672a8 (patch) | |
| tree | 62234448cb3dc85a182c21b8ef92ed380c119cd6 /mysql-test/r/update.result | |
| parent | 5b64b12c7fec848c07475d26a6923dac93a1e5bc (diff) | |
| parent | 90d4f80922c7f8873ed8c415303f8d7276f5e32d (diff) | |
| download | mariadb-git-b10600528dfd92a4d1dcd5d3bff1e0c0f41672a8.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/insert_update.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect3.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/insert_update.test:
Auto merged
mysql-test/t/select.test:
Auto merged
BitKeeper/deleted/.del-bdb.result:
Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
mysql-test/r/binlog_stm_blackhole.result:
manual merge
mysql-test/r/insert_select.result:
manual merge
mysql-test/r/subselect.result:
manual merge
mysql-test/r/update.result:
manual merge
mysql-test/t/insert_select.test:
manual merge
mysql-test/t/subselect.test:
manual merge
sql/sql_help.cc:
manual merge
sql/sql_insert.cc:
manual merge
sql/sql_update.cc:
manual merge
Diffstat (limited to 'mysql-test/r/update.result')
| -rw-r--r-- | mysql-test/r/update.result | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/mysql-test/r/update.result b/mysql-test/r/update.result index 5b73cb9501a..2f8434b6cd2 100644 --- a/mysql-test/r/update.result +++ b/mysql-test/r/update.result @@ -432,5 +432,24 @@ Handler_read_key 3 Handler_read_next 0 Handler_read_prev 0 Handler_read_rnd 0 -Handler_read_rnd_next 0 +Handler_read_rnd_next 21 +DROP TABLE t1; +CREATE TABLE t1 ( +a INT(11), +quux decimal( 31, 30 ), +UNIQUE KEY bar (a), +KEY quux (quux) +); +INSERT INTO +t1 ( a, quux ) +VALUES +( 1, 1 ), +( 2, 0.1 ); +INSERT INTO t1( a ) +SELECT @newA := 1 + a FROM t1 WHERE quux <= 0.1; +SELECT * FROM t1; +a quux +1 1.000000000000000000000000000000 +2 0.100000000000000000000000000000 +3 NULL DROP TABLE t1; |