bzr push into mysql-pe branch (joro:3662 to 3664)

[Georgi Kodinov]

 3664 Georgi Kodinov	2009-10-16 [merge]
      merge

    modified:
      mysql-test/r/range.result
      mysql-test/t/range.test
      sql/opt_range.cc
 3663 Joerg Bruehe	2009-10-15 [merge]
      Merge the bug fixes to the 6.0 push tree.

    modified:
      configure.in
      mysys/mf_keycache.c
      storage/archive/Makefile.am
      unittest/backup/Makefile.am
 3662 Alexey Kopytov	2009-10-15 [merge]
      Automerge.

    removed:
      mysql-test/r/loadxml.result
      mysql-test/std_data/loadxml.dat
      mysql-test/std_data/loadxml2.dat
      mysql-test/t/loadxml.test
    added:
      mysql-test/r/loadxml.result
      mysql-test/std_data/loadxml.dat
      mysql-test/std_data/loadxml2.dat
      mysql-test/t/loadxml.test
    modified:
      mysql-test/collections/default.experimental
      mysql-test/r/myisam.result
      mysql-test/t/myisam.test
      sql/sql_load.cc
=== modified file 'configure.in'
--- a/configure.in	2009-10-14 14:47:26 +0000
+++ b/configure.in	2009-10-16 09:56:14 +0000
@@ -2973,7 +2973,7 @@ server_scripts=
 
 dnl This probably should be cleaned up more - for now the threaded
 dnl client is just using plain-old libs.
-sql_client_dirs="regex libmysql"
+sql_client_dirs="strings mysys dbug extra regex libmysql"
 
 AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")
 
@@ -3016,6 +3016,8 @@ then
 fi
 AM_CONDITIONAL(THREAD, test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no")
 
+AM_CONDITIONAL(SERVER, test "$with_server" = "yes")
+
 # "innochecksum" is not in the "innobase/" subdirectory, but should be switched
 AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$with_plugin_innobase" = Xyes])
 
@@ -3036,7 +3038,8 @@ AC_SUBST(mysql_plugin_defs)
 
 
 # Now that sql_client_dirs and sql_server_dirs are stable, determine the union.
-# Start with the (longer) server list, add each client item not yet present.
+# We support client-only builds by "--without-server", but not vice versa,
+# so we start with the client list, then add each server item not yet present.
 sql_union_dirs=" $sql_client_dirs "
 for DIR in $sql_server_dirs
 do

=== modified file 'mysql-test/r/range.result'
--- a/mysql-test/r/range.result	2009-10-15 11:44:07 +0000
+++ b/mysql-test/r/range.result	2009-10-16 09:56:14 +0000
@@ -1398,14 +1398,6 @@ a < 10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t3	range	a	a	5	NULL	8	Using where; Using index
 DROP TABLE t1, t2, t3;
-#
-# Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN
-#
-CREATE TABLE t1(a INT, KEY(a));
-INSERT INTO t1 VALUES (1), (NULL);
-SELECT * FROM t1 WHERE a <> NULL and (a <> NULL or a <= NULL);
-a
-DROP TABLE t1;
 End of 5.1 tests
 CREATE TABLE t1 (c1 DECIMAL(10,0),INDEX(c1));
 INSERT INTO t1 VALUES (1),(2),(3);

=== modified file 'mysql-test/t/range.test'
--- a/mysql-test/t/range.test	2009-10-15 11:44:07 +0000
+++ b/mysql-test/t/range.test	2009-10-16 09:56:14 +0000
@@ -1173,15 +1173,6 @@ a < 10;
 
 DROP TABLE t1, t2, t3;
 
---echo #
---echo # Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN
---echo #
-
-CREATE TABLE t1(a INT, KEY(a));
-INSERT INTO t1 VALUES (1), (NULL);
-SELECT * FROM t1 WHERE a <> NULL and (a <> NULL or a <= NULL);
-DROP TABLE t1;
-
 --echo End of 5.1 tests
 
 #

=== modified file 'mysys/mf_keycache.c'
--- a/mysys/mf_keycache.c	2009-09-29 15:03:12 +0000
+++ b/mysys/mf_keycache.c	2009-10-15 17:19:51 +0000
@@ -1757,6 +1757,7 @@ restart:
       - block assigned but not yet read from file (invalid data).
   */
 
+#if THREAD
   if (keycache->in_resize)
   {
     /* This is a request during a resize operation */
@@ -1998,6 +1999,9 @@ restart:
     }
     DBUG_RETURN(0);
   }
