bk commit into 4.1 tree (evgen:1.2455)

[eugene]

Below is the list of changes that have just been committed into a local
4.1 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2455 06/01/24 22:10:39 evgen@stripped +3 -0
  Manually merged

  mysql-test/t/update.test
    1.27 06/01/24 22:10:37 evgen@stripped +8 -8
    Manually merged

  mysql-test/r/update.result
    1.29 06/01/24 22:10:37 evgen@stripped +4 -4
    Manually merged

  sql/sql_base.cc
    1.263 06/01/24 21:50:09 evgen@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/work/16510-bug-4.1-mysql/RESYNC

--- 1.262/sql/sql_base.cc	2006-01-10 20:13:08 +03:00
+++ 1.263/sql/sql_base.cc	2006-01-24 21:50:09 +03:00
@@ -2390,6 +2390,7 @@
     if (item->type() == Item::FIELD_ITEM &&
         ((Item_field*) item)->field_name &&
 	((Item_field*) item)->field_name[0] == '*' &&
+        ((Item_field*) item)->field_name[1] == 0 &&
 	!((Item_field*) item)->field)
     {
       uint elem= fields.elements;

--- 1.28/mysql-test/r/update.result	2005-12-01 23:20:44 +03:00
+++ 1.29/mysql-test/r/update.result	2006-01-24 22:10:37 +03:00
@@ -358,3 +358,7 @@
 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;

--- 1.26/mysql-test/t/update.test	2005-12-01 23:20:10 +03:00
+++ 1.27/mysql-test/t/update.test	2006-01-24 22:10:37 +03:00
@@ -287,4 +287,12 @@
 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