List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:March 9 2011 11:28pm
Subject:bzr push into mysql-trunk branch (chris.powers:3245 to 3246) WL#4896
View as plain text  
 3246 Christopher Powers	2011-03-09
      WL#4896 "Performance Schema Net IO"
      
      - Fixed build warnings

    modified:
      include/mysql/psi/mysql_socket.h
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h.pp
      mysql-test/suite/perfschema/r/start_server_nothing.result
      sql/mysqld.cc
      storage/perfschema/pfs.cc
 3245 cpowers	2011-03-09 [merge]
      Merge with mysq-trunk

    removed:
      mysql-test/include/have_case_insensitive_fs.inc
      mysql-test/r/case_insensitive_fs.require
    added:
      mysql-test/collections/disabled-weekly.list
      mysql-test/r/func_encrypt_ucs2.result
      mysql-test/std_data/bug47205.frm
      mysql-test/t/func_encrypt_ucs2.test
    modified:
      VERSION
      client/mysql.cc
      client/mysqlcheck.c
      client/sql_string.cc
      client/sql_string.h
      cmake/make_dist.cmake.in
      include/ft_global.h
      include/m_ctype.h
      include/my_global.h
      include/my_handler.h
      include/my_pthread.h
      include/my_sys.h
      include/my_tree.h
      include/mysql/plugin_audit.h.pp
      include/mysql/plugin_auth.h.pp
      include/mysql/plugin_ftparser.h
      include/mysql/plugin_ftparser.h.pp
      libmysqld/lib_sql.cc
      mysql-test/collections/default.experimental
      mysql-test/include/wait_for_status_var.inc
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_sjis.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_utf16.result
      mysql-test/r/ctype_utf32.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/filesort_debug.result
      mysql-test/r/flush.result
      mysql-test/r/func_set.result
      mysql-test/r/grant.result
      mysql-test/r/innodb_mysql_sync.result
      mysql-test/r/mysqlcheck.result
      mysql-test/r/partition.result
      mysql-test/r/partition_error.result
      mysql-test/r/xml.result
      mysql-test/suite/engines/iuds/r/insert_year.result
      mysql-test/suite/engines/iuds/t/disabled.def
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
      mysql-test/suite/large_tests/t/lock_tables_big.test
      mysql-test/suite/rpl/r/rpl_checksum.result
      mysql-test/suite/rpl/r/rpl_corruption.result
      mysql-test/suite/rpl/t/rpl_checksum.test
      mysql-test/suite/rpl/t/rpl_corruption.test
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
      mysql-test/t/ctype_latin1.test
      mysql-test/t/ctype_sjis.test
      mysql-test/t/ctype_ucs.test
      mysql-test/t/ctype_utf16.test
      mysql-test/t/ctype_utf32.test
      mysql-test/t/ctype_utf8.test
      mysql-test/t/filesort_debug.test
      mysql-test/t/flush.test
      mysql-test/t/func_set.test
      mysql-test/t/grant.test
      mysql-test/t/grant_lowercase_fs.test
      mysql-test/t/innodb_mysql_sync.test
      mysql-test/t/mysqlcheck.test
      mysql-test/t/partition.test
      mysql-test/t/partition_error.test
      mysql-test/t/xml.test
      mysys/charset.c
      mysys/default.c
      mysys/mf_qsort.c
      mysys/my_handler.c
      mysys/my_init.c
      mysys/my_thr_init.c
      mysys/stacktrace.c
      mysys/tree.c
      regex/debug.c
      regex/debug.ih
      regex/engine.c
      regex/engine.ih
      regex/my_regex.h
      regex/regcomp.c
      regex/regcomp.ih
      regex/reginit.c
      scripts/mysqld_multi.sh
      sql/event_data_objects.cc
      sql/event_db_repository.cc
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/filesort.cc
      sql/gstream.h
      sql/ha_partition.cc
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_create.cc
      sql/item_create.h
      sql/item_func.cc
      sql/item_func.h
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/item_sum.cc
      sql/item_sum.h
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/item_xmlfunc.cc
      sql/key.cc
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/log_event.h
      sql/my_decimal.cc
      sql/my_decimal.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/opt_range.cc
      sql/procedure.h
      sql/protocol.cc
      sql/protocol.h
      sql/rpl_utility.cc
      sql/set_var.cc
      sql/set_var.h
      sql/share/errmsg-utf8.txt
      sql/sp.cc
      sql/sp.h
      sql/sp_head.cc
      sql/sp_head.h
      sql/sql_acl.cc
      sql/sql_admin.cc
      sql/sql_audit.h
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_db.cc
      sql/sql_db.h
      sql/sql_delete.cc
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_parse.h
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_partition_admin.cc
      sql/sql_prepare.cc
      sql/sql_reload.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_signal.cc
      sql/sql_sort.h
      sql/sql_string.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_time.cc
      sql/sql_time.h
      sql/sql_trigger.cc
      sql/sql_truncate.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/strfunc.cc
      sql/strfunc.h
      sql/sys_vars.h
      sql/table.cc
      sql/table.h
      sql/thr_malloc.cc
      sql/thr_malloc.h
      sql/uniques.cc
      storage/archive/ha_archive.h
      storage/csv/ha_tina.h
      storage/federated/ha_federated.h
      storage/heap/hp_hash.c
      storage/innobase/handler/ha_innodb.cc
      storage/myisam/ft_boolean_search.c
      storage/myisam/ft_nlq_search.c
      storage/myisam/ft_parser.c
      storage/myisam/ft_static.c
      storage/myisam/ft_update.c
      storage/myisam/ftdefs.h
      storage/myisam/ha_myisam.cc
      storage/myisam/mi_key.c
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_instr-oom-t.cc
      storage/perfschema/unittest/pfs_instr-t.cc
      storage/perfschema/unittest/pfs_instr_class-oom-t.cc
      storage/perfschema/unittest/pfs_instr_class-t.cc
      storage/perfschema/unittest/pfs_timer-t.cc
      strings/ctype-big5.c
      strings/ctype-bin.c
      strings/ctype-cp932.c
      strings/ctype-czech.c
      strings/ctype-euc_kr.c
      strings/ctype-eucjpms.c
      strings/ctype-gb2312.c
      strings/ctype-gbk.c
      strings/ctype-latin1.c
      strings/ctype-mb.c
      strings/ctype-simple.c
      strings/ctype-sjis.c
      strings/ctype-tis620.c
      strings/ctype-uca.c
      strings/ctype-ucs2.c
      strings/ctype-ujis.c
      strings/ctype-utf8.c
      strings/ctype-win1250ch.c
      strings/ctype.c
      strings/my_strchr.c
      strings/my_vsnprintf.c
      strings/xml.c
