1. Fix compilation on Windows;

2. Fix trigger.test.


server-tools/instance-manager/log.cc:
  Fix compilation in Windows.
sql/sql_trigger.cc:
  Use strlen() instead of sizeof() for C-strings.
This commit is contained in:
unknown 2006-05-19 16:01:04 +04:00
parent ac3806046b
commit 0276916b15
2 changed files with 4 additions and 2 deletions

View File

@ -22,6 +22,8 @@
#include <stdarg.h> #include <stdarg.h>
#include "portability.h" /* for vsnprintf() on Windows. */
/* /*
TODO: TODO:
- add flexible header support - add flexible header support

View File

@ -1412,8 +1412,8 @@ bool Table_triggers_list::change_table_name(THD *thd, const char *db,
} }
if (table.triggers) if (table.triggers)
{ {
LEX_STRING old_table_name= { (char *) STRING_WITH_LEN(old_table) }; LEX_STRING old_table_name= { (char *) old_table, strlen(old_table) };
LEX_STRING new_table_name= { (char *) STRING_WITH_LEN(new_table) }; LEX_STRING new_table_name= { (char *) new_table, strlen(new_table) };
/* /*
Since triggers should be in the same schema as their subject tables Since triggers should be in the same schema as their subject tables
moving table with them between two schemas raises too many questions. moving table with them between two schemas raises too many questions.