diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-11-23 01:28:32 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-11-23 01:28:32 +0200 |
| commit | 7a307bb0de79ca421d796cb649bd55346cadb6ca (patch) | |
| tree | ace720b23945432863b582bf907eecdaa87fc638 /sql/sql_class.h | |
| parent | a11b9d73359f54b6e9943d084df732439d3ea671 (diff) | |
| parent | d0645e359c0d3973315bceec8a8c588e64fbff71 (diff) | |
| download | mariadb-git-7a307bb0de79ca421d796cb649bd55346cadb6ca.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/sp.result:
merge
sql/share/errmsg.txt:
merge
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index e92bf3b2bec..ee24d9e904b 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -530,6 +530,7 @@ struct system_variables ulong completion_type; /* Determines which non-standard SQL behaviour should be enabled */ ulong sql_mode; + ulong max_sp_recursion_depth; /* check of key presence in updatable view */ ulong updatable_views_with_limit; ulong default_week_format; |