bk commit into 6.0-falcon tree (acurtis:1.2517)

[antony]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of antony. When antony 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-05-15 12:41:21-07:00, acurtis@stripped +6 -0
  post merge fixes

  mysql-test/r/falcon_select.result@stripped, 2007-05-15 12:41:17-07:00, acurtis@stripped +3
-3
    fix results due to merge of bug#27531

  mysql-test/r/index_merge_falcon.result@stripped, 2007-05-15 12:41:17-07:00,
acurtis@stripped +4 -4
    fix results due to merge of bug#27531

  mysql-test/r/myisam_select.result@stripped, 2007-05-15 12:41:17-07:00, acurtis@stripped +7
-7
    fix results due to merge of bug#27531

  sql/mysqld.cc@stripped, 2007-05-15 12:41:17-07:00, acurtis@stripped +1 -5
    post-merge fixes
      remove "falcon" option as that is now handled by plugin code.
      fix compiler warnings.

  sql/set_var.cc@stripped, 2007-05-15 12:41:17-07:00, acurtis@stripped +1 -1
    post-merge fixes
      correct typo from merge

  storage/falcon/ha_falcon.cpp@stripped, 2007-05-15 12:41:17-07:00, acurtis@stripped +1 -4
    post-merge fixes
      have_falcon variable has been removed.

# 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:	acurtis
# Host:	ltamd64.xiphis.org
# Root:	/home/antony/work2/mysql-5.1-falcon.merge.3

--- 1.601/sql/mysqld.cc	2007-05-15 12:41:37 -07:00
+++ 1.602/sql/mysqld.cc	2007-05-15 12:41:37 -07:00
@@ -5227,10 +5227,6 @@
   {"external-locking", OPT_USE_LOCKING, "Use system (external) locking (disabled by
default).  With this option enabled you can run myisamchk to test (not repair) tables
while the MySQL server is running. Disable with --skip-external-locking.",
    (gptr*) &opt_external_locking, (gptr*) &opt_external_locking,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"falcon", OPT_FALCON, 
