summaryrefslogtreecommitdiff
path: root/VC++Files
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-11-23 14:36:41 +0200
committerunknown <monty@mysql.com>2003-11-23 14:36:41 +0200
commit73aff380f46d5ecb2ce1f928a8321582c16ccdc7 (patch)
treedf2c427c1d086dc0727fa8656815cece6df4aeb2 /VC++Files
parent02c4489f11c61a517ad4c968cfceed99c4eb432d (diff)
downloadmariadb-git-73aff380f46d5ecb2ce1f928a8321582c16ccdc7.tar.gz
Fixed compiler warnings from Intel compiler in Win64
Added option --max-record-length=# to myisamchk Don't try repair twice if doing myisamchk --repair --force Shared memory handler didn't clean up things on errors or shutdown VC++Files/libmysqltest/mytest.c: Fixed compiler warnings from Intel compiler include/myisam.h: Added option --max-record-length=# to myisamchk include/mysql_com.h: Fixed compiler warnings from Intel compiler innobase/btr/btr0btr.c: Fixed compiler warnings from Intel compiler innobase/btr/btr0cur.c: Fixed compiler warnings from Intel compiler innobase/include/btr0btr.ic: Fixed compiler warnings from Intel compiler innobase/include/buf0buf.ic: Fixed compiler warnings from Intel compiler innobase/include/row0sel.ic: Fixed compiler warnings from Intel compiler innobase/include/row0upd.ic: Fixed compiler warnings from Intel compiler innobase/include/trx0rseg.ic: Fixed compiler warnings from Intel compiler innobase/pars/pars0opt.c: Fixed compiler warnings from Intel compiler innobase/que/que0que.c: Fixed compiler warnings from Intel compiler myisam/mi_check.c: Added option --max-record-length=# to myisamchk Better error messages myisam/myisamchk.c: Added option --max-record-length=# to myisamchk Don't try repair twice if doing myisamchk --repair --force mysql-test/r/create.result: Updated test results mysql-test/t/create.test: Better initialization sql/ha_innodb.cc: Fixed compiler warnings from Intel compiler sql/item_func.cc: Fixed compiler warnings from Intel compiler sql/mysqld.cc: Fixed compiler warnings from Intel compiler Cleaned up handle_connections_shared_memory Shared memory handler didn't clean up things on errors or shutdown strings/bmove512.c: Fixed compiler warnings from Intel compiler
Diffstat (limited to 'VC++Files')
-rw-r--r--VC++Files/libmysqltest/mytest.c48
1 files changed, 26 insertions, 22 deletions
diff --git a/VC++Files/libmysqltest/mytest.c b/VC++Files/libmysqltest/mytest.c
index ceecbb19902..9af8c486e40 100644
--- a/VC++Files/libmysqltest/mytest.c
+++ b/VC++Files/libmysqltest/mytest.c
@@ -40,7 +40,7 @@ main( int argc, char * argv[] )
MYSQL_ROW row ;
//....just curious....
- printf( "sizeof( MYSQL ) == %d\n", sizeof( MYSQL ) ) ;
+ printf( "sizeof( MYSQL ) == %d\n", (int) sizeof( MYSQL ) ) ;
if ( argc == 2 )
{
strcpy( szDB, argv[ 1 ] ) ;
@@ -49,27 +49,31 @@ main( int argc, char * argv[] )
{
strcpy( szDB, "mysql" ) ;
printf("Some mysql struct information (size and offset):\n");
- printf("net:\t%3d %3d\n",sizeof(myData->net),offsetof(MYSQL,net));
- printf("host:\t%3d %3d\n",sizeof(myData->host),offsetof(MYSQL,host));
- printf("port:\t%3d %3d\n",sizeof(myData->port),offsetof(MYSQL,port));
- printf("protocol_version:\t%3d %3d\n",sizeof(myData->protocol_version),
- offsetof(MYSQL,protocol_version));
- printf("thread_id:\t%3d %3d\n",sizeof(myData->thread_id),
- offsetof(MYSQL,thread_id));
- printf("affected_rows:\t%3d %3d\n",sizeof(myData->affected_rows),
- offsetof(MYSQL,affected_rows));
- printf("packet_length:\t%3d %3d\n",sizeof(myData->packet_length),
- offsetof(MYSQL,packet_length));
- printf("status:\t%3d %3d\n",sizeof(myData->status),
- offsetof(MYSQL,status));
- printf("fields:\t%3d %3d\n",sizeof(myData->fields),
- offsetof(MYSQL,fields));
- printf("field_alloc:\t%3d %3d\n",sizeof(myData->field_alloc),
- offsetof(MYSQL,field_alloc));
- printf("free_me:\t%3d %3d\n",sizeof(myData->free_me),
- offsetof(MYSQL,free_me));
- printf("options:\t%3d %3d\n",sizeof(myData->options),
- offsetof(MYSQL,options));
+ printf("net:\t%3d %3d\n",(int) sizeof(myData->net),
+ (int) offsetof(MYSQL,net));
+ printf("host:\t%3d %3d\n",(int) sizeof(myData->host),
+ (int) offsetof(MYSQL,host));
+ printf("port:\t%3d %3d\n", (int) sizeof(myData->port),
+ (int) offsetof(MYSQL,port));
+ printf("protocol_version:\t%3d %3d\n",
+ (int) sizeof(myData->protocol_version),
+ (int) offsetof(MYSQL,protocol_version));
+ printf("thread_id:\t%3d %3d\n",(int) sizeof(myData->thread_id),
+ (int) offsetof(MYSQL,thread_id));
+ printf("affected_rows:\t%3d %3d\n",(int) sizeof(myData->affected_rows),
+ (int) offsetof(MYSQL,affected_rows));
+ printf("packet_length:\t%3d %3d\n",(int) sizeof(myData->packet_length),
+ (int) offsetof(MYSQL,packet_length));
+ printf("status:\t%3d %3d\n",(int) sizeof(myData->status),
+ (int) offsetof(MYSQL,status));
+ printf("fields:\t%3d %3d\n",(int) sizeof(myData->fields),
+ (int) offsetof(MYSQL,fields));
+ printf("field_alloc:\t%3d %3d\n",(int) sizeof(myData->field_alloc),
+ (int) offsetof(MYSQL,field_alloc));
+ printf("free_me:\t%3d %3d\n",(int) sizeof(myData->free_me),
+ (int) offsetof(MYSQL,free_me));
+ printf("options:\t%3d %3d\n",(int) sizeof(myData->options),
+ (int) offsetof(MYSQL,options));
puts("");
}
}