diff options
| author | unknown <monty@mysql.com> | 2004-05-25 02:47:25 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-25 02:47:25 +0300 |
| commit | 656e6e55f063cf6b22e096140cfe5a51d2d1b7d5 (patch) | |
| tree | cd40ef99e52fbe99be97d88ef663df2fa69b8ddb /innobase | |
| parent | 64abbed63bcbeed4be01caaafa8363809a005aee (diff) | |
| parent | da1623ddbb4dba3c4b2c56bcad52fd6bd5fb8836 (diff) | |
| download | mariadb-git-656e6e55f063cf6b22e096140cfe5a51d2d1b7d5.tar.gz | |
Merge with 4.0 to get fixes for Windows project files
VC++Files/client/mysql.dsp:
Auto merged
VC++Files/client/mysqladmin.dsp:
Auto merged
VC++Files/client/mysqldump.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/client/mysqlimport.dsp:
Auto merged
VC++Files/client/mysqlshow.dsp:
Auto merged
VC++Files/isamchk/isamchk.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
Auto merged
VC++Files/myisamchk/myisamchk.dsp:
Auto merged
VC++Files/myisamlog/myisamlog.dsp:
Auto merged
VC++Files/myisampack/myisampack.dsp:
Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
Auto merged
VC++Files/mysqlmanager/mysqlmanager.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/pack_isam/pack_isam.dsp:
Auto merged
VC++Files/perror/perror.dsp:
Auto merged
VC++Files/replace/replace.dsp:
Auto merged
include/my_global.h:
Auto merged
include/mysql_version.h.in:
Auto merged
innobase/eval/eval0eval.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
libmysql/libmysql.c:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/limits/mysql-4.0.cfg:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/eval/eval0eval.c | 2 | ||||
| -rw-r--r-- | innobase/sync/sync0arr.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/innobase/eval/eval0eval.c b/innobase/eval/eval0eval.c index a3cd60b86ae..ebb6cb1b7d9 100644 --- a/innobase/eval/eval0eval.c +++ b/innobase/eval/eval0eval.c @@ -725,7 +725,7 @@ eval_predefined( uint_val = (ulint) int_val; } for (tmp = int_len; uint_val > 0; uint_val /= 10) { - data[--tmp] = '0' + (byte)(uint_val % 10); + data[--tmp] = (byte) ('0' + (byte)(uint_val % 10)); } } diff --git a/innobase/sync/sync0arr.c b/innobase/sync/sync0arr.c index 02a9771be35..d1644412fbb 100644 --- a/innobase/sync/sync0arr.c +++ b/innobase/sync/sync0arr.c @@ -449,7 +449,6 @@ sync_array_cell_print( { mutex_t* mutex; rw_lock_t* rwlock; - char* str __attribute__((unused)) = NULL; ulint type; type = cell->request_type; |