bzr push into mysql-5.5 branch (vasil.dimov:3615 to 3616)

[vasil.dimov]

 3616 Vasil Dimov	2011-11-18 [merge]
      Merge mysql-5.1 -> mysql-5.5
      
      I manually checked that all the conflicting InnoDB changes are in 5.5 already.
      Two things I am not sure about - I commented them with XXX in this patch.
      I will further check with the authors of the changesets whether these things
      should be present or not.

    modified:
      cmd-line-utils/libedit/histedit.h
      cmd-line-utils/libedit/np/unvis.c
      cmd-line-utils/libedit/np/vis.c
      cmd-line-utils/libedit/read.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/row/row0ins.c
 3615 Rafal Somla	2011-11-17
      Bug#13101974 SLAVE CAN'T CONNECT AS REPLICATION USER USING WINDOWS AUTH PLUGIN
      
      Problem was that built-in client-side support for Windows Native Authentication (WNA) was included only in the client library, but not into the server code (which also uses some of the sources from the client library).
      
      This is fixed by modyfying sql/CMakeLists.txt to include the client-side WNA plugin library and enable WNA related code by defining AUTHENTICATION_WIN macro.
      
      Also, the logic of libmysql/CMakeLists.txt is simplified a bit.

    modified:
      libmysql/CMakeLists.txt
      sql/CMakeLists.txt
=== modified file 'cmd-line-utils/libedit/histedit.h'
--- a/cmd-line-utils/libedit/histedit.h	revid:rafal.somla@stripped
+++ b/cmd-line-utils/libedit/histedit.h	revid:vasil.dimov@stripped
@@ -43,7 +43,12 @@
 #define	LIBEDIT_MAJOR 2
 #define	LIBEDIT_MINOR 11
 
+/* XXXMYSQL : stdint.h might not be available on older Solaris platforms. */
+#if defined(__sun) || defined(__sun__)
+#include <sys/inttypes.h>
+#else
 #include <stdint.h>
+#endif
 
 #include <sys/types.h>
 #include <stdio.h>

=== modified file 'cmd-line-utils/libedit/np/unvis.c'
--- a/cmd-line-utils/libedit/np/unvis.c	revid:rafal.somla@stripped
+++ b/cmd-line-utils/libedit/np/unvis.c	revid:vasil.dimov@stripped
@@ -47,14 +47,21 @@ static char sccsid[] = "@(#)unvis.c	8.1 
 
 #include <assert.h>
 #include <ctype.h>
+
+/* XXXMYSQL : stdint.h might not be available on older Solaris platforms. */
+#if defined(__sun) || defined(__sun__)
+#include <sys/inttypes.h>
+#else
 #include <stdint.h>
+#endif
+
 #include <stdio.h>
 #include <errno.h>
-#ifdef HAVE_VIS_H
-#include <vis.h>
-#else
+/*
+  XXXMYSQL : Due to different versions of vis.h available,
+             use the one bundled with libedit.
+*/
 #include "np/vis.h"
-#endif
 
 #ifdef __weak_alias
 __weak_alias(strnunvisx,_strnunvisx)

=== modified file 'cmd-line-utils/libedit/np/vis.c'
--- a/cmd-line-utils/libedit/np/vis.c	revid:rafal.somla@stripped
+++ b/cmd-line-utils/libedit/np/vis.c	revid:vasil.dimov@stripped
@@ -68,11 +68,11 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#ifdef HAVE_VIS_H
-#include <vis.h>
-#else
+/*
+  XXXMYSQL : Due to different versions of vis.h available,
+             use the one bundled with libedit.
+*/
 #include "np/vis.h"
-#endif
 #include <errno.h>
 #include <stdlib.h>
 

=== modified file 'cmd-line-utils/libedit/read.c'
--- a/cmd-line-utils/libedit/read.c	revid:rafal.somla@stripped
+++ b/cmd-line-utils/libedit/read.c	revid:vasil.dimov@stripped
@@ -333,7 +333,7 @@ memset(&state, 0, sizeof(mbstate_t));
 
 #ifdef WIDECHAR
         ++cbp;
-        if (cbp > MB_CUR_MAX) { /* "shouldn't happen" */
+        if (cbp > (size_t) MB_CUR_MAX) { /* "shouldn't happen" */
           *cp = '\0';
           return (-1);
         }

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:rafal.somla@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:vasil.dimov@stripped
@@ -5261,6 +5261,9 @@ calc_row_difference(
 				dfield_set_null(&ufield->new_val);
 			}
 
+			/* XXX merge issues, should this be here?
+			ufield->extern_storage = FALSE;
+			*/
 			ufield->exp = NULL;
 			ufield->orig_len = 0;
 			ufield->field_no = dict_col_get_clust_pos(

=== modified file 'storage/innobase/row/row0ins.c'
--- a/storage/innobase/row/row0ins.c	revid:rafal.somla@stripped
+++ b/storage/innobase/row/row0ins.c	revid:vasil.dimov@stripped
@@ -276,7 +276,9 @@ row_ins_sec_index_entry_by_modify(
 		err = btr_cur_pessimistic_update(BTR_KEEP_SYS_FLAG, cursor,
 						 &heap, &dummy_big_rec, update,
 						 0, thr, mtr);
+		/* XXX merge conflicts, should this be here?
 		ut_ad(!dummy_big_rec);
+		*/
 	}
 func_exit:
 	mem_heap_free(heap);

No bundle (reason: useless for push emails).