diff options
| author | unknown <rafal@quant.(none)> | 2007-03-01 08:47:49 +0100 |
|---|---|---|
| committer | unknown <rafal@quant.(none)> | 2007-03-01 08:47:49 +0100 |
| commit | fdb1170eb133aab33da54c30d3fae96541857c21 (patch) | |
| tree | ebb31398bb46bdcde6b80deaed5d8502c564f9b1 /sql/mysql_priv.h | |
| parent | d93c7f39f8ff8db3a6106a474a3791d7b1b9e9c7 (diff) | |
| parent | b3fafa40fc839141ba525466e0c98d3db01631f8 (diff) | |
| download | mariadb-git-fdb1170eb133aab33da54c30d3fae96541857c21.tar.gz | |
Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
into quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings
sql/mysql_priv.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index e452bca8823..9f3c7037578 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -100,7 +100,7 @@ void net_set_read_timeout(NET *net, uint timeout); #define WARN_DEPRECATED(Thd,Ver,Old,New) \ do { \ DBUG_ASSERT(strncmp(Ver, MYSQL_SERVER_VERSION, sizeof(Ver)-1) > 0); \ - if (Thd != NULL) \ + if (((gptr)Thd) != NULL) \ push_warning_printf(((THD *)Thd), MYSQL_ERROR::WARN_LEVEL_WARN, \ ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX), \ (Old), (Ver), (New)); \ |