diff options
| -rw-r--r-- | mysql-test/r/rpl_insert.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/rpl_insert.test | 2 | ||||
| -rw-r--r-- | mysys/my_malloc.c | 2 | ||||
| -rw-r--r-- | server-tools/instance-manager/parse.h | 2 | ||||
| -rw-r--r-- | sql/ha_federated.cc | 7 | ||||
| -rw-r--r-- | sql/log_event.cc | 7 | ||||
| -rw-r--r-- | sql/set_var.cc | 4 | ||||
| -rw-r--r-- | sql/set_var.h | 2 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 6 |
9 files changed, 18 insertions, 18 deletions
diff --git a/mysql-test/r/rpl_insert.result b/mysql-test/r/rpl_insert.result index b0c44be017f..bcc9b176ed3 100644 --- a/mysql-test/r/rpl_insert.result +++ b/mysql-test/r/rpl_insert.result @@ -9,8 +9,8 @@ USE mysqlslap; CREATE TABLE t1 (id INT, name VARCHAR(64)); SELECT COUNT(*) FROM mysqlslap.t1; COUNT(*) -20000 +5000 SELECT COUNT(*) FROM mysqlslap.t1; COUNT(*) -20000 +5000 DROP SCHEMA IF EXISTS mysqlslap; diff --git a/mysql-test/t/rpl_insert.test b/mysql-test/t/rpl_insert.test index 1b67736dd72..9225606c94b 100644 --- a/mysql-test/t/rpl_insert.test +++ b/mysql-test/t/rpl_insert.test @@ -15,7 +15,7 @@ USE mysqlslap; CREATE TABLE t1 (id INT, name VARCHAR(64)); let $query = "INSERT DELAYED INTO t1 VALUES (1, 'Dr. No'), (2, 'From Russia With Love'), (3, 'Goldfinger'), (4, 'Thunderball'), (5, 'You Only Live Twice')"; ---exec $MYSQL_SLAP --silent --concurrency=20 --iterations=200 --query=$query --delimiter=";" +--exec $MYSQL_SLAP --silent --concurrency=5 --iterations=200 --query=$query --delimiter=";" --sleep 10 diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index 3fb3866f79c..9dd5530bd28 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -83,7 +83,7 @@ char *my_strdup(const char *from, myf my_flags) } -char *my_strndup(const byte *from, uint length, myf my_flags) +char *my_strndup(const char *from, uint length, myf my_flags) { gptr ptr; if ((ptr=my_malloc(length+1,my_flags)) != 0) diff --git a/server-tools/instance-manager/parse.h b/server-tools/instance-manager/parse.h index ae29c7eb64a..fd970f54d29 100644 --- a/server-tools/instance-manager/parse.h +++ b/server-tools/instance-manager/parse.h @@ -69,7 +69,7 @@ private: inline char *Named_value::alloc_str(const LEX_STRING *str) { - return my_strndup((const byte *) str->str, str->length, MYF(0)); + return my_strndup(str->str, str->length, MYF(0)); } inline char *Named_value::alloc_str(const char *str) diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index 91111a433dc..be923591cac 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -629,10 +629,9 @@ static int parse_url(FEDERATED_SHARE *share, TABLE *table, DBUG_PRINT("info", ("Length: %d", table->s->connect_string.length)); DBUG_PRINT("info", ("String: '%.*s'", table->s->connect_string.length, table->s->connect_string.str)); - share->scheme= my_strndup((const byte*)table->s-> - connect_string.str, - table->s->connect_string.length, - MYF(0)); + share->scheme= my_strndup(table->s->connect_string.str, + table->s->connect_string.length, + MYF(0)); // Add a null for later termination of table name share->scheme[table->s->connect_string.length]= 0; diff --git a/sql/log_event.cc b/sql/log_event.cc index 36805e0043d..02bf22429f2 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -3175,8 +3175,7 @@ Rotate_log_event::Rotate_log_event(const char* new_log_ident_arg, llstr(pos_arg, buff), flags)); #endif if (flags & DUP_NAME) - new_log_ident= my_strndup((const byte*) new_log_ident_arg, - ident_len, MYF(MY_WME)); + new_log_ident= my_strndup(new_log_ident_arg, ident_len, MYF(MY_WME)); DBUG_VOID_RETURN; } #endif @@ -3199,9 +3198,7 @@ Rotate_log_event::Rotate_log_event(const char* buf, uint event_len, (header_size+post_header_len)); ident_offset = post_header_len; set_if_smaller(ident_len,FN_REFLEN-1); - new_log_ident= my_strndup((byte*) buf + ident_offset, - (uint) ident_len, - MYF(MY_WME)); + new_log_ident= my_strndup(buf + ident_offset, (uint) ident_len, MYF(MY_WME)); DBUG_VOID_RETURN; } diff --git a/sql/set_var.cc b/sql/set_var.cc index b0ecc7eccef..bb9ef4d453f 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1097,7 +1097,7 @@ bool update_sys_var_str(sys_var_str *var_str, rw_lock_t *var_mutex, uint new_length= (var ? var->value->str_value.length() : 0); if (!old_value) old_value= (char*) ""; - if (!(res= my_strndup((byte*)old_value, new_length, MYF(0)))) + if (!(res= my_strndup(old_value, new_length, MYF(0)))) return 1; /* Replace the old value in such a way that the any thread using @@ -2632,7 +2632,7 @@ bool update_sys_var_str_path(THD *thd, sys_var_str *var_str, old_value= make_default_log_name(buff, log_ext); str_length= strlen(old_value); } - if (!(res= my_strndup((byte*)old_value, str_length, MYF(MY_FAE+MY_WME)))) + if (!(res= my_strndup(old_value, str_length, MYF(MY_FAE+MY_WME)))) { result= 1; goto err; diff --git a/sql/set_var.h b/sql/set_var.h index d01ce833d14..b968b4c7840 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -1055,7 +1055,7 @@ public: uint name_length_arg, gptr data_arg) :name_length(name_length_arg), data(data_arg) { - name= my_strndup((byte*) name_arg, name_length, MYF(MY_WME)); + name= my_strndup(name_arg, name_length, MYF(MY_WME)); links->push_back(this); } inline bool cmp(const char *name_cmp, uint length) diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 2ec2555d6fc..ceeb4f6fdf8 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1638,8 +1638,12 @@ write_delayed(THD *thd,TABLE *table, enum_duplicates duplic, */ if (query.str) - if (!(query.str= my_strndup(query.str, MYF(MY_WME), query.length))) + { + char *str; + if (!(str= my_strndup(query.str, query.length, MYF(MY_WME)))) goto err; + query.str= str; + } row= new delayed_row(query, duplic, ignore, log_on); if (row == NULL) { |