diff options
author | unknown <monty@mysql.com> | 2004-03-18 01:48:46 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-03-18 01:48:46 +0200 |
commit | f107cb709871414f1f59f21e718d6ba2bc7d2c4b (patch) | |
tree | 0e218cb26fd4ef2c5a39cf79f58ed0b2a447d9f1 /client/mysqltest.c | |
parent | 24148f04c736679a69fd305270617616906f3697 (diff) | |
download | mariadb-git-f107cb709871414f1f59f21e718d6ba2bc7d2c4b.tar.gz |
Don't change server suffix if given to configure
Portability fixes
client/mysqltest.c:
Fixed output of 'affected rows'
innobase/os/os0file.c:
Portability fix (for AIX)
mysql-test/r/rpl_trunc_binlog.result:
Update results after merge
sql/mysqld.cc:
Don't change server suffix if given to configure
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 4e97863f97b..ed4840cf809 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2345,7 +2345,7 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags) if (!disable_info) { char buf[40]; - sprintf(buf,"affected rows: %ld\n",mysql_affected_rows(mysql)); + sprintf(buf,"affected rows: %lu\n",(ulong) mysql_affected_rows(mysql)); dynstr_append(ds, buf); if (mysql_info(mysql)) { |