diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-05-18 11:54:55 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-02 18:53:37 +0200 |
commit | 196e8529837558a72baf31d012285cc283b8e95d (patch) | |
tree | 75feb69d20c5fb5944dd6195bf00440143497232 /sql/parse_file.cc | |
parent | 1841557e407038e3611b0788eaf70fd3d8eb043e (diff) | |
download | mariadb-git-196e8529837558a72baf31d012285cc283b8e95d.tar.gz |
misc IO_CACHE cleanups
* remove unused (and not implemented) WRITE_NET type
* remove cast in my_b_write() macro. my_b_* macros are
function-like, casts are responsibility of the caller
* replace hackish _my_b_write(info,0,0) with the explicit
my_b_flush_io_cache() in my_b_write_byte()
* remove unused my_b_fill_cache()
* replace pbool -> my_bool
* make internal IO_CACHE functions static
* reformat comments, correct typos, remove obsolete comments (ISAM)
* assert valid cache type in init_functions()
* use IO_ROUND_DN() macro where appropriate
* remove unused DBUG_EXECUTE_IF in _my_b_cache_write()
* remove unnecessary __attribute__((unused))
* fix goto error in parse_file.cc
* remove redundant reinit_io_cache() in uniques.cc
* don't do reinit_io_cache() if the cache was not initialized
in ma_check.c
* extract duplicate functionality from various _my_b_*_read
functions into a common wrapper. Same for _my_b_*_write
* create _my_b_cache_write_r instead of having if's in
_my_b_cache_write (similar to existing _my_b_cache_read and
_my_b_cache_read_r)
* don't call mysql_file_write() from my_b_flush_io_cache(),
call info->write_function() instead
Diffstat (limited to 'sql/parse_file.cc')
-rw-r--r-- | sql/parse_file.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/parse_file.cc b/sql/parse_file.cc index df0215fb167..14c32eb09c6 100644 --- a/sql/parse_file.cc +++ b/sql/parse_file.cc @@ -294,7 +294,7 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name, if (my_b_append(&file, (const uchar *)STRING_WITH_LEN("TYPE=")) || my_b_append(&file, (const uchar *)type->str, type->length) || my_b_append(&file, (const uchar *)STRING_WITH_LEN("\n"))) - goto err_w_file; + goto err_w_cache; // write parameters to temporary file for (param= parameters; param->name.str; param++) |