diff options
| author | unknown <jimw@mysql.com> | 2005-08-19 15:51:40 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-19 15:51:40 -0700 |
| commit | 05001e750404612a9dbd7f8398fe2f9d851285dd (patch) | |
| tree | eb83e995b3e5e80628e119c0486767207a3c8e08 /sql/item_func.h | |
| parent | 0f556e8ff38087a7eb38af8da16c55048b4d435d (diff) | |
| download | mariadb-git-05001e750404612a9dbd7f8398fe2f9d851285dd.tar.gz | |
Fix cases where SLEEP() calls would get optimized away or cached. (Bug #12689)
mysql-test/r/func_misc.result:
Add new results
mysql-test/t/func_misc.test:
Add new regression test.
sql/item_create.cc:
When SLEEP() is used, mark the statement as uncacheable.
sql/item_func.h:
Flag SLEEP() as not constant, and set RAND_TABLE_BIT so that it is
always evaluated.
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 1f25b762b70..384cb486f7c 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -893,7 +893,13 @@ class Item_func_sleep :public Item_int_func { public: Item_func_sleep(Item *a) :Item_int_func(a) {} + bool const_item() const { return 0; } const char *func_name() const { return "sleep"; } + void update_used_tables() + { + Item_int_func::update_used_tables(); + used_tables_cache|= RAND_TABLE_BIT; + } longlong val_int(); }; |