Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

sql/sql_yacc.yy

@@ -3046,6 +3046,15 @@ expr_or_default:
 opt_insert_update:
         /* empty */
         | ON DUPLICATE KEY_SYM UPDATE_SYM SET update_list
+          { /* for simplisity, let's forget about
+               INSERT ... SELECT ... UPDATE
+               for a moment */
+	    if (Lex->sql_command != SQLCOM_INSERT)
+            {
+	      send_error(Lex->thd, ER_SYNTAX_ERROR);
+              YYABORT;
+            }
+          }
         ;
 
 /* Update rows in a table */