diff options
| author | Chad MILLER <chad@mysql.com> | 2008-07-14 16:16:37 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-07-14 16:16:37 -0400 |
| commit | a4e7283a9254c09057c92ec20fc145c52bea1d51 (patch) | |
| tree | 6009880c2c51b3422d95a760220fb7a20ebdb3e0 /sql/sql_parse.cc | |
| parent | c425bf421da9ffa55d3d568f70508fa12dd07aa0 (diff) | |
| parent | 55ab1ef6951428e0be31956e152537dec670e7df (diff) | |
| download | mariadb-git-a4e7283a9254c09057c92ec20fc145c52bea1d51.tar.gz | |
Merge from 5.0 trunk.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index dee3f2b5b22..ccd131e5f90 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2538,10 +2538,10 @@ static void reset_one_shot_variables(THD *thd) TRUE Error */ -bool +int mysql_execute_command(THD *thd) { - bool res= FALSE; + int res= FALSE; bool need_start_waiting= FALSE; // have protection against global read lock int up_result= 0; LEX *lex= thd->lex; |