diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2008-11-10 20:32:45 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2008-11-10 20:32:45 +0100 |
| commit | a1e2d2d14615b0ccac6b1246a58cd347effaeefb (patch) | |
| tree | 0c6bedc8298d6ba68c23420c95626e2b52466499 /sql/sql_parse.cc | |
| parent | 12ad7f3b9da5e0563c24698856102b4b646cea82 (diff) | |
| parent | 9a0637750a4775e199b3915bd83e630540729d64 (diff) | |
| download | mariadb-git-a1e2d2d14615b0ccac6b1246a58cd347effaeefb.tar.gz | |
Merge main 5.1 -> 5.1-build
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 704c16cfdec..f518e1ef9e8 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2372,8 +2372,8 @@ mysql_execute_command(THD *thd) } else { - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0, - "the master info structure does not exist"); + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + WARN_NO_MASTER_INFO, ER(WARN_NO_MASTER_INFO)); my_ok(thd); } pthread_mutex_unlock(&LOCK_active_mi); @@ -2770,11 +2770,13 @@ end_with_restore_list: /* Don't yet allow changing of symlinks with ALTER TABLE */ if (create_info.data_file_name) - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0, - "DATA DIRECTORY option ignored"); + push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + WARN_OPTION_IGNORED, ER(WARN_OPTION_IGNORED), + "DATA DIRECTORY"); if (create_info.index_file_name) - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0, - "INDEX DIRECTORY option ignored"); + push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + WARN_OPTION_IGNORED, ER(WARN_OPTION_IGNORED), + "INDEX DIRECTORY"); create_info.data_file_name= create_info.index_file_name= NULL; /* ALTER TABLE ends previous transaction */ if (end_active_trans(thd)) |