diff options
| author | unknown <monty@mysql.com> | 2004-10-26 19:30:57 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-26 19:30:57 +0300 |
| commit | e160646eb01eb8c5b382b1523114988679f9d357 (patch) | |
| tree | ceda3ef9437fa5cd2e14de6aebba351d121354c2 /sql/set_var.cc | |
| parent | 8ee124176690ed611c8851e3dd50a823c498a08b (diff) | |
| parent | 853c2c788c8bd7120a95c2357de7dabb1b6fcf3b (diff) | |
| download | mariadb-git-e160646eb01eb8c5b382b1523114988679f9d357.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/field.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index c609c3e4793..66ed273d531 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2962,7 +2962,8 @@ void sys_var_thd_table_type::warn_deprecated(THD *thd) { push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DEPRECATED_SYNTAX, - ER(ER_WARN_DEPRECATED_SYNTAX), "table_type", "storage_engine"); + ER(ER_WARN_DEPRECATED_SYNTAX), "table_type", + "storage_engine"); } void sys_var_thd_table_type::set_default(THD *thd, enum_var_type type) |