bzr commit into mysql-5.4 branch (mikael:2835)

[Mikael Ronstrom]

#At file:///home/mikael/mysql_clones/mysql-azalea-merge-from-summit/

 2835 Mikael Ronstrom	2009-07-02
      Minor edits of the merge from summit to azalea
      modified:
        sql/Makefile.am
        sql/ha_ndbcluster.h
        sql/net_serv.cc
        sql/sp_head.cc
        sql/sql_update.cc

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2009-07-02 14:23:36 +0000
+++ b/sql/Makefile.am	2009-07-02 15:02:45 +0000
@@ -117,7 +117,7 @@ noinst_HEADERS =	item.h item_func.h item
 			sql_plugin.h authors.h event_parse_data.h \
 			event_data_objects.h event_scheduler.h \
 			sql_partition.h partition_info.h partition_element.h \
-			probes.h sql_audit.h transaction.h \
+			sql_audit.h transaction.h \
 			contributors.h sql_servers.h bml.h \
 			si_objects.h si_logs.h sql_plist.h mdl.h records.h \
 			sql_signal.h \
@@ -174,10 +174,6 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.
 			sql_signal.cc \
 			rpl_handler.cc
 
-if HAVE_DTRACE
-  mysqld_SOURCES += probes.d
-endif
-
 nodist_mysqld_SOURCES =	mini_client_errors.c pack.c client.c my_time.c my_user.c 
 
 libndb_la_CPPFLAGS=	@ndbcluster_includes@ $(AM_CPPFLAGS)
@@ -240,12 +236,6 @@ lex_hash.h:	gen_lex_hash.cc lex.h
 udf_example_la_SOURCES= udf_example.c
 udf_example_la_LDFLAGS= -module -rpath $(pkglibdir)
 
-probes.h: probes.d
-	$(DTRACE) $(DTRACEFLAGS) -h -s probes.d
-	mv probes.h probes.h.bak
-	sed "s/#include <unistd.h>//g" probes.h.bak > probes.h
-	rm probes.h.bak
-
 # We might have some stuff not built in this build, but that we want to install
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(libexecdir) $(DESTDIR)$(pkglibdir)

=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2009-07-02 14:23:36 +0000
+++ b/sql/ha_ndbcluster.h	2009-07-02 15:02:45 +0000
@@ -498,7 +498,6 @@ static void set_tabname(const char *path
   int alter_table_phase3(THD *thd, TABLE *table);
 
 private:
-  int loc_read_multi_range_next(KEY_MULTI_RANGE **found_range_p);
   friend int ndbcluster_drop_database_impl(THD *thd, const char *path);
   friend int ndb_handle_schema_change(THD *thd, 
                                       Ndb *ndb, NdbEventOperation *pOp,

=== modified file 'sql/net_serv.cc'
--- a/sql/net_serv.cc	2009-07-02 14:23:36 +0000
+++ b/sql/net_serv.cc	2009-07-02 15:02:45 +0000
@@ -371,7 +371,7 @@ my_bool
 my_net_write(NET *net,const uchar *packet,size_t len)
 {
   uchar buff[NET_HEADER_SIZE];
-  int rc;
+  my_bool rc;
 
   if (unlikely(!net->vio)) /* nowhere to write */
     return 0;
@@ -448,7 +448,7 @@ net_write_command(NET *net,uchar command
   ulong length=len+1+head_len;			/* 1 extra byte for command */
   uchar buff[NET_HEADER_SIZE+1];
   uint header_size=NET_HEADER_SIZE+1;
-  int rc;
+  my_bool rc;
   DBUG_ENTER("net_write_command");
   DBUG_PRINT("enter",("length: %lu", (ulong) len));
 
@@ -469,7 +469,7 @@ net_write_command(NET *net,uchar command
 	  net_write_buff(net, packet, len))
       {
         MYSQL_NET_WRITE_DONE(1);
-	DBUG_RETURN(1);
+        DBUG_RETURN(1);
       }
       packet+= len;
       length-= MAX_PACKET_LENGTH;

=== modified file 'sql/sp_head.cc'
--- a/sql/sp_head.cc	2009-07-02 14:23:36 +0000
+++ b/sql/sp_head.cc	2009-07-02 15:02:45 +0000
@@ -2927,7 +2927,7 @@ sp_instr_stmt::exec_core(THD *thd, uint 
                          thd->thread_id,
                          (char *) (thd->db ? thd->db : ""),
                          thd->security_ctx->priv_user,
-                         (char *)thd->security_ctx->host_or_ip,
+                         (char *) thd->security_ctx->host_or_ip,
                          3);
   int res= mysql_execute_command(thd);
   MYSQL_QUERY_EXEC_DONE(res);

=== modified file 'sql/sql_update.cc'
--- a/sql/sql_update.cc	2009-07-02 14:23:36 +0000
+++ b/sql/sql_update.cc	2009-07-02 15:02:45 +0000
@@ -23,7 +23,6 @@
 #include "sql_select.h"
 #include "sp_head.h"
 #include "sql_trigger.h"
-#include "probes_mysql.h"
 
 /* Return 0 if row hasn't changed */