MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Mats Kindahl Date:September 21 2010 9:27pm
Subject:bzr push into mysql-5.5-bugfixing branch (mats.kindahl:3201 to 3202)
View as plain text  
 3202 Mats Kindahl	2010-09-21
      Merging into mysql-5.5-bugfixing.

    modified:
      sql/sql_plugin.cc
 3201 Evgeny Potemkin	2010-09-21 [merge]
      Auto-merged.

    added:
      mysql-test/suite/perfschema/r/checksum.result
      mysql-test/suite/perfschema/t/checksum.test
    modified:
      dbug/dbug.c
      include/mysql/service_my_snprintf.h
      mysql-test/include/default_mysqld.cnf
      mysql-test/suite/perfschema/include/upgrade_check.inc
      mysql-test/suite/perfschema/r/server_init.result
      mysql-test/suite/perfschema/r/start_server_no_cond_class.result
      mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
      mysql-test/suite/perfschema/r/start_server_no_file_class.result
      mysql-test/suite/perfschema/r/start_server_no_file_inst.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
      mysql-test/suite/perfschema/r/start_server_no_thread_class.result
      mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysql-test/suite/perfschema/t/server_init.test
      mysql-test/valgrind.supp
      mysys/my_gethwaddr.c
      mysys/my_sync.c
      sql/log.cc
      sql/log.h
      sql/mysqld.cc
      sql/set_var.h
      sql/sql_repl.cc
      storage/perfschema/ha_perfschema.cc
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits.h
      strings/my_vsnprintf.c
      unittest/mysys/my_vsnprintf-t.c
=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc	2010-08-23 09:38:10 +0000
+++ b/sql/sql_plugin.cc	2010-09-21 21:24:29 +0000
@@ -519,7 +519,7 @@ static st_plugin_dl *plugin_dl_add(const
       /* no op */;
 
     cur= (struct st_mysql_plugin*)
-          my_malloc(i*sizeof(struct st_mysql_plugin), MYF(MY_ZEROFILL|MY_WME));
+      my_malloc((i+1)*sizeof(struct st_mysql_plugin), MYF(MY_ZEROFILL|MY_WME));
     if (!cur)
     {
       free_plugin_mem(&plugin_dl);


Attachment: [text/bzr-bundle] bzr/mats.kindahl@oracle.com-20100921212429-n388hvwt85yeg5l9.bundle
Thread
bzr push into mysql-5.5-bugfixing branch (mats.kindahl:3201 to 3202) Mats Kindahl21 Sep