summaryrefslogtreecommitdiff
path: root/client/mysqltest.c
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-04-25 22:44:27 +0300
committerunknown <monty@donna.mysql.fi>2001-04-25 22:44:27 +0300
commit97907ee8d723a9143734655151153e2c6243ab28 (patch)
tree681105409812886e617023277721945b0d24d385 /client/mysqltest.c
parent028c259d0cf1c9b7d1d0819c10c689e602bb8482 (diff)
downloadmariadb-git-97907ee8d723a9143734655151153e2c6243ab28.tar.gz
Portability fixes for Ia64 and Sgi compiler
DROP DATABASE in mysqladmin asks for confirmation (again) Added examined_rows to slow query log SHOW CREATE for TEMPORARY table BitKeeper/deleted/.del-shw000001.result~8b20b03d8319b9a5: Delete: mysql-test/r/shw000001.result BitKeeper/deleted/.del-shw000001.test~770d96a2c1c65b20: Delete: mysql-test/t/shw000001.test Docs/manual.texi: Added information about InnoDB and TEMPORARY tables acinclude.m4: Portability fixes client/errmsg.c: merge with libmysqd/errmsg.c client/mysqladmin.c: DROP DATABASE asks for confirmation (again) client/mysqltest.c: Portability fixes configure.in: Portability fixes for SGI compiler on Ia64 extra/resolve_stack_dump.c: Portability fixes include/global.h: Portability fixes isam/_dbug.c: Portability fixes mysql-test/mysql-test-run.sh: Portability fixes mysql-test/r/show_check.result: New test for SHOW CREATE mysql-test/t/show_check.test: New test for SHOW CREATE scripts/make_binary_distribution.sh: Added missing files sql/filesort.cc: Added examined_rows to slow query log sql/log.cc: Added examined_rows to slow query log sql/mysql_priv.h: Added examined_rows to slow query log sql/mysqlbinlog.cc: Fixed core dump when using wrong option sql/mysqld.cc: Removed not used argument sql/sql_base.cc: Fixed name problem with SHOW CREATE for TEMPORARY table sql/sql_class.h: Added examined_rows to slow query log sql/sql_parse.cc: Added examined_rows to slow query log sql/sql_select.cc: Added examined_rows to slow query log sql/sql_select.h: Added examined_rows to slow query log sql/sql_show.cc: Fixed SHOW CREATE for TEMPORARY table sql/sql_table.cc: Added examined_rows to slow query log
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r--client/mysqltest.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index f03439680eb..dd2d6340bf1 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -569,7 +569,7 @@ int eval_expr(VAR* v, const char* p, const char** p_end)
else
{
v->str_val = (char*)p;
- v->str_val_len = (p_end && *p_end) ? *p_end - p : strlen(p);
+ v->str_val_len = (p_end && *p_end) ? (int) (*p_end - p) : (int) strlen(p);
v->int_val=atoi(p);
v->int_dirty=0;
return 0;