diff options
| author | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-20 22:46:52 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-20 22:46:52 +0200 |
| commit | 886965303155d1c2fbd90e3606fd192d4ba7741b (patch) | |
| tree | 352c3fca9ea50d4ca34dacb71d6f6ec2a89df543 /sql-common | |
| parent | daaddeb656c26c685962fef69d19e7f264620e2b (diff) | |
| parent | 14decc4fbc04b8ce0c5efb7d76b711c6e60a0266 (diff) | |
| download | mariadb-git-886965303155d1c2fbd90e3606fd192d4ba7741b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/t/ctype_ucs.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 10 | ||||
| -rw-r--r-- | sql-common/my_time.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index fc913f3f3cf..0354cffec32 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -598,7 +598,7 @@ cli_safe_read(MYSQL *mysql) if (len == packet_error || len == 0) { - DBUG_PRINT("error",("Wrong connection or packet. fd: %s len: %d", + DBUG_PRINT("error",("Wrong connection or packet. fd: %s len: %lu", vio_description(net->vio),len)); #ifdef MYSQL_SERVER if (net->vio && vio_was_interrupted(net->vio)) @@ -870,7 +870,7 @@ void STDCALL mysql_free_result(MYSQL_RES *result) { DBUG_ENTER("mysql_free_result"); - DBUG_PRINT("enter",("mysql_res: %lx",result)); + DBUG_PRINT("enter",("mysql_res: 0x%lx", (long) result)); if (result) { MYSQL *mysql= result->handle; @@ -1366,7 +1366,7 @@ MYSQL_DATA *cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, DBUG_PRINT("info",("status: %u warning_count: %u", mysql->server_status, mysql->warning_count)); } - DBUG_PRINT("exit",("Got %d rows",result->rows)); + DBUG_PRINT("exit", ("Got %lu rows", (ulong) result->rows)); DBUG_RETURN(result); } @@ -2324,7 +2324,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, goto error; #endif - DBUG_PRINT("exit",("Mysql handler: %lx",mysql)); + DBUG_PRINT("exit", ("Mysql handler: 0x%lx", (long) mysql)); reset_sigpipe(mysql); DBUG_RETURN(mysql); @@ -2697,7 +2697,7 @@ int STDCALL mysql_real_query(MYSQL *mysql, const char *query, ulong length) { DBUG_ENTER("mysql_real_query"); - DBUG_PRINT("enter",("handle: %lx",mysql)); + DBUG_PRINT("enter",("handle: 0x%lx", (long) mysql)); DBUG_PRINT("query",("Query = '%-.4096s'",query)); if (mysql_send_query(mysql,query,length)) diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 2dd40c112de..ced2a805ae5 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -963,7 +963,7 @@ my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone, */ if ((tmp < TIMESTAMP_MIN_VALUE) || (tmp > TIMESTAMP_MAX_VALUE)) tmp= 0; -end: + return (my_time_t) tmp; } /* my_system_gmt_sec */ |