=== modified file 'include/mysql/psi/mysql_socket.h'
--- a/include/mysql/psi/mysql_socket.h	2011-03-09 21:28:05 +0000
+++ b/include/mysql/psi/mysql_socket.h	2011-03-09 23:28:32 +0000
@@ -66,13 +66,27 @@ struct st_mysql_socket
 */
 typedef struct st_mysql_socket MYSQL_SOCKET;
 
+
 /**
   @def MYSQL_INVALID_SOCKET
   MYSQL_SOCKET initial value.
 */
-static MYSQL_SOCKET MYSQL_INVALID_SOCKET= {INVALID_SOCKET, NULL};
+//MYSQL_SOCKET MYSQL_INVALID_SOCKET= {INVALID_SOCKET, NULL};
+#define MYSQL_INVALID_SOCKET mysql_socket_invalid()
 
 /**
+  @def mysql_socket_invalid
+  MYSQL_SOCKET helper. Initialize instrumented socket.
+  @sa mysql_socket_getfd
+  @sa mysql_socket_setfd
+*/
+static inline MYSQL_SOCKET
+mysql_socket_invalid()
+{
+  MYSQL_SOCKET mysql_socket= {INVALID_SOCKET, NULL};
+  return mysql_socket;
+}
+/**
   @def mysql_socket_getfd
   MYSQL_SOCKET helper. Get socket descriptor.
   @param mysql_socket Instrumented socket

=== modified file 'include/mysql/psi/psi.h'
--- a/include/mysql/psi/psi.h	2011-03-09 21:28:05 +0000
+++ b/include/mysql/psi/psi.h	2011-03-09 23:28:32 +0000
@@ -1321,9 +1321,9 @@ typedef void (*set_socket_address_v1_t)(
     @param addr_len length of socket ip address
 */
 typedef void (*set_socket_info_v1_t)(struct PSI_socket *socket,
-                                      uint *fd,
-                                      const struct sockaddr *addr,
-                                      socklen_t *addr_len);
+                                     my_socket *fd,
+                                     const struct sockaddr *addr,
+                                     socklen_t *addr_len);
 
 /**
   Performance Schema Interface, version 1.

=== modified file 'include/mysql/psi/psi_abi_v1.h.pp'
--- a/include/mysql/psi/psi_abi_v1.h.pp	2011-02-23 21:13:48 +0000
+++ b/include/mysql/psi/psi_abi_v1.h.pp	2011-03-09 23:28:32 +0000
@@ -337,10 +337,12 @@ typedef void (*end_socket_wait_v1_t)
 typedef void (*set_socket_descriptor_v1_t)(struct PSI_socket *socket,
                                              uint fd);
 typedef void (*set_socket_address_v1_t)(struct PSI_socket *socket,
-                                         const struct sockaddr * addr);
+                                        const struct sockaddr * addr,
+                                        socklen_t addr_len);
 typedef void (*set_socket_info_v1_t)(struct PSI_socket *socket,
-                                      uint fd,
-                                      const struct sockaddr * addr);
+                                     my_socket *fd,
+                                     const struct sockaddr *addr,
+                                     socklen_t *addr_len);
 struct PSI_v1
 {
   register_mutex_v1_t register_mutex;

=== modified file 'mysql-test/suite/perfschema/r/start_server_nothing.result'
--- a/mysql-test/suite/perfschema/r/start_server_nothing.result	2011-02-27 02:07:57 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_nothing.result	2011-03-09 23:28:32 +0000
@@ -135,9 +135,9 @@ FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WR
 select * from performance_schema.socket_instances;
 EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT
 select * from performance_schema.socket_summary_by_instance;
-EVENT_NAME	OBJECT_INSTANCE_BEGIN	OBJECT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	MIN_NUMBER_OF_BYTES_READ	AVG_NUMBER_OF_BYTES_READ	MAX_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	MIN_NUMBER_OF_BYTES_WRITE	AVG_NUMBER_OF_BYTES_WRITE	MAX_NUMBER_OF_BYTES_WRITE	COUNT_RECV	SUM_TIMER_RECV	MIN_TIMER_RECV	AVG_TIMER_RECV	MAX_TIMER_RECV	SUM_NUMBER_OF_BYTES_RECV	MIN_NUMBER_OF_BYTES_RECV	AVG_NUMBER_OF_BYTES_RECV	MAX_NUMBER_OF_BYTES_RECV	COUNT_SEND	SUM_TIMER_SEND	MIN_TIMER_SEND	AVG_TIMER_SEND	MAX_TIMER_SEND	SUM_NUMBER_OF_BYTES_SEND	MIN_NUMBER_OF_BYTES_SEND	AVG_NUMBER_OF_BYTES_SEND	MAX_NUMBER_OF_BYTES_SEND	COUNT_RECVFROM	SUM_TIMER_RECVFROM	MIN_TIMER_RECVFROM	AVG_TIMER_RECVFROM	MAX_TIMER_RECVFROM	SUM_NUMBER_OF_BYTES_RECVFROM	MIN_NUMBER_OF_BYTES_RECVFROM	AVG_NUMBER_OF_BYTES_RECVFROM	MA
 X_NUMBER_OF_BYTES_RECVFROM	COUNT_SENDTO	SUM_TIMER_SENDTO	MIN_TIMER_SENDTO	AVG_TIMER_SENDTO	MAX_TIMER_SENDTO	SUM_NUMBER_OF_BYTES_SENDTO	MIN_NUMBER_OF_BYTES_SENDTO	AVG_NUMBER_OF_BYTES_SENDTO	MAX_NUMBER_OF_BYTES_SENDTO	COUNT_RECVMSG	SUM_TIMER_RECVMSG	MIN_TIMER_RECVMSG	AVG_TIMER_RECVMSG	MAX_TIMER_RECVMSG	SUM_NUMBER_OF_BYTES_RECVMSG	MIN_NUMBER_OF_BYTES_RECVMSG	AVG_NUMBER_OF_BYTES_RECVMSG	MAX_NUMBER_OF_BYTES_RECVMSG	COUNT_SENDMSG	SUM_TIMER_SENDMSG	MIN_TIMER_SENDMSG	AVG_TIMER_SENDMSG	MAX_TIMER_SENDMSG	SUM_NUMBER_OF_BYTES_SENDMSG	MIN_NUMBER_OF_BYTES_SENDMSG	AVG_NUMBER_OF_BYTES_SENDMSG	MAX_NUMBER_OF_BYTES_SENDMSG	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
+EVENT_NAME	OBJECT_INSTANCE_BEGIN	OBJECT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_RECV	SUM_TIMER_RECV	MIN_TIMER_RECV	AVG_TIMER_RECV	MAX_TIMER_RECV	SUM_NUMBER_OF_BYTES_RECV	COUNT_SEND	SUM_TIMER_SEND	MIN_TIMER_SEND	AVG_TIMER_SEND	MAX_TIMER_SEND	SUM_NUMBER_OF_BYTES_SEND	COUNT_RECVFROM	SUM_TIMER_RECVFROM	MIN_TIMER_RECVFROM	AVG_TIMER_RECVFROM	MAX_TIMER_RECVFROM	SUM_NUMBER_OF_BYTES_RECVFROM	COUNT_SENDTO	SUM_TIMER_SENDTO	MIN_TIMER_SENDTO	AVG_TIMER_SENDTO	MAX_TIMER_SENDTO	SUM_NUMBER_OF_BYTES_SENDTO	COUNT_RECVMSG	SUM_TIMER_RECVMSG	MIN_TIMER_RECVMSG	AVG_TIMER_RECVMSG	MAX_TIMER_RECVMSG	SUM_NUMBER_OF_BYTES_RECVMSG	COUNT_SENDMSG	SUM_TIMER_SENDMSG	MIN_TIMER_SENDMSG	AVG_TIMER_SENDMSG	MAX_TIMER_SENDMSG	SUM_NUMBER_OF_BYTES_SENDMSG	COUNT_MISC	SUM_TIMER_MISC	M
 IN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
 select * from performance_schema.socket_summary_by_event_name;
-EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	MIN_NUMBER_OF_BYTES_READ	AVG_NUMBER_OF_BYTES_READ	MAX_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	MIN_NUMBER_OF_BYTES_WRITE	AVG_NUMBER_OF_BYTES_WRITE	MAX_NUMBER_OF_BYTES_WRITE	COUNT_RECV	SUM_TIMER_RECV	MIN_TIMER_RECV	AVG_TIMER_RECV	MAX_TIMER_RECV	SUM_NUMBER_OF_BYTES_RECV	MIN_NUMBER_OF_BYTES_RECV	AVG_NUMBER_OF_BYTES_RECV	MAX_NUMBER_OF_BYTES_RECV	COUNT_SEND	SUM_TIMER_SEND	MIN_TIMER_SEND	AVG_TIMER_SEND	MAX_TIMER_SEND	SUM_NUMBER_OF_BYTES_SEND	MIN_NUMBER_OF_BYTES_SEND	AVG_NUMBER_OF_BYTES_SEND	MAX_NUMBER_OF_BYTES_SEND	COUNT_RECVFROM	SUM_TIMER_RECVFROM	MIN_TIMER_RECVFROM	AVG_TIMER_RECVFROM	MAX_TIMER_RECVFROM	SUM_NUMBER_OF_BYTES_RECVFROM	MIN_NUMBER_OF_BYTES_RECVFROM	AVG_NUMBER_OF_BYTES_RECVFROM	MAX_NUMBER_OF_BYTES_RECVFROM	COUNT_S
 ENDTO	SUM_TIMER_SENDTO	MIN_TIMER_SENDTO	AVG_TIMER_SENDTO	MAX_TIMER_SENDTO	SUM_NUMBER_OF_BYTES_SENDTO	MIN_NUMBER_OF_BYTES_SENDTO	AVG_NUMBER_OF_BYTES_SENDTO	MAX_NUMBER_OF_BYTES_SENDTO	COUNT_RECVMSG	SUM_TIMER_RECVMSG	MIN_TIMER_RECVMSG	AVG_TIMER_RECVMSG	MAX_TIMER_RECVMSG	SUM_NUMBER_OF_BYTES_RECVMSG	MIN_NUMBER_OF_BYTES_RECVMSG	AVG_NUMBER_OF_BYTES_RECVMSG	MAX_NUMBER_OF_BYTES_RECVMSG	COUNT_SENDMSG	SUM_TIMER_SENDMSG	MIN_TIMER_SENDMSG	AVG_TIMER_SENDMSG	MAX_TIMER_SENDMSG	SUM_NUMBER_OF_BYTES_SENDMSG	MIN_NUMBER_OF_BYTES_SENDMSG	AVG_NUMBER_OF_BYTES_SENDMSG	MAX_NUMBER_OF_BYTES_SENDMSG	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
+EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_RECV	SUM_TIMER_RECV	MIN_TIMER_RECV	AVG_TIMER_RECV	MAX_TIMER_RECV	SUM_NUMBER_OF_BYTES_RECV	COUNT_SEND	SUM_TIMER_SEND	MIN_TIMER_SEND	AVG_TIMER_SEND	MAX_TIMER_SEND	SUM_NUMBER_OF_BYTES_SEND	COUNT_RECVFROM	SUM_TIMER_RECVFROM	MIN_TIMER_RECVFROM	AVG_TIMER_RECVFROM	MAX_TIMER_RECVFROM	SUM_NUMBER_OF_BYTES_RECVFROM	COUNT_SENDTO	SUM_TIMER_SENDTO	MIN_TIMER_SENDTO	AVG_TIMER_SENDTO	MAX_TIMER_SENDTO	SUM_NUMBER_OF_BYTES_SENDTO	COUNT_RECVMSG	SUM_TIMER_RECVMSG	MIN_TIMER_RECVMSG	AVG_TIMER_RECVMSG	MAX_TIMER_RECVMSG	SUM_NUMBER_OF_BYTES_RECVMSG	COUNT_SENDMSG	SUM_TIMER_SENDMSG	MIN_TIMER_SENDMSG	AVG_TIMER_SENDMSG	MAX_TIMER_SENDMSG	SUM_NUMBER_OF_BYTES_SENDMSG	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_T
 IMER_MISC
 select * from performance_schema.mutex_instances;
 NAME	OBJECT_INSTANCE_BEGIN	LOCKED_BY_THREAD_ID
 select * from performance_schema.threads;

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2011-03-09 21:42:42 +0000
+++ b/sql/mysqld.cc	2011-03-09 23:28:32 +0000
@@ -1075,7 +1075,7 @@ static void close_connections(void)
     (void) mysql_socket_shutdown(unix_sock, SHUT_RDWR);
     (void) mysql_socket_close(unix_sock);
     (void) unlink(mysqld_unix_port);
-    unix_sock= MYSQL_INVALID_SOCKET);
+    unix_sock= MYSQL_INVALID_SOCKET;
   }
 #endif
   end_thr_alarm(0);			 // Abort old alarms.

=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc	2011-03-09 21:28:05 +0000
+++ b/storage/perfschema/pfs.cc	2011-03-09 23:28:32 +0000
@@ -3803,7 +3803,7 @@ static void set_socket_address_v1(PSI_so
 }
 
 static void set_socket_info_v1(PSI_socket *socket,
-                               uint *fd,
+                               my_socket *fd,
                                const struct sockaddr *addr,
                                socklen_t *addr_len)
 {


Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20110309232832-yf7mts4qqwmr0mv7.bundle
Thread
bzr push into mysql-trunk branch (chris.powers:3245 to 3246) WL#4896Christopher Powers10 Mar