database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
This commit is contained in:
unknown
2005-04-20 11:26:57 +02:00
parent ccd4e77be7 a8261608e3
commit 8d68397333
25 changed files with 84 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mysql-test/r/ndb_update.result
View File

@ -2,12 +2,32 @@ DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (
pk1 INT NOT NULL PRIMARY KEY,
b INT NOT NULL,
c INT NOT NULL
c INT NOT NULL UNIQUE
) ENGINE=ndbcluster;
INSERT INTO t1 VALUES (0, 0, 1),(1,1,2),(2,2,3);
INSERT INTO t1 VALUES (0, 1, 0),(1,2,1),(2,3,2);
UPDATE t1 set b = c;
select * from t1 order by pk1;
pk1 b c
0 1 1
1 2 2
2 3 3
0 0 0
1 1 1
2 2 2
UPDATE t1 set pk1 = 4 where pk1 = 1;
select * from t1 order by pk1;
pk1 b c
0 0 0
2 2 2
4 1 1
UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4;
ERROR 23000: Duplicate entry '1' for key 1
select * from t1 order by pk1;
pk1 b c
0 0 0
2 2 2
4 1 1
UPDATE t1 set pk1 = pk1 + 10;
select * from t1 order by pk1;
pk1 b c
10 0 0
12 2 2
14 1 1
DROP TABLE IF EXISTS t1;

1
mysql-test/t/ndb_alter_table.test
View File

@ -1,5 +1,6 @@
-- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
DROP TABLE IF EXISTS t1;

1
mysql-test/t/ndb_autodiscover.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;

1
mysql-test/t/ndb_autodiscover2.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
#
# Simple test to show use of discover when the server has been restarted

1
mysql-test/t/ndb_basic.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;

1
mysql-test/t/ndb_blob.test
View File

@ -1,4 +1,5 @@
--source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
drop table if exists t1;

1
mysql-test/t/ndb_cache.test
View File

@ -1,5 +1,6 @@
-- source include/have_query_cache.inc
-- source include/have_ndb.inc
-- source include/not_embedded.inc
set GLOBAL query_cache_size=1355776;
reset query cache;

1
mysql-test/t/ndb_charset.test
View File

@ -1,4 +1,5 @@
--source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
drop table if exists t1;

1
mysql-test/t/ndb_index.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
drop table if exists t1;

1
mysql-test/t/ndb_index_ordered.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
drop table if exists t1, test1, test2;

1
mysql-test/t/ndb_index_unique.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
drop table if exists t1, t2, t3, t4, t5, t6, t7;

1
mysql-test/t/ndb_insert.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
DROP TABLE IF EXISTS t1;

1
mysql-test/t/ndb_limit.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
DROP TABLE IF EXISTS t2;

1
mysql-test/t/ndb_lock.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
connect (con1,localhost,root,,);
connect (con2,localhost,root,,);

1
mysql-test/t/ndb_minmax.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
drop table if exists t1, t2;

1
mysql-test/t/ndb_multi.test
View File

@ -1,5 +1,6 @@
-- source include/have_ndb.inc
-- source include/have_multi_ndb.inc
-- source include/not_embedded.inc
--disable_warnings

1
mysql-test/t/ndb_replace.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
#
# Test of REPLACE with NDB

1
mysql-test/t/ndb_restore.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
use test;

1
mysql-test/t/ndb_subquery.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
drop table if exists t1;

1
mysql-test/t/ndb_transaction.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;

1
mysql-test/t/ndb_truncate.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
DROP TABLE IF EXISTS t2;

1
mysql-test/t/ndb_types.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
DROP TABLE IF EXISTS t1;

16
mysql-test/t/ndb_update.test
View File

@ -1,4 +1,5 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--disable_warnings
DROP TABLE IF EXISTS t1;
@ -14,9 +15,20 @@ DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (
pk1 INT NOT NULL PRIMARY KEY,
b INT NOT NULL,
c INT NOT NULL
c INT NOT NULL UNIQUE
) ENGINE=ndbcluster;
INSERT INTO t1 VALUES (0, 0, 1),(1,1,2),(2,2,3);
INSERT INTO t1 VALUES (0, 1, 0),(1,2,1),(2,3,2);
UPDATE t1 set b = c;
select * from t1 order by pk1;
UPDATE t1 set pk1 = 4 where pk1 = 1;
select * from t1 order by pk1;
-- error 1062
UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4;
select * from t1 order by pk1;
UPDATE t1 set pk1 = pk1 + 10;
select * from t1 order by pk1;
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings

1
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
View File

@ -1838,7 +1838,6 @@ void Dbtc::execKEYINFO(Signal* signal)
do {
if (cfirstfreeDatabuf == RNIL) {
jam();
abort();
seizeDatabuferrorLab(signal);
return;
}//if

33
sql/ha_ndbcluster.cc
View File

@ -1863,7 +1863,9 @@ int ha_ndbcluster::write_row(byte *record)
m_skip_auto_increment= !auto_increment_column_changed;
}
if ((res= set_primary_key(op)))
if ((res= (m_primary_key_update ?
set_primary_key_from_old_data(op, record)
: set_primary_key(op))))
return res;
}
@ -2001,7 +2003,7 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
{
int read_res, insert_res, delete_res;
DBUG_PRINT("info", ("primary key update, doing pk read+insert+delete"));
DBUG_PRINT("info", ("primary key update, doing pk read+delete+insert"));
// Get all old fields, since we optimize away fields not in query
read_res= complemented_pk_read(old_data, new_data);
if (read_res)
@ -2009,15 +2011,7 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
DBUG_PRINT("info", ("pk read failed"));
DBUG_RETURN(read_res);
}
// Insert new row
insert_res= write_row(new_data);
if (insert_res)
{
DBUG_PRINT("info", ("insert failed"));
DBUG_RETURN(insert_res);
}
// Delete old row
DBUG_PRINT("info", ("insert succeded"));
m_primary_key_update= TRUE;
delete_res= delete_row(old_data);
m_primary_key_update= FALSE;
@ -2025,9 +2019,23 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
{
DBUG_PRINT("info", ("delete failed"));
// Undo write_row(new_data)
DBUG_RETURN(delete_row(new_data));
DBUG_RETURN(delete_res);
}
DBUG_PRINT("info", ("insert+delete succeeded"));
// Insert new row
DBUG_PRINT("info", ("delete succeded"));
insert_res= write_row(new_data);
if (insert_res)
{
DBUG_PRINT("info", ("insert failed"));
if (trans->commitStatus() == NdbConnection::Started)
{
m_primary_key_update= TRUE;
insert_res= write_row((byte *)old_data);
m_primary_key_update= FALSE;
}
DBUG_RETURN(insert_res);
}
DBUG_PRINT("info", ("delete+insert succeeded"));
DBUG_RETURN(0);
}
@ -2125,6 +2133,7 @@ int ha_ndbcluster::delete_row(const byte *record)
no_uncommitted_rows_update(-1);
if (!m_primary_key_update)
// If deleting from cursor, NoCommit will be handled in next_result
DBUG_RETURN(0);
}