diff options
| author | Michael Widenius <monty@mysql.com> | 2009-04-25 13:05:32 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-04-25 13:05:32 +0300 |
| commit | e726e587ec6287472dd450dbcbddf07669b3e028 (patch) | |
| tree | e644a6134bfe892512501c648c938a2e93f08130 /sql/sql_load.cc | |
| parent | 210a412522b10115d34b431c66acf403faab7bfe (diff) | |
| parent | 086185089e6c7bef58dde49b02950689af9fee63 (diff) | |
| download | mariadb-git-e726e587ec6287472dd450dbcbddf07669b3e028.tar.gz | |
Merged with mysql-5.1 tree.
client/mysqltest.cc:
Manually merged
configure.in:
Manually merged
mysql-test/r/variables.result:
Manually merged
mysql-test/t/variables.test:
Manually merged
mysys/my_pread.c:
Manually merged
mysys/my_read.c:
Manually merged
sql/mysqld.cc:
Manually merged
storage/csv/ha_tina.h:
Manually merged
storage/myisam/ha_myisam.cc:
Manually merged
storage/myisam/mi_check.c:
Manually merged
storage/myisam/mi_search.c:
Manually merged
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 41c96a13829..278e01d4de6 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -557,8 +557,8 @@ static bool write_execute_load_query_log_event(THD *thd, { Execute_load_query_log_event e(thd, thd->query, thd->query_length, - (char*)thd->lex->fname_start - (char*)thd->query, - (char*)thd->lex->fname_end - (char*)thd->query, + (uint) ((char*)thd->lex->fname_start - (char*)thd->query), + (uint) ((char*)thd->lex->fname_end - (char*)thd->query), (duplicates == DUP_REPLACE) ? LOAD_DUP_REPLACE : (ignore ? LOAD_DUP_IGNORE : LOAD_DUP_ERROR), transactional_table, FALSE, killed_err_arg); |