summaryrefslogtreecommitdiff
path: root/storage/connect/mysql-test/connect/t
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-11-09 09:32:58 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-11-09 09:32:58 +0200
commitab44e1f87c42518a07d9e92075d078c6bd0395ed (patch)
tree1cb6d4d0d064fcd32c7d2ac5acbd64679cb36c5c /storage/connect/mysql-test/connect/t
parent2ac1edb1c319db967e7424793c799bbc9824b8f4 (diff)
parent3278c57917642fa5ab9b88f7e56ad3b1e364e2c4 (diff)
downloadmariadb-git-ab44e1f87c42518a07d9e92075d078c6bd0395ed.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'storage/connect/mysql-test/connect/t')
-rw-r--r--storage/connect/mysql-test/connect/t/odbc_postgresql.test9
1 files changed, 9 insertions, 0 deletions
diff --git a/storage/connect/mysql-test/connect/t/odbc_postgresql.test b/storage/connect/mysql-test/connect/t/odbc_postgresql.test
index ec98453d630..187bec55b38 100644
--- a/storage/connect/mysql-test/connect/t/odbc_postgresql.test
+++ b/storage/connect/mysql-test/connect/t/odbc_postgresql.test
@@ -223,3 +223,12 @@ DROP TABLE t1;
CREATE TABLE pg_in_maria ENGINE=CONNECT TABNAME='schema1.space_in_column_name' CHARSET=utf8 DATA_CHARSET=utf8 TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' quoted=1;
SELECT * from pg_in_maria;
DROP TABLE pg_in_maria;
+
+--echo #
+--echo # MDEV-29397 UPDATE with WHERE on part of two-part primary key causes
+--echo # info to turn into error.
+--echo #
+CREATE TABLE t1 (a VARCHAR(6), b VARCHAR(6), PRIMARY KEY(a, b)) ENGINE=CONNECT TABNAME='schema1.t3' CHARSET=utf8 DATA_CHARSET=utf8 TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr';
+UPDATE t1 SET a='10' WHERE a='20';
+DROP TABLE t1;
+