diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2005-03-03 17:38:58 +0300 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2005-03-03 17:38:58 +0300 |
| commit | 66d2d13a8e3e70e54d92fc6686601b72f3bd2464 (patch) | |
| tree | 65334cab84adbedadc1692f32a963b400609c15c /sql | |
| parent | 43668c53e0b5c76a72b1a175820cdb657f4f2eca (diff) | |
| download | mariadb-git-66d2d13a8e3e70e54d92fc6686601b72f3bd2464.tar.gz | |
Fix for bug#8740: Server crash at start on Solaris 9 (64 bit)
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log.cc | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/sql_class.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sql/log.cc b/sql/log.cc index 5d77197a9b9..d5c7cd5464f 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -2457,7 +2457,7 @@ void sql_print_information(const char *format, ...) static const char tc_log_magic[]={(char) 254, 0x23, 0x05, 0x74}; -uint opt_tc_log_size=TC_LOG_MIN_SIZE; +ulong opt_tc_log_size= TC_LOG_MIN_SIZE; ulong tc_log_max_pages_used=0, tc_log_page_size=0, tc_log_page_waits=0, tc_log_cur_pages_used=0; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ce70b05761a..2a466af52e9 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4566,7 +4566,7 @@ Disable with --skip-isam.", REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"log-tc-size", OPT_LOG_TC_SIZE, "Size of transaction coordinator log.", (gptr*) &opt_tc_log_size, (gptr*) &opt_tc_log_size, 0, GET_ULONG, - REQUIRED_ARG, TC_LOG_MIN_SIZE, TC_LOG_MIN_SIZE, ~0, 0, TC_LOG_PAGE_SIZE, 0}, + REQUIRED_ARG, TC_LOG_MIN_SIZE, TC_LOG_MIN_SIZE, ~0L, 0, TC_LOG_PAGE_SIZE, 0}, {"log-update", OPT_UPDATE_LOG, "The update log is deprecated since version 5.0, is replaced by the binary \ log and this option justs turns on --log-bin instead.", diff --git a/sql/sql_class.h b/sql/sql_class.h index ff30faf1150..e88205568c2 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -45,7 +45,7 @@ extern const char **errmesg; #define TC_LOG_PAGE_SIZE 8192 #define TC_LOG_MIN_SIZE (3*TC_LOG_PAGE_SIZE) -extern uint opt_tc_log_size; +extern ulong opt_tc_log_size; extern ulong tc_log_max_pages_used; extern ulong tc_log_page_size; extern ulong tc_log_page_waits; |