summaryrefslogtreecommitdiff
path: root/sql/sql_error.cc
diff options
context:
space:
mode:
authorunknown <venu@myvenu.com>2002-11-22 10:20:14 -0800
committerunknown <venu@myvenu.com>2002-11-22 10:20:14 -0800
commitbd6df955e327b52b393f4a6f7fd61c2ed9751a85 (patch)
tree1db1bf4593b745f0c12c8cb09b5934c136c3e073 /sql/sql_error.cc
parent1049175831a4aa145f64e912388cc6079d7f5789 (diff)
parent7eafe60b3641e3d1c9067181bce7f465cfc742e8 (diff)
downloadmariadb-git-bd6df955e327b52b393f4a6f7fd61c2ed9751a85.tar.gz
protocol merge
libmysql/errmsg.c: Auto merged sql/item.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged sql/sql_error.cc: Auto merged
Diffstat (limited to 'sql/sql_error.cc')
-rw-r--r--sql/sql_error.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc
index 0740dc428f0..d2735073461 100644
--- a/sql/sql_error.cc
+++ b/sql/sql_error.cc
@@ -127,7 +127,7 @@ static const char *warning_level_names[]= {"Note", "Warning", "Error", "?"};
my_bool mysqld_show_warnings(THD *thd, ulong levels_to_show)
{
List<Item> field_list;
- DBUG_ENTER("mysqld_show_errors");
+ DBUG_ENTER("mysqld_show_warnings");
field_list.push_back(new Item_empty_string("Level", 7));
field_list.push_back(new Item_int("Code",0,4));