diff options
| author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-02-06 17:18:43 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-02-06 17:18:43 +0400 |
| commit | ffde1cf09c4ff33e7477578eb85310461b1ec8bb (patch) | |
| tree | beb11820e9c29423de11e4cf8321c00c54b72345 /sql/sql_analyse.cc | |
| parent | e976ea37b0340562b466dab374b78f028e869939 (diff) | |
| parent | 07efbe8c2a54f6475a463c6601dd485d0f320b06 (diff) | |
| download | mariadb-git-ffde1cf09c4ff33e7477578eb85310461b1ec8bb.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/ram/work/b23782/b23782.5.0
sql/sql_analyse.cc:
Auto merged
Diffstat (limited to 'sql/sql_analyse.cc')
| -rw-r--r-- | sql/sql_analyse.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc index 5d7d35cf69b..95a7fb3d34d 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -86,6 +86,11 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result, else if (param->next) { // first parameter + if (!(*param->item)->fixed && (*param->item)->fix_fields(thd, param->item)) + { + DBUG_PRINT("info", ("fix_fields() for the first parameter failed")); + goto err; + } if ((*param->item)->type() != Item::INT_ITEM || (*param->item)->val_real() < 0) { @@ -100,6 +105,11 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result, goto err; } // second parameter + if (!(*param->item)->fixed && (*param->item)->fix_fields(thd, param->item)) + { + DBUG_PRINT("info", ("fix_fields() for the second parameter failed")); + goto err; + } if ((*param->item)->type() != Item::INT_ITEM || (*param->item)->val_real() < 0) { |