summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-07-28 16:10:14 +0300
committerunknown <monty@mysql.com>2005-07-28 16:10:14 +0300
commit79f75d8fad96e7b1da588eb850a25f9e9697ac2e (patch)
treeaf22629d2c36ae4196e6f23584c4cecc393b874e /sql/log.cc
parent520ebda4f22a4471ddedddf1a63561787f31c409 (diff)
downloadmariadb-git-79f75d8fad96e7b1da588eb850a25f9e9697ac2e.tar.gz
Cleanups during review of new code
Ensure mysql_close() is called if mysql_set_character_set() fails libmysql/libmysql.c: Indentation cleanup mysql-test/r/select.result: Fix bad merge & align code with 4.1 mysql-test/r/type_newdecimal.result: Added test of extreme case mysql-test/t/select.test: Fix bad merge & align code with 4.1 mysql-test/t/type_newdecimal.test: Added test of extreme case mysys/charset.c: Removed not used variable mysys/default.c: Simplify code sql-common/client.c: Ensure mysql_close() is called if mysql_set_character_set() fails sql/log.cc: strmov(strmov()) -> strxmov() sql/sp.cc: Indentation fixes sql/sql_acl.cc: Indentation fixes sql/sql_base.cc: Added commments Moved variable to inner block sql/sql_show.cc: Simple optimization (removed loop variable) sql/sql_trigger.cc: strmov(strmov()) -> strxmov() strings/decimal.c: Indentation fixes
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 7b67a11ab53..540e482f578 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2209,7 +2209,7 @@ bool flush_error_log()
On Windows is necessary a temporary file for to rename
the current error file.
*/
- strmov(strmov(err_temp, err_renamed),"-tmp");
+ strxmov(err_temp, err_renamed,"-tmp",NullS);
(void) my_delete(err_temp, MYF(0));
if (freopen(err_temp,"a+",stdout))
{