diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-07 14:59:53 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-07 14:59:53 +0500 |
| commit | 023ae2a040e43f40aab2bd40311c84e45bee97ff (patch) | |
| tree | 20ab7d376b5edd5f5fcc4004f18c43aadaf05b77 /sql/events.cc | |
| parent | be3bc128abb09641f0d03216101c4d6938af4245 (diff) | |
| parent | 795121926ef797fd9988ee65b97b16af0ace9af8 (diff) | |
| download | mariadb-git-023ae2a040e43f40aab2bd40311c84e45bee97ff.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
client/mysqldump.c:
Auto merged
mysql-test/r/rpl_packet.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/rpl_packet.test:
Auto merged
sql/field.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
mysql-test/r/create.result:
SCCS merged
mysql-test/t/create.test:
merging
mysql-test/t/disabled.def:
merging
sql/events.cc:
merging
sql/sql_parse.cc:
SCCS 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 200f46b7f7a..7a6323a9a63 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -694,7 +694,7 @@ send_show_create_event(THD *thd, Event_timed *et, Protocol *protocol) if (et->get_create_event(thd, &show_str)) DBUG_RETURN(TRUE); - field_list.push_back(new Item_empty_string("Event", NAME_LEN)); + field_list.push_back(new Item_empty_string("Event", NAME_CHAR_LEN)); if (sys_var_thd_sql_mode::symbolic_mode_representation(thd, et->sql_mode, &sql_mode)) |