bzr push into mysql-5.5 branch (Georgi.Kodinov:3682 to 3683)

[Georgi Kodinov]

 3683 Georgi Kodinov	2012-01-12 [merge]
      weave merge of mysql-5.1->mysql-5.5
      merge of Nirbhay's AIX compilation fix for 5.1.61

    modified:
      cmd-line-utils/libedit/chartype.h
      cmd-line-utils/libedit/eln.c
      cmd-line-utils/libedit/readline.c
 3682 Alexander Barkov	2012-01-12
      BUG#13354387 - CRASH IN IN MY_DECIMAL::OPERATOR FOR VIEW AND FUNCTION UNIX_TIME
      
      Fixing the 5.5 part (the 5.6 part will go in a separate commit soon).
      
      Problem:
        Item_direct_ref::get_date() incorrectly calculated its "null_value",
        which made UNIX_TIMESTAMP(view_column) incorrectly return NULL
        for a NOT NULL view_column.
      
      Fix:
        Make Item_direct_ref::get_date() calculate null_value
        in the similar way with the other methods 
        (val_real,val_str,val_int,val_decimal):
        copy null_value from the referenced Item.
      
      modified:
        mysql-test/r/func_time.result
        mysql-test/t/func_time.test
        sql/item.cc

    modified:
      mysql-test/r/func_time.result
      mysql-test/t/func_time.test
      sql/item.cc
=== modified file 'cmd-line-utils/libedit/chartype.h'
--- a/cmd-line-utils/libedit/chartype.h	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/chartype.h	2012-01-11 17:40:29 +0000
@@ -45,11 +45,11 @@
  * seems to actually advertise this properly, despite Unicode 3.1 having
  * been around since 2001... */
 
-/* XXXMYSQL : Added FreeBSD to bypass this check.
-  TODO : Verify if FreeBSD stores ISO 10646 in wchar_t. */
+/* XXXMYSQL : Added FreeBSD & AIX to bypass this check.
+  TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
 #if !defined(__NetBSD__) && !defined(__sun) \
   && !(defined(__APPLE__) && defined(__MACH__)) \
-  && !defined(__FreeBSD__)
+  && !defined(__FreeBSD__) && !defined(_AIX)
 #ifndef __STDC_ISO_10646__
 /* In many places it is assumed that the first 127 code points are ASCII
  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other

=== modified file 'cmd-line-utils/libedit/eln.c'
--- a/cmd-line-utils/libedit/eln.c	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/eln.c	2012-01-11 17:40:29 +0000
@@ -200,7 +200,7 @@ el_set(EditLine *el, int op, ...)
 		    ret = -1;
 		    goto out;
 		}
-		// XXX: The two strdup's leak
+                /* XXX: The two strdups leak. */
 		ret = map_addfunc(el, Strdup(wargv[0]), Strdup(wargv[1]),
 		    func);
 		ct_free_argv(wargv);

=== modified file 'cmd-line-utils/libedit/readline.c'
--- a/cmd-line-utils/libedit/readline.c	2011-10-13 19:47:46 +0000
+++ b/cmd-line-utils/libedit/readline.c	2012-01-12 13:03:44 +0000
@@ -1978,7 +1978,7 @@ rl_callback_read_char()
 		} else
 			wbuf = NULL;
 		(*(void (*)(const char *))rl_linefunc)(wbuf);
-		//el_set(e, EL_UNBUFFERED, 1);
+                /*el_set(e, EL_UNBUFFERED, 1);*/
 	}
 }
 

No bundle (reason: useless for push emails).