Merge with 5.1

configure.in

@@ -2713,7 +2713,7 @@ case $SYSTEM_TYPE in
     echo "Skipping readline"
     ;;
   *)
-    if [test "$with_libedit" = "yes"] || [test "$with_libedit" = "undefined"] && [test "$with_readline" = "undefined"]
+    if [test "$with_libedit" = "yes"] || ( [test "$with_libedit" = "undefined"] && [test "$with_readline" = "undefined"] )
     then
 	readline_topdir="cmd-line-utils"
 	readline_basedir="libedit"

mysql-test/suite/innodb_plugin/t/innodb_misc1.test

 -- source include/have_innodb_plugin.inc
--- source include/have_utf8.inc
+let collation=utf8_unicode_ci;
+--source include/have_collation.inc
 
 let $MYSQLD_DATADIR= `select @@datadir`;