~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_create.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

storage/myisam/mi_create.c

811

812

/* Enlarge files */

813

DBUG_PRINT("info", ("enlarge to keystart: %lu", (ulong) share.base.keystart));

814

if (my_chsize(file,(ulong) share.base.keystart,0,MYF(0)))

814

if (ftruncate(file, (off_t) share.base.keystart))

815

goto err;

816

817

if (! (flags & HA_DONT_TOUCH_DATA))

818

{

819

#ifdef USE_RELOC

820

if (my_chsize(dfile,share.base.min_pack_length*ci->reloc_rows,0,MYF(0)))

820

if (ftruncate(dfile,share.base.min_pack_length*ci->reloc_rows,))

821

goto err;

822

#endif

823

errpos=2;

Older »