diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-25 22:44:57 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-25 22:44:57 +0300 |
| commit | 287b05d431d19bd57376fd30432d23f00f3a9329 (patch) | |
| tree | 423d50939ffecb0332aa31928804fc8a06a5dd45 /client/mysqltest.c | |
| parent | d01c22d92a5713ae4574e1e877dd286e712ca05d (diff) | |
| parent | 6052a1955c030dc1716bed82fb45af84030e3f55 (diff) | |
| download | mariadb-git-287b05d431d19bd57376fd30432d23f00f3a9329.tar.gz | |
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/log.cc:
Auto merged
sql/mysqlbinlog.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'client/mysqltest.c')
| -rw-r--r-- | client/mysqltest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 8714b3c382a..5eaefe165d7 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; |