diff options
| author | unknown <monty@mysql.com> | 2005-07-28 16:10:14 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-07-28 16:10:14 +0300 |
| commit | 79f75d8fad96e7b1da588eb850a25f9e9697ac2e (patch) | |
| tree | af22629d2c36ae4196e6f23584c4cecc393b874e /sql/sql_trigger.cc | |
| parent | 520ebda4f22a4471ddedddf1a63561787f31c409 (diff) | |
| download | mariadb-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/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index a7aee95197e..ee16b219421 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -564,8 +564,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, alloc_root(&table->mem_root, triggers->sroutines_key.length))) DBUG_RETURN(1); triggers->sroutines_key.str[0]= TYPE_ENUM_TRIGGER; - strmov(strmov(strmov(triggers->sroutines_key.str+1, db), "."), - table_name); + strxmov(triggers->sroutines_key.str+1, db, ".", table_name, NullS); /* TODO: This could be avoided if there is no triggers |