diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-08 15:37:04 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-08 15:37:04 +0100 |
| commit | ea3bb00d6a8690a8684f6bce696fefcbc65c5288 (patch) | |
| tree | dde72d0109d3374c766eeea9cdecb5458d9c35fa /sql | |
| parent | 0de0d997f0ec877c17fe55bd59d6f2098c021a7f (diff) | |
| parent | 42e133e74e6f7e6adcf15afaa7bae1449c42ebbb (diff) | |
| download | mariadb-git-ea3bb00d6a8690a8684f6bce696fefcbc65c5288.tar.gz | |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_plugin.cc | 6 | ||||
| -rw-r--r-- | sql/sql_rename.cc | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 451277712db..0fe89cd3748 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1738,7 +1738,11 @@ bool mysql_install_plugin(THD *thd, const LEX_STRING *name, const LEX_STRING *dl mysql_mutex_lock(&LOCK_plugin); mysql_rwlock_wrlock(&LOCK_system_variables_hash); - my_load_defaults(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv, NULL); + if (my_load_defaults(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv, NULL)) + { + report_error(REPORT_TO_USER, ER_PLUGIN_IS_NOT_LOADED, name->str); + goto err; + } error= plugin_add(thd->mem_root, name, dl, &argc, argv, REPORT_TO_USER); if (argv) free_defaults(argv); diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index ac15239b040..8f990eae001 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -108,7 +108,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent) */ my_error(ER_CANT_RENAME_LOG_TABLE, MYF(0), ren_table->table_name, ren_table->table_name); - DBUG_RETURN(1); + goto err; } } else @@ -121,7 +121,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent) */ my_error(ER_CANT_RENAME_LOG_TABLE, MYF(0), ren_table->table_name, ren_table->table_name); - DBUG_RETURN(1); + goto err; } else { @@ -139,7 +139,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent) else my_error(ER_CANT_RENAME_LOG_TABLE, MYF(0), rename_log_table[1], rename_log_table[1]); - DBUG_RETURN(1); + goto err; } } |