summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jani@ibmlab.site>2006-03-16 19:43:45 +0200
committerunknown <jani@ibmlab.site>2006-03-16 19:43:45 +0200
commit6dbb6cf199af77258f94903729b851b744dfbadf (patch)
tree37fd4cff39976deda9591f310fbb2f3b591a7d96
parent9b9d75c3607e8dba31c17a2e7a80ad01ef25e58f (diff)
parent8caf2f0ccf1f2b45267ab9d47003163b210caaf2 (diff)
downloadmariadb-git-6dbb6cf199af77258f94903729b851b744dfbadf.tar.gz
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into ibmlab.site:/home/my/bk/mysql-5.1-new
-rw-r--r--sql/sql_lex.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 954c3be17c6..5e67b60cb85 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -53,6 +53,11 @@ class Event_timed;
/*
When a command is added here, be sure it's also added in mysqld.cc
in "struct show_var_st status_vars[]= {" ...
+
+ If the command returns a result set or is not allowed in stored
+ functions or triggers, please also make sure that
+ sp_get_flags_for_command (sp_head.cc) returns proper flags for the
+ added SQLCOM_.
*/
enum enum_sql_command {