From 43fe9e045c4c84bdb84d61d0dc364576d1691a30 Mon Sep 17 00:00:00 2001 From: He Zhenxing Date: Wed, 30 Sep 2009 19:36:35 +0800 Subject: Backporting BUG#40244 Optimized build of mysqld crashes when built with Sun Studio on SPARC --- sql/rpl_handler.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sql/rpl_handler.cc b/sql/rpl_handler.cc index aea838928b9..da7aade5b99 100644 --- a/sql/rpl_handler.cc +++ b/sql/rpl_handler.cc @@ -88,11 +88,11 @@ int get_user_var_str(const char *name, char *value, int delegates_init() { - static unsigned char trans_mem[sizeof(Trans_delegate)]; - static unsigned char storage_mem[sizeof(Binlog_storage_delegate)]; + static unsigned long trans_mem[sizeof(Trans_delegate) / sizeof(unsigned long) + 1]; + static unsigned long storage_mem[sizeof(Binlog_storage_delegate) / sizeof(unsigned long) + 1]; #ifdef HAVE_REPLICATION - static unsigned char transmit_mem[sizeof(Binlog_transmit_delegate)]; - static unsigned char relay_io_mem[sizeof(Binlog_relay_IO_delegate)]; + static unsigned long transmit_mem[sizeof(Binlog_transmit_delegate) / sizeof(unsigned long) + 1]; + static unsigned long relay_io_mem[sizeof(Binlog_relay_IO_delegate)/ sizeof(unsigned long) + 1]; #endif if (!(transaction_delegate= new (trans_mem) Trans_delegate) -- cgit v1.2.1