diff options
| author | unknown <Dao-Gang.Qu@sun.com> | 2010-01-25 10:55:05 +0800 |
|---|---|---|
| committer | unknown <Dao-Gang.Qu@sun.com> | 2010-01-25 10:55:05 +0800 |
| commit | dad4291b781495cfdc8abac9dc2902621bfb3b56 (patch) | |
| tree | 79b80f370265c5019547a5ef30b218665a358d84 /sql/sql_tablespace.cc | |
| parent | 3cae7d1187795a8089b6f54ac60cf2a0e579cf89 (diff) | |
| parent | 2b16517522afad76bc94b07bdaa8af64091e713b (diff) | |
| download | mariadb-git-dad4291b781495cfdc8abac9dc2902621bfb3b56.tar.gz | |
Manual merge with Conflicts:
sql_udf.cc
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 fcc442a8f9a..65107f8679e 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); } |