~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/handler.cc

Committer: Monty Taylor
Date: 2008-07-01 21:56:02 UTC
mfrom: (34 drizzle)
mto: (28.2.1 packaging) (77.1.30 codestyle)
mto: This revision was merged to the branch mainline in revision 37.
Revision ID: monty@inaugust.com-20080701215602-dn3u20mt3s3i9l69

Merged from trunk.

files removed:
vio/test-ssl.c

vio/test-sslclient.c

vio/test-sslserver.c

files modified:
libmysql/client.c

mysys/mf_iocache.c

mysys/mf_keycache.c

sql/filesort.cc

sql/handler.cc

sql/log.cc

sql/sql_table.cc

sql/table.cc

sql/unireg.cc

vio/Makefile.am

Show diffs side-by-side

added added

removed removed

sql/handler.cc

2710

{

2711

char path[FN_REFLEN];

2712

File file;

2713

int result= 1;

2713

bool result= true;

2714

DBUG_ENTER("update_frm_version");

2715

2716

2734

2735

int4store(version, MYSQL_VERSION_ID);

2736

2737

if ((result= my_pwrite(file,(uchar*) version,4,51L,MYF_RW)))

2737

if (pwrite(file, (uchar*)version, 4, 51L) == 0)

2738

{

2739

result= false;

2738

2740

goto err;

2741

}

2739

2742

2740

2743

for (entry=(TABLE*) hash_first(&open_cache,(uchar*) key,key_length, &state);

2741

2744

entry;

Older »