bk commit into 5.1 tree (lars:1.1990)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1990 05/12/14 19:22:49 lars@stripped +2 -0
  WL#2321: Need new to run constructor of rli

  sql/sql_class.cc
    1.229 05/12/14 19:22:41 lars@stripped +3 -2
    Need new to run constructor of rli

  sql/sql_binlog.cc
    1.2 05/12/14 19:22:40 lars@stripped +2 -3
    Need new to run constructor of rli

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-wl1012-v3-wl2321-max

--- 1.228/sql/sql_class.cc	2005-12-14 01:52:53 +01:00
+++ 1.229/sql/sql_class.cc	2005-12-14 19:22:41 +01:00
@@ -445,8 +445,9 @@
 #ifndef DBUG_OFF
   dbug_sentry= THD_SENTRY_GONE;
 #endif  
-  if (rli_fake)
-    my_free((char*)rli_fake, MYF(MY_WME));
+#ifndef EMBEDDED_LIBRARY
+  if (rli_fake) delete rli_fake;
+#endif
 
   DBUG_VOID_RETURN;
 }

--- 1.1/sql/sql_binlog.cc	2005-12-14 01:39:46 +01:00
+++ 1.2/sql/sql_binlog.cc	2005-12-14 19:22:40 +01:00
@@ -19,10 +19,9 @@
 
 void mysql_binlog_statement(THD* thd)
 {
-#ifndef EMBEDDED_LIBRARY /* TODO: This should be documented */
+#ifndef EMBEDDED_LIBRARY
   if (!thd->rli_fake)
-    thd->rli_fake=
-      (RELAY_LOG_INFO*) my_malloc(sizeof(RELAY_LOG_INFO), MYF(MY_WME));
+    thd->rli_fake= new RELAY_LOG_INFO;
   if (!thd->rli_fake)
   {
     my_error(ER_OUTOFMEMORY, MYF(0));