-   "Enable Falcon Storage Engine (if this version of MySQL supports it). \
-Disable with --skip-falcon (will save memory).",
-   (gptr*) &opt_falcon, (gptr*) &opt_falcon, 0, GET_BOOL, NO_ARG,
OPT_FALCON_DEFAULT, 0, 0, 0, 0, 0},
 #ifdef WITH_FALCON_STORAGE_ENGINE
    { "falcon-max-record-memory", OPT_FALCON_MAX_RECORD_MEMORY,
      "The amount of record memory that will cause record \
@@ -5249,7 +5245,7 @@
      4<<20, 2<<20, (ulonglong) ~0, 0, 1<<20, 0 },
    { "falcon-debug-server", OPT_FALCON_DEBUG_SERVER,
      "Enable Falcon debug code", (gptr*) &falcon_debug_server,
-     0, 0, GET_BOOL, OPT_ARG, 0, 0 },
+     0, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0 },
    { "falcon-page-size", OPT_FALCON_PAGE_SIZE,
      "The page size used when creating a tablespace", (gptr*) &falcon_page_size,
      0, 0, GET_UINT, REQUIRED_ARG,

--- 1.11/mysql-test/r/falcon_select.result	2007-05-15 12:41:37 -07:00
+++ 1.12/mysql-test/r/falcon_select.result	2007-05-15 12:41:37 -07:00
@@ -1370,7 +1370,7 @@
 41	40
 explain select distinct t2.companynr,t4.companynr from t2,t4 where
t2.companynr=t4.companynr+1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	1000	Using temporary
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	1000	Using temporary; Using join cache
 1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	1000	Using where
 select t2.fld1,t2.companynr,fld3,period from t3,t2 where t2.fld1 = 38208 and
t2.fld1=t3.t2nr and period = 1008 or t2.fld1 = 38008 and t2.fld1 =t3.t2nr and period =
1008;
 fld1	companynr	fld3	period
@@ -2781,11 +2781,11 @@
 4
 EXPLAIN SELECT t1.a FROM t1 STRAIGHT_JOIN t2 ON t1.a=t2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	Using join cache
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	1000	Using where
 EXPLAIN SELECT t1.a FROM t1 INNER JOIN t2 ON t1.a=t2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	Using join cache
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	1000	Using where
 DROP TABLE t1,t2;
 select x'10' + 0, X'10' + 0, b'10' + 0, B'10' + 0;

--- 1.159/storage/falcon/ha_falcon.cpp	2007-05-15 12:41:37 -07:00
+++ 1.160/storage/falcon/ha_falcon.cpp	2007-05-15 12:41:37 -07:00
@@ -90,7 +90,7 @@
 	if (!storageHandler)
 		storageHandler = getFalconStorageHandler(sizeof(THR_LOCK));
 		
-	falcon_hton->state = have_falcon;
+	falcon_hton->state = SHOW_OPTION_YES;
 	falcon_hton->db_type = DB_TYPE_FALCON;
 	falcon_hton->savepoint_offset = sizeof(void*);
 	falcon_hton->close_connection = StorageInterface::closeConnection;
@@ -114,9 +114,6 @@
 	falcon_hton->alter_tablespace = StorageInterface::alter_tablespace;
 	//falcon_hton->show_status  = StorageInterface::show_status;
 	falcon_hton->flags = HTON_NO_FLAGS;
-
-	if (have_falcon != SHOW_OPTION_YES)
-		DBUG_RETURN(0); // nothing else to do
 
 	storageHandler->addNfsLogger(-1, StorageInterface::logger, NULL);
 

--- 1.4/mysql-test/r/index_merge_falcon.result	2007-05-15 12:41:37 -07:00
+++ 1.5/mysql-test/r/index_merge_falcon.result	2007-05-15 12:41:37 -07:00
@@ -270,7 +270,7 @@
 explain select * from t0,t1 where t0.key1 = 5 and
 (t1.key1 = t0.key1 or t1.key8 = t0.key1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t0	ref	i1	i1	4	const	10	
+1	SIMPLE	t0	ref	i1	i1	4	const	10	Using join cache
 1	SIMPLE	t1	index_merge	i1,i8	i1,i8	4,4	NULL	20	Using sort_union(i1,i8); Using where
 explain select * from t0,t1 where t0.key1 < 3 and
 (t1.key1 = t0.key1 or t1.key8 = t0.key1);
@@ -347,7 +347,7 @@
 where (A.key1 < 500000 or A.key2 < 3)
 and   (B.key1 < 500000 or B.key2 < 3);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	A	index_merge	i1,i2	i1,i2	4,4	NULL	20	Using sort_union(i1,i2); Using where
+1	SIMPLE	A	index_merge	i1,i2	i1,i2	4,4	NULL	20	Using sort_union(i1,i2); Using where;
Using join cache
 1	SIMPLE	B	index_merge	i1,i2	i1,i2	4,4	NULL	20	Using sort_union(i1,i2); Using where
 select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5
+ B.key5)
 from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
@@ -361,7 +361,7 @@
 where (A.key1 = 1 or A.key2 = 1)
 and   (B.key1 = 1 or B.key2 = 1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	A	index_merge	i1,i2	i1,i2	4,4	NULL	20	Using sort_union(i1,i2); Using where
+1	SIMPLE	A	index_merge	i1,i2	i1,i2	4,4	NULL	20	Using sort_union(i1,i2); Using where;
Using join cache
 1	SIMPLE	B	index_merge	i1,i2	i1,i2	4,4	NULL	20	Using sort_union(i1,i2); Using where
 select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5
+ B.key5)
 from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
@@ -376,7 +376,7 @@
 where (A.key1 = 1 and A.key2 = 1 and A.key3 = 1 and A.key4=1 and A.key5=1 and A.key6=1
and A.key7 = 1 or A.key8=1)
 and (B.key1 = 1 and B.key2 = 1 and B.key3 = 1 and B.key4=1 and B.key5=1 and B.key6=1 and
B.key7 = 1 or B.key8=1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	A	index_merge	i1,i2,i3,i4,i5,i6,i7?,i8	i1,i8	4,4	NULL	#	Using sort_union(i1,i8);
Using where
+1	SIMPLE	A	index_merge	i1,i2,i3,i4,i5,i6,i7?,i8	i1,i8	4,4	NULL	#	Using sort_union(i1,i8);
Using where; Using join cache
 1	SIMPLE	B	index_merge	i1,i2,i3,i4,i5,i6,i7?,i8	i1,i8	4,4	NULL	#	Using sort_union(i1,i8);
Using where
 select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5
+ B.key5)
 from t0 as A, t0 as B

--- 1.1/mysql-test/r/myisam_select.result	2007-05-15 12:41:37 -07:00
+++ 1.2/mysql-test/r/myisam_select.result	2007-05-15 12:41:37 -07:00
@@ -608,11 +608,11 @@
 1	SIMPLE	t3	ref	period	period	4	test.t1.period	4181	
 explain select * from t3 as t1,t3 where t1.period=t3.period order by t3.period limit 10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t3	index	period	period	4	NULL	41810	
+1	SIMPLE	t3	ALL	period	NULL	NULL	NULL	41810	Using filesort
 1	SIMPLE	t1	ref	period	period	4	test.t3.period	4181	
 explain select * from t3 as t1,t3 where t1.period=t3.period order by t1.period limit 10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	period	period	4	NULL	41810	
+1	SIMPLE	t1	ALL	period	NULL	NULL	NULL	41810	Using filesort
 1	SIMPLE	t3	ref	period	period	4	test.t1.period	4181	
 select period from t1;
 period
@@ -1431,7 +1431,7 @@
 41	40
 explain select distinct t2.companynr,t4.companynr from t2,t4 where
t2.companynr=t4.companynr+1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t4	index	NULL	PRIMARY	1	NULL	12	Using index; Using temporary
+1	SIMPLE	t4	index	NULL	PRIMARY	1	NULL	12	Using index; Using temporary; Using join cache
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	1199	Using where
 select t2.fld1,t2.companynr,fld3,period from t3,t2 where t2.fld1 = 38208 and
t2.fld1=t3.t2nr and period = 1008 or t2.fld1 = 38008 and t2.fld1 =t3.t2nr and period =
1008;
 fld1	companynr	fld3	period
@@ -2363,7 +2363,7 @@
 insert into t2 values (1,3), (2,3), (3,4), (4,4);
 explain select * from t1 left join t2 on a=c where d in (4);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	ref	c,d	d	5	const	2	Using where
+1	SIMPLE	t2	ref	c,d	d	5	const	2	Using where; Using join cache
 1	SIMPLE	t1	ALL	a	NULL	NULL	NULL	4	Using where
 select * from t1 left join t2 on a=c where d in (4);
 a	b	c	d
@@ -2371,7 +2371,7 @@
 4	2	4	4
 explain select * from t1 left join t2 on a=c where d = 4;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	ref	c,d	d	5	const	2	Using where
+1	SIMPLE	t2	ref	c,d	d	5	const	2	Using where; Using join cache
 1	SIMPLE	t1	ALL	a	NULL	NULL	NULL	4	Using where
 select * from t1 left join t2 on a=c where d = 4;
 a	b	c	d
@@ -2842,11 +2842,11 @@
 4
 EXPLAIN SELECT t1.a FROM t1 STRAIGHT_JOIN t2 ON t1.a=t2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	Using join cache
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	3	Using where
 EXPLAIN SELECT t1.a FROM t1 INNER JOIN t2 ON t1.a=t2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	3	
+1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	3	Using join cache
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	Using where
 DROP TABLE t1,t2;
 select x'10' + 0, X'10' + 0, b'10' + 0, B'10' + 0;

--- 1.206/sql/set_var.cc	2007-05-15 12:41:37 -07:00
+++ 1.207/sql/set_var.cc	2007-05-15 12:41:37 -07:00
@@ -633,7 +633,7 @@
 static sys_var_have_variable sys_have_crypt(&vars, "have_crypt", &have_crypt);
 static sys_var_have_plugin sys_have_csv(&vars, "have_csv", C_STRING_WITH_LEN("csv"),
MYSQL_STORAGE_ENGINE_PLUGIN);
 static sys_var_have_variable sys_have_dlopen(&vars, "have_dynamic_loading",
&have_dlopen);
-statuc sys_var_have_plugin sys_have_falcon(&vars, "have_falcon",
C_STRING_WITH_LEN("falcon"), MYSQL_STORAGE_ENGINE_PLUGIN);
+static sys_var_have_plugin sys_have_falcon(&vars, "have_falcon",
C_STRING_WITH_LEN("falcon"), MYSQL_STORAGE_ENGINE_PLUGIN);
 static sys_var_have_variable sys_have_geometry(&vars, "have_geometry",
&have_geometry);
 static sys_var_have_plugin sys_have_innodb(&vars, "have_innodb",
C_STRING_WITH_LEN("innodb"), MYSQL_STORAGE_ENGINE_PLUGIN);
 static sys_var_have_plugin sys_have_ndbcluster(&vars, "have_ndbcluster",
C_STRING_WITH_LEN("ndbcluster"), MYSQL_STORAGE_ENGINE_PLUGIN);