summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2006-01-24 22:10:39 +0300
committerunknown <evgen@moonbone.local>2006-01-24 22:10:39 +0300
commit4a525b3f92fbc3872860b787e2460a004c81b33d (patch)
treeebf852797185205528397cebc56998d32b578cea /mysql-test
parent52ff597a8aa3fd8ef18752b4839c755787059113 (diff)
parente14c9c5d9c82666118a1384853ec0a57c3d1cd61 (diff)
downloadmariadb-git-4a525b3f92fbc3872860b787e2460a004c81b33d.tar.gz
Manually merged
sql/sql_base.cc: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/update.result4
-rw-r--r--mysql-test/t/update.test8
2 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/update.result b/mysql-test/r/update.result
index 7854fd773a1..10783656fb5 100644
--- a/mysql-test/r/update.result
+++ b/mysql-test/r/update.result
@@ -358,3 +358,7 @@ update t2,t1 set f1=3,f2=3 where f1=f2 and f1=1;
affected rows: 3
info: Rows matched: 3 Changed: 3 Warnings: 0
drop table t1,t2;
+create table t1(f1 int, `*f2` int);
+insert into t1 values (1,1);
+update t1 set `*f2`=1;
+drop table t1;
diff --git a/mysql-test/t/update.test b/mysql-test/t/update.test
index 95adb40962c..fe76b178928 100644
--- a/mysql-test/t/update.test
+++ b/mysql-test/t/update.test
@@ -287,4 +287,12 @@ update t1 set f1=1 where f1=3;
update t2,t1 set f1=3,f2=3 where f1=f2 and f1=1;
--disable_info
drop table t1,t2;
+
+#
+# Bug #16510 Updating field named like '*name' caused server crash
+#
+create table t1(f1 int, `*f2` int);
+insert into t1 values (1,1);
+update t1 set `*f2`=1;
+drop table t1;
# End of 4.1 tests