~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/default_modify.c

Committer: Monty Taylor
Date: 2008-07-01 15:01:39 UTC
mfrom: (30.1.2 trunk)
mto: (28.2.1 packaging) (77.1.30 codestyle)
mto: This revision was merged to the branch mainline in revision 34.
Revision ID: monty@inaugust.com-20080701150139-62nggvaoxbf81ns7

Merged in changes.
Edited a the comment test case so deal with our version bump.

files removed:
mysys/my_chsize.c

mysys/my_largepage.c

files renamed:
sql/password.c => sql-common/password.c

files modified:
configure.in

include/my_sys.h

libmysql/Makefile.am

mysql-test/r/comments.result

mysql-test/t/comments.test

mysys/Makefile.am

mysys/default_modify.c

mysys/mf_keycache.c

mysys/my_compress.c

mysys/my_static.c

sql-common/Makefile.am

sql/Makefile.am

sql/log.cc

sql/mysql_priv.h

sql/mysqld.cc

sql/set_var.cc

sql/table.cc

storage/csv/ha_tina.cc

storage/innobase/handler/ha_innodb.cc

storage/myisam/mi_check.c

storage/myisam/mi_create.c

storage/myisam/mi_delete_all.c

storage/myisam/myisampack.c

Show diffs side-by-side

added added

removed removed

mysys/default_modify.c

209

if (opt_applied)

210

{

211

/* Don't write the file if there are no changes to be made */

212

if (my_chsize(fileno(cnf_file), (my_off_t) (dst_ptr - file_buffer), 0,

213

MYF(MY_WME)) ||

212

if (ftruncate(fileno(cnf_file), (my_off_t) (dst_ptr - file_buffer)) ||

214

213

my_fseek(cnf_file, 0, MY_SEEK_SET, MYF(0)) ||

215

214

my_fwrite(cnf_file, (uchar*) file_buffer, (size_t) (dst_ptr - file_buffer),

216

215

MYF(MY_NABP)))

Older »