+#else /* THREAD */
+  DBUG_ASSERT(!keycache->in_resize);
+#endif
 
   if (page_status == PAGE_READ &&
       (block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH |

=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2009-10-15 11:44:07 +0000
+++ b/sql/opt_range.cc	2009-10-16 09:56:14 +0000
@@ -5872,17 +5872,6 @@ get_mm_leaf(RANGE_OPT_PARAM *param, COND
     goto end;
   }
   field->table->in_use->variables.sql_mode= orig_sql_mode;
-
-  /*
-    Any sargable predicate except "<=>" involving NULL as a constant is always
-    FALSE
-  */
-  if (type != Item_func::EQUAL_FUNC && field->is_real_null())
-  {
-    tree= &null_element;
-    goto end;
-  }
-  
   str= (uchar*) alloc_root(alloc, key_part->store_length+1);
   if (!str)
     goto end;

=== modified file 'storage/archive/Makefile.am'
--- a/storage/archive/Makefile.am	2009-07-06 20:59:07 +0000
+++ b/storage/archive/Makefile.am	2009-10-15 17:19:51 +0000
@@ -15,12 +15,6 @@
 
 #called from the top level Makefile
 
-if THREAD_SAFE_CLIENT
-LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql_r/libmysqlclient_r.la
-else
-LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql/libmysqlclient.la
-endif
-
 pkgplugindir =		$(pkglibdir)/plugin
 AM_CPPFLAGS =           -DHAVE_MYSQL_CONFIG_H \
 			-I$(top_srcdir)/include \
@@ -34,7 +28,11 @@ LDADD =
 DEFS =                  @DEFS@
 
 noinst_HEADERS =	ha_archive.h azio.h
-noinst_PROGRAMS	=	archive_test archive_reader archive_performance concurrency_test
+noinst_PROGRAMS	=	archive_test archive_reader archive_performance
+
+if THREAD_SAFE_CLIENT
+noinst_PROGRAMS	+=	concurrency_test
+endif
 
 EXTRA_LTLIBRARIES =	ha_archive.la
 pkgplugin_LTLIBRARIES =	@plugin_archive_shared_target@
@@ -75,7 +73,7 @@ concurrency_test_SOURCES = concurrency_t
 concurrency_test_LDADD =	$(top_builddir)/mysys/libmysyslt.la \
 			$(top_builddir)/dbug/libdbuglt.la \
 			$(top_builddir)/strings/libmystringslt.la \
-			$(LIBMYSQLCLIENT_LA) \
+			$(top_builddir)/libmysql_r/libmysqlclient_r.la \
 			$(LDADD) \
 			@ZLIB_LIBS@
 concurrency_test_LDFLAGS = @NOINST_LDFLAGS@

=== modified file 'unittest/backup/Makefile.am'
--- a/unittest/backup/Makefile.am	2009-10-14 13:56:03 +0000
+++ b/unittest/backup/Makefile.am	2009-10-15 19:33:03 +0000
@@ -22,7 +22,7 @@ STREAMTESTS += bstr_data_chunks-t bstr_r
 STREAMTESTS += bstr_extra-t bstr_extra1-t bstr_eoc-t
 STREAMTESTS += bug45737-t
 
-if THREAD
+if SERVER
 noinst_PROGRAMS =   $(STREAMTESTS)
 endif
 
@@ -42,7 +42,7 @@ noinst_HEADERS = stream_test.h catalog.h
 # Library with infrastructure for unit tests 
 #
 
-if THREAD
+if SERVER
 noinst_LTLIBRARIES = libstreamtest.la
 endif
 


Attachment: [text/bzr-bundle] bzr/[e-mail]