3621 Georgi Kodinov 2011-02-09
WL#2940: fixed a valgrind warning due to a typo in a debug assertion
modified:
sql/log.cc
3620 Dmitry Shulga 2011-02-09 [merge]
Automerge from mysql-5.5
modified:
client/mysql.cc
client/readline.cc
=== modified file 'sql/log.cc'
--- a/sql/log.cc 2011-02-08 17:48:20 +0000
+++ b/sql/log.cc 2011-02-09 07:31:17 +0000
@@ -2209,7 +2209,7 @@ int my_plugin_log_message(MYSQL_PLUGIN *
struct st_plugin_int *plugin = (st_plugin_int *) plugin_ptr;
va_list args;
- DBUG_ASSERT(lvl >= ERROR_LEVEL || lvl <= INFORMATION_LEVEL);
+ DBUG_ASSERT(level >= MY_ERROR_LEVEL || level <= MY_INFORMATION_LEVEL);
switch (level)
{
No bundle (reason: useless for push emails).
Thread |
---|
• bzr push into mysql-trunk branch (Georgi.Kodinov:3620 to 3621) WL#2940 | Georgi Kodinov | 9 Feb |