diff options
| author | unknown <monty@mysql.com> | 2004-08-31 16:53:25 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-08-31 16:53:25 +0300 |
| commit | ae3dd78b5fd15f69b426ceeac6bddb964b752626 (patch) | |
| tree | 517681f3f24bff198f452f95eba935119c9c701d /sql/sql_prepare.cc | |
| parent | 52df5f5b5a0edfb5512957eb8aa6cd6c3c53b4a5 (diff) | |
| parent | 07f5a44bc0a525c99394536a436cc85fb00fc337 (diff) | |
| download | mariadb-git-ae3dd78b5fd15f69b426ceeac6bddb964b752626.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/sql_base.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 708ca3a516f..50255e6d00c 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1041,7 +1041,7 @@ static int mysql_test_select(Prepared_statement *stmt, THD *thd= stmt->thd; LEX *lex= stmt->lex; SELECT_LEX_UNIT *unit= &lex->unit; - + int result= 1; DBUG_ENTER("mysql_test_select"); #ifndef NO_EMBEDDED_ACCESS_CHECKS @@ -1087,13 +1087,12 @@ static int mysql_test_select(Prepared_statement *stmt, goto err_prep; } } - unit->cleanup(); - DBUG_RETURN(0); + result= 0; // ok err_prep: unit->cleanup(); err: - DBUG_RETURN(1); + DBUG_RETURN(result); } |