diff options
| author | unknown <dlenev@mockturtle.local> | 2006-11-13 11:29:40 +0300 |
|---|---|---|
| committer | unknown <dlenev@mockturtle.local> | 2006-11-13 11:29:40 +0300 |
| commit | 458fb082d092c7df3f64398f324a05a5b13f0082 (patch) | |
| tree | 671fbae62f002a6fe83dac3f3cde909772b8dc8c /sql | |
| parent | ce963d0c8e3243b558ea54c11e8c5824b8dcf3b8 (diff) | |
| parent | 1031c460de5bd4b1014614e8871393eebd0a51bc (diff) | |
| download | mariadb-git-458fb082d092c7df3f64398f324a05a5b13f0082.tar.gz | |
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg23651
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 407ab4a66f7..ff9be0fc536 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4852,6 +4852,7 @@ Item_func_sp::cleanup() result_field= NULL; } m_sp= NULL; + dummy_table->s= NULL; Item_func::cleanup(); } |