diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-14 11:12:26 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-14 11:12:26 -0300 |
| commit | 7f1eedec2d70c3afe3b9b1c788d357322189a237 (patch) | |
| tree | c1cb5b7c9fbb5fd6901154d278efe7223b5cac53 /sql/rpl_handler.cc | |
| parent | 4972f4d8030b5fc053b3c5605505215a653a39e1 (diff) | |
| parent | f317d3a6fb413cfc04c1ed005df8e859664e41d5 (diff) | |
| download | mariadb-git-7f1eedec2d70c3afe3b9b1c788d357322189a237.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/rpl_handler.cc')
| -rw-r--r-- | sql/rpl_handler.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sql/rpl_handler.cc b/sql/rpl_handler.cc index be0a61bcae2..a7b963d186c 100644 --- a/sql/rpl_handler.cc +++ b/sql/rpl_handler.cc @@ -89,24 +89,27 @@ int get_user_var_str(const char *name, char *value, int delegates_init() { - static Aligned_char_array<sizeof(Trans_delegate)> trans_mem; - static Aligned_char_array<sizeof(Binlog_storage_delegate)> storage_mem; + static my_aligned_storage<sizeof(Trans_delegate), MY_ALIGNOF(long)> trans_mem; + static my_aligned_storage<sizeof(Binlog_storage_delegate), + MY_ALIGNOF(long)> storage_mem; #ifdef HAVE_REPLICATION - static Aligned_char_array<sizeof(Binlog_transmit_delegate)> transmit_mem; - static Aligned_char_array<sizeof(Binlog_relay_IO_delegate)> relay_io_mem; + static my_aligned_storage<sizeof(Binlog_transmit_delegate), + MY_ALIGNOF(long)> transmit_mem; + static my_aligned_storage<sizeof(Binlog_relay_IO_delegate), + MY_ALIGNOF(long)> relay_io_mem; #endif - if (!(transaction_delegate= new (trans_mem.arr()) Trans_delegate) + if (!(transaction_delegate= new (trans_mem.data) Trans_delegate) || (!transaction_delegate->is_inited()) || !(binlog_storage_delegate= - new (storage_mem.arr()) Binlog_storage_delegate) + new (storage_mem.data) Binlog_storage_delegate) || (!binlog_storage_delegate->is_inited()) #ifdef HAVE_REPLICATION || !(binlog_transmit_delegate= - new (transmit_mem.arr()) Binlog_transmit_delegate) + new (transmit_mem.data) Binlog_transmit_delegate) || (!binlog_transmit_delegate->is_inited()) || !(binlog_relay_io_delegate= - new (relay_io_mem.arr()) Binlog_relay_IO_delegate) + new (relay_io_mem.data) Binlog_relay_IO_delegate) || (!binlog_relay_io_delegate->is_inited()) #endif /* HAVE_REPLICATION */ ) |