summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2001-02-18 00:03:37 +0200
committerunknown <monty@donna.mysql.com>2001-02-18 00:03:37 +0200
commitf8509fecdb9a6453230e1418907a0923f002201d (patch)
treee430180603a3dd86bed056e15a90ce368911ca5a /mysql-test
parent456102115c2f70982e600e40e34a10afde72c703 (diff)
downloadmariadb-git-f8509fecdb9a6453230e1418907a0923f002201d.tar.gz
Added locks needed for Innobase
Fixed mutex problem when doing automatic repair of MyISAM tables Docs/manual.texi: changelog include/thr_lock.h: Added TL_READ_WITH_SHARED_LOCKS for Innobase mysql-test/r/update.result: Added 'select' to verify update results mysql-test/t/update.test: Better code coverage mysys/getvar.c: Allow space in to --set-variable mysys/thr_lock.c: Added TL_READ_WITH_SHARED_LOCKS sql/ha_myisam.cc: Added comment sql/lock.cc: Added missing broadcast sql/sql_base.cc: Fixed some mutex problem when doing automatic repair of MyISAM tables sql/sql_update.cc: Purecoverage
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/update.result37
-rw-r--r--mysql-test/t/update.test10
2 files changed, 47 insertions, 0 deletions
diff --git a/mysql-test/r/update.result b/mysql-test/r/update.result
index 9aa47a089a6..d0cca3bdb6f 100644
--- a/mysql-test/r/update.result
+++ b/mysql-test/r/update.result
@@ -1,2 +1,39 @@
+a
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+145
+146
place_id shows
1 1
diff --git a/mysql-test/t/update.test b/mysql-test/t/update.test
index 6010c311015..a51bce8aebe 100644
--- a/mysql-test/t/update.test
+++ b/mysql-test/t/update.test
@@ -7,6 +7,16 @@ create table t1 (a int auto_increment , primary key (a));
insert into t1 values (NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL);
update t1 set a=a+10 where a > 34;
update t1 set a=a+100 where a > 0;
+
+# Some strange updates to test some otherwise unused code
+update t1 set a=a+100 where a=1 and a=2;
+--error 1054
+update t1 set a=b+100 where a=1 and a=2;
+--error 1054
+update t1 set a=b+100 where c=1 and a=2;
+--error 1054
+update t1 set d=a+100 where a=1;
+select * from t1;
drop table t1;
CREATE TABLE t1