diff options
| author | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:21:08 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:21:08 +0200 |
| commit | 3ceec2f19cff22d7b6078b6a8d5788fa19264b8a (patch) | |
| tree | 43fd6afdae9f8879ad4cdbb000497fee7cba02f4 /sql/events.cc | |
| parent | 955cb796e7672d1186f44de84528b7b8fe47f0c9 (diff) | |
| parent | 12c42b980aa94105a9108d4f58c5dc75d96ec824 (diff) | |
| download | mariadb-git-3ceec2f19cff22d7b6078b6a8d5788fa19264b8a.tar.gz | |
Merge from 5.1.
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/events.cc b/sql/events.cc index 23a0dc9eb52..dca6421f584 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -445,7 +445,7 @@ Events::update_event(THD *thd, Event_parse_data *parse_data, !sortcmp_lex_string(parse_data->name, *new_name, system_charset_info)) { - my_error(ER_EVENT_SAME_NAME, MYF(0), parse_data->name.str); + my_error(ER_EVENT_SAME_NAME, MYF(0)); DBUG_RETURN(TRUE); } |