diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-06-07 18:13:02 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-06-07 18:13:02 +0200 |
| commit | 9b98cae4cc44fa39813675b361b7aa65d129b29d (patch) | |
| tree | 7f4baeea245f91006e88c62508c2859ed9390c2d /sql/sql_parse.cc | |
| parent | 29af1aefe914da6aca73498c077f7e37a36d7de4 (diff) | |
| parent | 4d128777dde904c5f0adab9b093e854c9c580d41 (diff) | |
| download | mariadb-git-9b98cae4cc44fa39813675b361b7aa65d129b29d.tar.gz | |
merge with 5.1-micro
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index f73ddf920bf..c608ee058f8 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2281,11 +2281,7 @@ mysql_execute_command(THD *thd) goto error; } it= new Item_func_unix_timestamp(it); - /* - it is OK only emulate fix_fieds, because we need only - value of constant - */ - it->quick_fix_field(); + it->fix_fields(thd, &it); res = purge_master_logs_before_date(thd, (ulong)it->val_int()); break; } |