diff options
| author | marko@hundin.mysql.fi <> | 2005-03-07 12:03:33 +0200 |
|---|---|---|
| committer | marko@hundin.mysql.fi <> | 2005-03-07 12:03:33 +0200 |
| commit | 38adb1ba79bbee843516a4b79a5fee4cc4b20139 (patch) | |
| tree | 4565fc5d7d0ed12c3a3ced426325b262f97ed87b /innobase/row/row0mysql.c | |
| parent | 473f2f940935f63cd1acd39a49f54c4e61aa19ec (diff) | |
| download | mariadb-git-38adb1ba79bbee843516a4b79a5fee4cc4b20139.tar.gz | |
InnoDB: Portability fixes for warnings reported on IA-64 Windows
Diffstat (limited to 'innobase/row/row0mysql.c')
| -rw-r--r-- | innobase/row/row0mysql.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c index 482cf698547..e2b34e6e3f1 100644 --- a/innobase/row/row0mysql.c +++ b/innobase/row/row0mysql.c @@ -745,7 +745,7 @@ run_again: trx->op_info = ""; - return(err); + return((int) err); } que_thr_stop_for_mysql_no_error(thr, trx); @@ -839,7 +839,7 @@ run_again: trx->op_info = ""; - return(err); + return((int) err); } que_thr_stop_for_mysql_no_error(thr, trx); @@ -954,7 +954,7 @@ run_again: trx->op_info = ""; - return(err); + return((int) err); } que_thr_stop_for_mysql_no_error(thr, trx); @@ -1202,7 +1202,7 @@ run_again: trx->op_info = ""; - return(err); + return((int) err); } que_thr_stop_for_mysql_no_error(thr, trx); @@ -1367,7 +1367,7 @@ row_mysql_recover_tmp_table( } else { int status; - int namelen = strlen(table->name); + int namelen = (int) strlen(table->name); char* old_name = mem_strdupl(table->name, namelen); /* replace "rsql" with "#sql" */ old_name[ptr - table->name + 1] = '#'; @@ -1857,7 +1857,7 @@ row_drop_table_for_mysql_in_background( trx_free_for_background(trx); - return(error); + return((int) error); } /************************************************************************* |