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/sys_vars.cc | |
| parent | 955cb796e7672d1186f44de84528b7b8fe47f0c9 (diff) | |
| parent | 12c42b980aa94105a9108d4f58c5dc75d96ec824 (diff) | |
| download | mariadb-git-3ceec2f19cff22d7b6078b6a8d5788fa19264b8a.tar.gz | |
Merge from 5.1.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index ad7bf3fef2a..6c6ccc5209e 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -695,7 +695,7 @@ static bool event_scheduler_update(sys_var *self, THD *thd, enum_var_type type) : Events::stop(); mysql_mutex_lock(&LOCK_global_system_variables); if (ret) - my_error(ER_EVENT_SET_VAR_ERROR, MYF(0)); + my_error(ER_EVENT_SET_VAR_ERROR, MYF(0), 0); return ret; } @@ -2504,7 +2504,7 @@ static bool update_last_insert_id(THD *thd, set_var *var) { if (!var->value) { - my_error(ER_NO_DEFAULT, MYF(0), var->var->name); + my_error(ER_NO_DEFAULT, MYF(0), var->var->name.str); return true; } thd->first_successful_insert_id_in_prev_stmt= @@ -2553,7 +2553,7 @@ static bool update_insert_id(THD *thd, set_var *var) { if (!var->value) { - my_error(ER_NO_DEFAULT, MYF(0), var->var->name); + my_error(ER_NO_DEFAULT, MYF(0), var->var->name.str); return true; } thd->force_one_auto_inc_interval(var->save_result.ulonglong_value); @@ -2576,7 +2576,7 @@ static bool update_rand_seed1(THD *thd, set_var *var) { if (!var->value) { - my_error(ER_NO_DEFAULT, MYF(0), var->var->name); + my_error(ER_NO_DEFAULT, MYF(0), var->var->name.str); return true; } thd->rand.seed1= (ulong) var->save_result.ulonglong_value; @@ -2598,7 +2598,7 @@ static bool update_rand_seed2(THD *thd, set_var *var) { if (!var->value) { - my_error(ER_NO_DEFAULT, MYF(0), var->var->name); + my_error(ER_NO_DEFAULT, MYF(0), var->var->name.str); return true; } thd->rand.seed2= (ulong) var->save_result.ulonglong_value; |