diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-30 21:47:11 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-30 21:47:11 +0300 |
| commit | 5aa4c33e3233e2c1cac9f3bb0b17379a56503666 (patch) | |
| tree | 5bb7d787b7b4c25140afb74590153f8109510d61 /sql/sql_tablespace.cc | |
| parent | b436e0ae20da93f6ebf3231ac28f397966187175 (diff) | |
| parent | dad4291b781495cfdc8abac9dc2902621bfb3b56 (diff) | |
| download | mariadb-git-5aa4c33e3233e2c1cac9f3bb0b17379a56503666.tar.gz | |
Manual merge from mysql-5.1-bugteam.
Conflicts:
- sql/mysql_priv.h
Diffstat (limited to 'sql/sql_tablespace.cc')
| -rw-r--r-- | sql/sql_tablespace.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_tablespace.cc b/sql/sql_tablespace.cc index ef81c7d847e..4db3083eb04 100644 --- a/sql/sql_tablespace.cc +++ b/sql/sql_tablespace.cc @@ -66,6 +66,6 @@ int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info) ha_resolve_storage_engine_name(hton), "TABLESPACE or LOGFILE GROUP"); } - write_bin_log(thd, FALSE, thd->query(), thd->query_length()); - DBUG_RETURN(FALSE); + error= write_bin_log(thd, FALSE, thd->query(), thd->query_length()); + DBUG_RETURN(error); } |