Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1 sql/sql_update.cc: Auto merged
This commit is contained in:
commit
3af775dfd4
13
mysql-test/r/ndb_update.result
Normal file
13
mysql-test/r/ndb_update.result
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
DROP TABLE IF EXISTS t1;
|
||||||
|
CREATE TABLE t1 (
|
||||||
|
pk1 INT NOT NULL PRIMARY KEY,
|
||||||
|
b INT NOT NULL,
|
||||||
|
c INT NOT NULL
|
||||||
|
) ENGINE=ndbcluster;
|
||||||
|
INSERT INTO t1 VALUES (0, 0, 1),(1,1,2),(2,2,3);
|
||||||
|
UPDATE t1 set b = c;
|
||||||
|
select * from t1 order by pk1;
|
||||||
|
pk1 b c
|
||||||
|
0 1 1
|
||||||
|
1 2 2
|
||||||
|
2 3 3
|
22
mysql-test/t/ndb_update.test
Normal file
22
mysql-test/t/ndb_update.test
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
-- source include/have_ndb.inc
|
||||||
|
|
||||||
|
--disable_warnings
|
||||||
|
DROP TABLE IF EXISTS t1;
|
||||||
|
--enable_warnings
|
||||||
|
|
||||||
|
#
|
||||||
|
# Basic test of INSERT in NDB
|
||||||
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# Create a normal table with primary key
|
||||||
|
#
|
||||||
|
CREATE TABLE t1 (
|
||||||
|
pk1 INT NOT NULL PRIMARY KEY,
|
||||||
|
b INT NOT NULL,
|
||||||
|
c INT NOT NULL
|
||||||
|
) ENGINE=ndbcluster;
|
||||||
|
|
||||||
|
INSERT INTO t1 VALUES (0, 0, 1),(1,1,2),(2,2,3);
|
||||||
|
UPDATE t1 set b = c;
|
||||||
|
select * from t1 order by pk1;
|
@ -110,7 +110,8 @@ int mysql_update(THD *thd,
|
|||||||
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
||||||
table->grant.want_privilege=want_privilege;
|
table->grant.want_privilege=want_privilege;
|
||||||
#endif
|
#endif
|
||||||
if (setup_fields(thd, 0, update_table_list, fields, 1, 0, 0))
|
if (setup_fields(thd, 0, update_table_list, fields, 1, 0, 0) ||
|
||||||
|
setup_fields(thd, 0, update_table_list, values, 1, 0, 0))
|
||||||
DBUG_RETURN(-1); /* purecov: inspected */
|
DBUG_RETURN(-1); /* purecov: inspected */
|
||||||
if (table->timestamp_field)
|
if (table->timestamp_field)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user