~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/array.c

Committer: Monty Taylor
Date: 2008-08-07 15:32:12 UTC
mfrom: (212.6.17 remove-redundant-mem-casts)
mto: (266.1.1 codestyle)
mto: This revision was merged to the branch mainline in revision 266.
Revision ID: monty@inaugust.com-20080807153212-r7vsim7nab9f5ob1

Merged from Mats.

files modified:
drizzled/item_strfunc.cc

drizzled/log.cc

drizzled/plugin.h

drizzled/sql_class.cc

drizzled/sql_class.h

drizzled/sql_connect.cc

drizzled/sql_parse.cc

drizzled/sql_show.cc

libdrizzle/client.c

libdrizzle/my_time.c

libdrizzle/net_serv.c

libdrizzle/password.c

mystrings/ctype-simple.c

mystrings/ctype-tis620.c

mystrings/ctype-uca.c

mystrings/dtoa.c

mysys/array.c

mysys/charset.c

mysys/default.c

mysys/hash.h

mysys/mf_format.c

mysys/mf_iocache.c

mysys/mf_radix.c

mysys/my_file.c

mysys/my_init.c

mysys/my_malloc.c

mysys/sha1.c

mysys/tests/testhash.c

mysys/thr_alarm.c

mysys/thr_lock.c

mysys/thr_mutex.c

mysys/tree.c

storage/innobase/handler/ha_innodb.cc

storage/myisam/ha_myisam.cc

Show diffs side-by-side

added added

removed removed

mysys/array.c

202

{

203

if (idx >= array->max_element && allocate_dynamic(array, idx))

204

return true;

205

memset((uchar*) (array->buffer+array->elements*array->size_of_element), 0,

206

(idx - array->elements)*array->size_of_element);

205

memset(array->buffer+array->elements*array->size_of_element, 0,

206

(idx - array->elements)*array->size_of_element);

207

array->elements=idx+1;

208

}

209

memcpy(array->buffer+(idx * array->size_of_element),element,

Older »