diff options
| author | unknown <paul@ice.snake.net> | 2004-08-21 12:35:33 -0500 |
|---|---|---|
| committer | unknown <paul@ice.snake.net> | 2004-08-21 12:35:33 -0500 |
| commit | c5677d9a3e3acedfd8c7d32576c5cd1897f16c6d (patch) | |
| tree | d3124fbece2f0b855a2f3d19edf4826e1f1410d9 /sql/sql_derived.cc | |
| parent | 14f8afc9a0ca61bc15aaeb95f667b74529efd55a (diff) | |
| parent | 5803d60379e632a7c6fed05e02f0d03db2a4d18e (diff) | |
| download | mariadb-git-c5677d9a3e3acedfd8c7d32576c5cd1897f16c6d.tar.gz | |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 01459d3fc7a..30b06e91082 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -151,7 +151,7 @@ static int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, if it is preparation PS only then we do not need real data and we can skip execution (and parameters is not defined, too) */ - if (!thd->current_statement) + if (! thd->current_arena->is_stmt_prepare()) { if (is_union) { |