diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-22 00:53:01 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-22 00:53:01 +0500 |
| commit | 5ad952567233e9b9b8d9a4047f2be16dc8fee171 (patch) | |
| tree | 48bba9f11f2e064c1f6b490615a42c73c90ef931 /sql/item_func.h | |
| parent | f303c0c87f8a1bd9c90dc74e6ee35c7553dc6552 (diff) | |
| parent | aed9a5fee33affcf1dc2cd6355605438296aa903 (diff) | |
| download | mariadb-git-5ad952567233e9b9b8d9a4047f2be16dc8fee171.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/item_func.h:
Auto merged
mysql-test/r/sp.result:
Merge with 5.0-opt.
mysql-test/t/sp.test:
Merge with 5.0-opt.
sql/item_func.cc:
Merge with 5.0-opt.
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 568effb2f63..ea22e35773d 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1472,7 +1472,7 @@ public: virtual ~Item_func_sp() {} - table_map used_tables() const { return RAND_TABLE_BIT; } + void update_used_tables(); void cleanup(); |