Commit 3af775df authored by unknown's avatar unknown
Browse files

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
parents 21f2d3aa 76d43b1e

mysql-test/r/ndb_update.result

0 → 100644
+13 −0
Original line number Diff line number Diff line 
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

mysql-test/t/ndb_update.test

0 → 100644
+22 −0
Original line number Diff line number Diff line 
-- 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;

sql/sql_update.cc

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ int mysql_update(THD *thd, 
#ifndef NO_EMBEDDED_ACCESS_CHECKS

  table->grant.want_privilege=want_privilege;

#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 */

  if (table->timestamp_field)

  {