diff options
| author | unknown <monty@mysql.com> | 2003-12-19 20:18:18 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-19 20:18:18 +0200 |
| commit | 4e8c381029f5d787791e044a6871768177a32ab6 (patch) | |
| tree | 3e4d0229c4fc62d5fa014b1d33a69ec9c17ccd1b /sql/sql_parse.cc | |
| parent | 8d987f9e532689545becf521aa6a6aa6b23bf330 (diff) | |
| parent | 7592a73658ff04ddbf09e4c9edfb1613323dc6e9 (diff) | |
| download | mariadb-git-4e8c381029f5d787791e044a6871768177a32ab6.tar.gz | |
merge with lex pointer change patch
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 3f2325de703..5cbf41cd9e5 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2626,7 +2626,7 @@ mysql_execute_command(THD *thd) // Set privilege for the WHERE clause tables->grant.want_privilege=(SELECT_ACL & ~tables->grant.privilege); res = mysql_delete(thd,tables, select_lex->where, - (ORDER*) select_lex->order_list.first, + &select_lex->order_list, select_lex->select_limit, select_lex->options); if (thd->net.report_error) res= -1; |