diff options
| author | unknown <lars/lthalmann@dl145k.mysql.com> | 2007-06-21 17:13:02 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145k.mysql.com> | 2007-06-21 17:13:02 +0200 |
| commit | 63d7c4a8c837113be1d1f2b45e02c7cd0aeee4d8 (patch) | |
| tree | 4cebbff86a038e8f7be63238c8a21a11e106bf20 /sql/handler.cc | |
| parent | 3e878beddb0c70e9a8204ce04dfcc92c135c1f39 (diff) | |
| parent | 72253445131fa3033243a9b663f4d88af019c547 (diff) | |
| download | mariadb-git-63d7c4a8c837113be1d1f2b45e02c7cd0aeee4d8.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
mysys/charset.c:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index d6913b9100a..b290c5acaa7 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3376,8 +3376,8 @@ TYPELIB *ha_known_exts(void) const char **ext, *old_ext; known_extensions_id= mysys_usage_id; - found_exts.push_back((char*) triggers_file_ext); - found_exts.push_back((char*) trigname_file_ext); + found_exts.push_back((char*) TRG_EXT); + found_exts.push_back((char*) TRN_EXT); plugin_foreach(NULL, exts_handlerton, MYSQL_STORAGE_ENGINE_PLUGIN, &found_exts); |