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/events.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/events.cc')
| -rw-r--r-- | sql/events.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/events.cc b/sql/events.cc index d7443695f4a..e1b4dd4d513 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -693,7 +693,7 @@ send_show_create_event(THD *thd, Event_timed *et, Protocol *protocol) &sql_mode)) DBUG_RETURN(TRUE); - field_list.push_back(new Item_empty_string("sql_mode", sql_mode.length)); + field_list.push_back(new Item_empty_string("sql_mode", (uint) sql_mode.length)); tz_name= et->time_zone->get_name(); |