diff options
| author | unknown <knielsen@mysql.com> | 2006-01-30 17:57:20 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-01-30 17:57:20 +0100 |
| commit | c4f91d17b71127c53c07c638706aa67d97d617f3 (patch) | |
| tree | e5595c167d68209e7b4e65ebcb97053551b308a5 /sql/event_timed.cc | |
| parent | 8a78ab057e64d41cb02d1a706b77e739298b8df4 (diff) | |
| parent | e65d02e005fce8ec543a64e802272c3c9ba877b9 (diff) | |
| download | mariadb-git-c4f91d17b71127c53c07c638706aa67d97d617f3.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-5.1-win-fixes
into mysql.com:/usr/local/mysql/x/mysql-5.1-new
VC++Files/sql/mysqld.vcproj:
Auto merged
sql/event.h:
Auto merged
sql/event_executor.cc:
Auto merged
sql/event_timed.cc:
Auto merged
sql/handler.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
VC++Files/client/mysqldump.vcproj:
Manual merge.
Diffstat (limited to 'sql/event_timed.cc')
| -rw-r--r-- | sql/event_timed.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/event_timed.cc b/sql/event_timed.cc index 0be3f32e854..28d21089b74 100644 --- a/sql/event_timed.cc +++ b/sql/event_timed.cc @@ -952,7 +952,7 @@ done: char * -event_timed::get_show_create_event(THD *thd, uint *length) +event_timed::get_show_create_event(THD *thd, uint32 *length) { char *dst, *ret; uint len, tmp_len; |