diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-07-05 21:46:53 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-07-05 21:46:53 +0200 |
| commit | f9cb1467b84aba6cdc3178617def27c2993f016d (patch) | |
| tree | b415e273aafc2a6f0612b1f6cc55dbb0b0a06827 /sql | |
| parent | 9e95a54793920ade348399a74a1e39ea3a27b635 (diff) | |
| parent | b48dc8306f2b729bef09f9cdf30d7897726b873e (diff) | |
| download | mariadb-git-f9cb1467b84aba6cdc3178617def27c2993f016d.tar.gz | |
merge Windows performance patches into 5.3
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/discover.cc | 2 | ||||
| -rw-r--r-- | sql/item_strfunc.cc | 6 | ||||
| -rw-r--r-- | sql/mysql_priv.h | 3 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/sql/discover.cc b/sql/discover.cc index 56dc00cc5c4..92af5d56016 100644 --- a/sql/discover.cc +++ b/sql/discover.cc @@ -67,7 +67,7 @@ int readfrm(const char *name, uchar **frmdata, size_t *len) error= 2; if (my_fstat(file, &state, MYF(0))) goto err; - read_len= state.st_size; + read_len= (size_t)state.st_size; // Read whole frm file error= 3; diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 453773478d8..a2f600d8473 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -3026,16 +3026,16 @@ String *Item_load_file::val_str(String *str) func_name(), current_thd->variables.max_allowed_packet); goto err; } - if (tmp_value.alloc(stat_info.st_size)) + if (tmp_value.alloc((size_t)stat_info.st_size)) goto err; if ((file = my_open(file_name->ptr(), O_RDONLY, MYF(0))) < 0) goto err; - if (my_read(file, (uchar*) tmp_value.ptr(), stat_info.st_size, MYF(MY_NABP))) + if (my_read(file, (uchar*) tmp_value.ptr(), (size_t)stat_info.st_size, MYF(MY_NABP))) { my_close(file, MYF(0)); goto err; } - tmp_value.length(stat_info.st_size); + tmp_value.length((uint32)stat_info.st_size); my_close(file, MYF(0)); null_value = 0; DBUG_RETURN(&tmp_value); diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 442f9aaecd7..dfb5f193d41 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -413,7 +413,6 @@ protected: #define DELAYED_LIMIT 100 /**< pause after xxx inserts */ #define DELAYED_QUEUE_SIZE 1000 #define DELAYED_WAIT_TIMEOUT 5*60 /**< Wait for delayed insert */ -#define FLUSH_TIME 0 /**< Don't flush tables */ #define MAX_CONNECT_ERRORS 10 ///< errors before disabling host #ifdef __NETWARE__ @@ -423,8 +422,6 @@ protected: #endif #if defined(__WIN__) -#undef FLUSH_TIME -#define FLUSH_TIME 1800 /**< Flush every half hour */ #define INTERRUPT_PRIOR -2 #define CONNECT_PRIOR -1 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 851ea915d6c..7aee975f102 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -7215,7 +7215,7 @@ each time the SQL thread starts.", { "flush_time", OPT_FLUSH_TIME, "A dedicated thread is created to flush all tables at the given interval.", &flush_time, &flush_time, 0, GET_ULONG, REQUIRED_ARG, - FLUSH_TIME, 0, LONG_TIMEOUT, 0, 1, 0}, + 0 , 0, LONG_TIMEOUT, 0, 1, 0}, { "ft_boolean_syntax", OPT_FT_BOOLEAN_SYNTAX, "List of operators for MATCH ... AGAINST ( ... IN BOOLEAN MODE).", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, |