summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2009-09-24 12:35:16 +0200
committerVladislav Vaintroub <vvaintroub@mysql.com>2009-09-24 12:35:16 +0200
commit281909362cf6e3f1c80ec7c9fac01c67f869cc86 (patch)
tree0718249009da3fd00d987bef459d1617571e454e /storage
parentff3acc311f08a05826a12c1fd08695f9e216f713 (diff)
parent1df46c4e5be862698de68b8d6fed238b273a8606 (diff)
downloadmariadb-git-281909362cf6e3f1c80ec7c9fac01c67f869cc86.tar.gz
merge mysql-next-mr-alik
Diffstat (limited to 'storage')
-rw-r--r--storage/myisammrg/ha_myisammrg.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index addec5bb58a..471e2243aac 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -153,7 +153,7 @@ extern "C" void myrg_print_wrong_table(const char *table_name)
buf[db.length]= '.';
memcpy(buf + db.length + 1, name.str, name.length);
buf[db.length + name.length + 1]= 0;
- push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+ push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_ADMIN_WRONG_MRG_TABLE, ER(ER_ADMIN_WRONG_MRG_TABLE),
buf);
}