diff options
| author | unknown <monty@mysql.com> | 2003-11-23 14:36:41 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-11-23 14:36:41 +0200 |
| commit | ce44db9fb1fc20133e05cab5cd99195c814f3b05 (patch) | |
| tree | df2c427c1d086dc0727fa8656815cece6df4aeb2 /innobase/include/buf0buf.ic | |
| parent | b1a563c39233b6af3939f23e4b50d89d7b28a74a (diff) | |
| download | mariadb-git-ce44db9fb1fc20133e05cab5cd99195c814f3b05.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 'innobase/include/buf0buf.ic')
| -rw-r--r-- | innobase/include/buf0buf.ic | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/innobase/include/buf0buf.ic b/innobase/include/buf0buf.ic index 281bb1ea527..eb22bae7ff0 100644 --- a/innobase/include/buf0buf.ic +++ b/innobase/include/buf0buf.ic @@ -219,8 +219,8 @@ buf_block_align( "InnoDB: corruption. If this happens in an InnoDB database recovery,\n" "InnoDB: you can look from section 6.1 at http://www.innodb.com/ibman.html\n" "InnoDB: how to force recovery.\n", - (ulint)ptr, (ulint)frame_zero, - (ulint)(buf_pool->high_end)); + (long)ptr, (long)frame_zero, + (long)(buf_pool->high_end)); ut_a(0); } @@ -255,8 +255,8 @@ buf_frame_align( "InnoDB: corruption. If this happens in an InnoDB database recovery,\n" "InnoDB: you can look from section 6.1 at http://www.innodb.com/ibman.html\n" "InnoDB: how to force recovery.\n", - (ulint)ptr, (ulint)(buf_pool->frame_zero), - (ulint)(buf_pool->high_end)); + (long)ptr, (long)(buf_pool->frame_zero), + (long)(buf_pool->high_end)); ut_a(0); } |