bk commit into 5.0 tree (gkodinov:1.2438)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-23 19:00:47+03:00, gkodinov@stripped +3 -0
  patch.patch

  CMakeLists.txt@stripped, 2007-04-23 18:58:37+03:00, gkodinov@stripped +4 -0
    Import patch patch.patch

  mysql-test/r/windows.result@stripped, 2007-04-23 18:58:37+03:00, gkodinov@stripped +7 -0
    Import patch patch.patch

  mysql-test/t/windows.test@stripped, 2007-04-23 18:58:37+03:00, gkodinov@stripped +8 -0
    Import patch patch.patch

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gkodinov
# Host:	magare.gmz
# Root:	/home/kgeorge/mysql/autopush/B27811-5.0-opt

--- 1.7/CMakeLists.txt	2007-03-29 00:00:25 +03:00
+++ 1.8/CMakeLists.txt	2007-04-23 18:58:37 +03:00
@@ -26,6 +26,10 @@ ADD_DEFINITIONS(-D WITH_MYISAM_STORAGE_E
 ADD_DEFINITIONS(-D CMAKE_BUILD)
 ADD_DEFINITIONS(-D HAVE_YASSL)
 
+# Set debug options
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS")
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DFORCE_INIT_OF_VARS")
+
 SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisam_plugin")
 
 

--- 1.4/mysql-test/r/windows.result	2006-12-10 17:40:03 +02:00
+++ 1.5/mysql-test/r/windows.result	2007-04-23 18:58:37 +03:00
@@ -12,3 +12,10 @@ Warnings:
 Warning	0	DATA DIRECTORY option ignored
 Warning	0	INDEX DIRECTORY option ignored
 drop table t1;
+CREATE TABLE t1 (a int, b int);
+INSERT INTO t1 VALUES (1,1);
+EXPLAIN SELECT * FROM t1 WHERE b =  (SELECT max(2));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+2	SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+End of 5.0 tests.

--- 1.4/mysql-test/t/windows.test	2006-12-10 17:40:04 +02:00
+++ 1.5/mysql-test/t/windows.test	2007-04-23 18:58:37 +03:00
@@ -27,3 +27,11 @@ CREATE TABLE t1 ( `ID` int(6) ) data dir
 drop table t1;
 
 # End of 4.1 tests
+
+#
+# Bug #27811: The variable 'join_tab' is being used without being defined
+#
+CREATE TABLE t1 (a int, b int); INSERT INTO t1 VALUES (1,1);
+EXPLAIN SELECT * FROM t1 WHERE b =  (SELECT max(2));
+
+--echo End of 5.0 tests.