diff options
| author | unknown <anozdrin@mysql.com> | 2006-05-19 16:01:04 +0400 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-05-19 16:01:04 +0400 |
| commit | 0276916b155e8230e17285dec3cd78206e180c80 (patch) | |
| tree | f97ab7d34da8387cbc8f9bdbdb6b8fa62060b2ee | |
| parent | ac3806046b9b992b796056f398727cfcecd0f69f (diff) | |
| download | mariadb-git-0276916b155e8230e17285dec3cd78206e180c80.tar.gz | |
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.
| -rw-r--r-- | server-tools/instance-manager/log.cc | 2 | ||||
| -rw-r--r-- | sql/sql_trigger.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/server-tools/instance-manager/log.cc b/server-tools/instance-manager/log.cc index 94eaf0f7747..a88344f0b91 100644 --- a/server-tools/instance-manager/log.cc +++ b/server-tools/instance-manager/log.cc @@ -22,6 +22,8 @@ #include <stdarg.h> +#include "portability.h" /* for vsnprintf() on Windows. */ + /* TODO: - add flexible header support diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 60a64f9fc1f..0ea87f3dfe4 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1412,8 +1412,8 @@ bool Table_triggers_list::change_table_name(THD *thd, const char *db, } if (table.triggers) { - LEX_STRING old_table_name= { (char *) STRING_WITH_LEN(old_table) }; - LEX_STRING new_table_name= { (char *) STRING_WITH_LEN(new_table) }; + LEX_STRING old_table_name= { (char *) old_table, strlen(old_table) }; + LEX_STRING new_table_name= { (char *) new_table, strlen(new_table) }; /* Since triggers should be in the same schema as their subject tables moving table with them between two schemas raises too many questions. |