mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 03:47:17 +02:00
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
This commit is contained in:
parent
520ebda4f2
commit
79f75d8fad
15 changed files with 261 additions and 316 deletions
|
|
@ -588,6 +588,7 @@ CHARSET_INFO *get_charset_by_csname(const char *cs_name,
|
|||
~0 The escaped string did not fit in the to buffer
|
||||
>=0 The length of the escaped string
|
||||
*/
|
||||
|
||||
ulong escape_string_for_mysql(CHARSET_INFO *charset_info,
|
||||
char *to, ulong to_length,
|
||||
const char *from, ulong length)
|
||||
|
|
@ -702,6 +703,7 @@ ulong escape_string_for_mysql(CHARSET_INFO *charset_info,
|
|||
~0 The escaped string did not fit in the to buffer
|
||||
>=0 The length of the escaped string
|
||||
*/
|
||||
|
||||
ulong escape_quotes_for_mysql(CHARSET_INFO *charset_info,
|
||||
char *to, ulong to_length,
|
||||
const char *from, ulong length)
|
||||
|
|
@ -714,7 +716,6 @@ ulong escape_quotes_for_mysql(CHARSET_INFO *charset_info,
|
|||
#endif
|
||||
for (end= from + length; from < end; from++)
|
||||
{
|
||||
char escape= 0;
|
||||
#ifdef USE_MB
|
||||
int tmp_length;
|
||||
if (use_mb_flag && (tmp_length= my_ismbchar(charset_info, from, end)))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue