diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-11-01 17:33:55 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-11-01 17:33:55 +0100 |
| commit | 0b034dd21fd20935eb15f93c3a4f0c94f1b7116b (patch) | |
| tree | 23bdaa83c6796362ff9b620e61f306fe3f644c2d /libmysql | |
| parent | 48cbd14165a2d3d4d5c33fd7a4c9ad198dee5dd3 (diff) | |
| parent | e5d2a53b783d9a0b5240b21d21883b66f036009b (diff) | |
| download | mariadb-git-0b034dd21fd20935eb15f93c3a4f0c94f1b7116b.tar.gz | |
merge 5.1 => 5.5
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index bb814dade09..ed1a85f86b4 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4218,7 +4218,7 @@ int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *my_bind, if ((int) stmt->state < (int) MYSQL_STMT_FETCH_DONE) { set_stmt_error(stmt, CR_NO_DATA, unknown_sqlstate, NULL); - return 1; + DBUG_RETURN(1); } if (column >= stmt->field_count) { |