Fixed a bug that allowed:

SET @foo=bar;

This would cause a deadlock in mysqld, it now generates the error:
ER_SET_CONSTANTS_ONLY as follows:

mysql> set @foo=bar;
ERROR 1204: You may only use constant expressions with SET


include/mysqld_error.h:
  Added a new error message for SET
sql/share/czech/errmsg.txt:
  Added a new error message for SET
sql/share/danish/errmsg.txt:
  Added a new error message for SET
sql/share/dutch/errmsg.txt:
  Added a new error message for SET
sql/share/english/errmsg.txt:
  Added a new error message for SET
sql/share/estonian/errmsg.txt:
  Added a new error message for SET
sql/share/french/errmsg.txt:
  Added a new error message for SET
sql/share/german/errmsg.txt:
  Added a new error message for SET
sql/share/greek/errmsg.txt:
  Added a new error message for SET
sql/share/hungarian/errmsg.txt:
  Added a new error message for SET
sql/share/italian/errmsg.txt:
  Added a new error message for SET
sql/share/japanese/errmsg.txt:
  Added a new error message for SET
sql/share/korean/errmsg.txt:
  Added a new error message for SET
sql/share/norwegian-ny/errmsg.txt:
  Added a new error message for SET
sql/share/norwegian/errmsg.txt:
  Added a new error message for SET
sql/share/polish/errmsg.txt:
  Added a new error message for SET
sql/share/portuguese/errmsg.txt:
  Added a new error message for SET
sql/share/romanian/errmsg.txt:
  Added a new error message for SET
sql/share/russian/errmsg.txt:
  Added a new error message for SET
sql/share/slovak/errmsg.txt:
  Added a new error message for SET
sql/share/spanish/errmsg.txt:
  Added a new error message for SET
sql/share/swedish/errmsg.txt:
  Added a new error message for SET
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

22 files changed, 22 insertions, 1 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 0ba76ca4ff2..666d70c957a 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -214,3 +214,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index eb2a5dc3dd2..9f1f6accc1f 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -208,3 +208,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 3ef00cf0837..8b44af7eb7b 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -205,3 +205,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 5148b25e4cf..74139b30a85 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -205,3 +205,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index f42b5209ea6..f1559f4a44d 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -209,3 +209,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 949a12a52b3..5cbcfe81b87 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -205,3 +205,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 89401557f6c..307ed7a00f4 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -208,3 +208,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index f9018013875..119de63b2a7 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -205,3 +205,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index c81466104a7..7e9b9e6a3bf 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -207,3 +207,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 25dd252797e..d6c857d44a4 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -205,3 +205,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 008303c3cf5..a62f22c253d 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -207,3 +207,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 231d00b44b2..c476ad8fa3c 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -205,3 +205,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 50a3345351d..2a57c93cc84 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -207,3 +207,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index b31429fca0d..cf23991eefa 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -207,3 +207,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index d8126917c1b..03e9d59dacd 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -209,3 +209,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index c1f4595f1b2..37f2bf9e7ac 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -205,3 +205,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 235493e538d..6bc2695bed5 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -209,3 +209,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index c08c471e9e1..75d21dda888 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -208,3 +208,4 @@
 "Не получилось инициализировать структуру master info, проверте persmissions на файле master.info",
 "Не могу создать процесс SLAVE, проверьте системные ресурсы",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index c80e30bb775..673499f5105 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -213,3 +213,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 641ac3e1dce..d470556fd58 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -206,3 +206,4 @@
 "Could not initialize master info structure, check permisions on master.info",
 "Could not create slave thread, check system resources",
 "User %-.64s has already more than 'max_user_connections' active connections",
+"You may only use constant expressions with SET",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 132a9fdf4f9..7de54d16319 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -205,3 +205,4 @@
 "Kunde inte initializera replications-strukturerna. Kontrollera privilegerna fЖr 'master.info'",
 "Kunde inte starta en trЕd fЖr replikering",
 "AnvДndare '%-.64s' har redan 'max_user_connections' aktiva inloggningar",
+"You may only use constant expressions with SET",
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 64d3de34d3e..922d90103f1 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -2666,7 +2666,7 @@ option_value:
 	  {
 	     Item_func_set_user_var *item = new Item_func_set_user_var($2,$4);
 	     if (item->fix_fields(current_thd,0) || item->update())
-		YYABORT;
+		send_error(&current_thd->net, ER_SET_CONSTANTS_ONLY);
 	  }
          | SQL_SLAVE_SKIP_COUNTER equal ULONG_NUM
           {