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 | 73aff380f46d5ecb2ce1f928a8321582c16ccdc7 (patch) | |
| tree | df2c427c1d086dc0727fa8656815cece6df4aeb2 /innobase/que/que0que.c | |
| parent | 02c4489f11c61a517ad4c968cfceed99c4eb432d (diff) | |
| download | mariadb-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 'innobase/que/que0que.c')
| -rw-r--r-- | innobase/que/que0que.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/innobase/que/que0que.c b/innobase/que/que0que.c index 3f28a4b40a5..7e4babd43ef 100644 --- a/innobase/que/que0que.c +++ b/innobase/que/que0que.c @@ -513,7 +513,7 @@ que_graph_free_recursive( if (thr->magic_n != QUE_THR_MAGIC_N) { fprintf(stderr, "que_thr struct appears corrupt; magic n %lu\n", - thr->magic_n); + (unsigned long) thr->magic_n); mem_analyze_corruption((byte*)thr); ut_a(0); } @@ -625,7 +625,7 @@ que_graph_free_recursive( default: fprintf(stderr, "que_node struct appears corrupt; type %lu\n", - que_node_get_type(node)); + (unsigned long) que_node_get_type(node)); mem_analyze_corruption((byte*)node); ut_a(0); } @@ -1105,7 +1105,8 @@ que_thr_move_to_run_state_for_mysql( { if (thr->magic_n != QUE_THR_MAGIC_N) { fprintf(stderr, - "que_thr struct appears corrupt; magic n %lu\n", thr->magic_n); + "que_thr struct appears corrupt; magic n %lu\n", + (unsigned long) thr->magic_n); mem_analyze_corruption((byte*)thr); @@ -1141,7 +1142,8 @@ que_thr_stop_for_mysql_no_error( if (thr->magic_n != QUE_THR_MAGIC_N) { fprintf(stderr, - "que_thr struct appears corrupt; magic n %lu\n", thr->magic_n); + "que_thr struct appears corrupt; magic n %lu\n", + (unsigned long) thr->magic_n); mem_analyze_corruption((byte*)thr); @@ -1216,7 +1218,8 @@ que_node_print_info( str = (char *) "UNKNOWN NODE TYPE"; } - printf("Node type %lu: %s, address %lx\n", type, str, addr); + printf("Node type %lu: %s, address %lx\n", (unsigned long) type, str, + (unsigned long) addr); } /************************************************************************** |