diff options
author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-09-24 12:35:16 +0200 |
---|---|---|
committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-09-24 12:35:16 +0200 |
commit | 626bac84719e8c30890e22806c1075f64b34ed5b (patch) | |
tree | 0718249009da3fd00d987bef459d1617571e454e /storage | |
parent | 2b2ef99ebf63634d6da81f27aa2ee94e09e5b197 (diff) | |
parent | b0220ff9ff6fbc9fc65a9b04f25e337951edd259 (diff) | |
download | mariadb-git-626bac84719e8c30890e22806c1075f64b34ed5b.tar.gz |
merge mysql-next-mr-alik
Diffstat (limited to 'storage')
-rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 2 |
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); } |