Merge mysql.com:/usr/local/mysql/mysql-5.1-winfix

into mysql.com:/usr/local/mysql/mysql-5.1-new

Merge mysql.com:/usr/local/mysql/mysql-5.1-winfix
into mysql.com:/usr/local/mysql/mysql-5.1-new
2b5a4e28 · knielsen@mysql.com · a7666569 · 8269fe79 · 2b5a4e28
Commit 2b5a4e28 authored Feb 09, 2006 by knielsen@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_show.cc sql/sql_show.cc +1 -1

No files found.
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -4005,7 +4005,7 @@ int fill_schema_events(THD *thd, TABLE_LIST *tables, COND *cond)
            store(thd->lex->select_lex.db, strlen(thd->lex->select_lex.db), scs);
      key_len+= event_table->key_info->key_part[1].store_length;
    }
-    if (!(key_buf= alloc_root(thd->mem_root, key_len)))
+    if (!(key_buf= (byte *)alloc_root(thd->mem_root, key_len)))
    {
      ret= 1;
      goto err;