Commit d7086c4a authored by unknown's avatar unknown
Browse files

BUG#11869:part 2: post-review fixes: merging into 5.0 

We're out of bits in st_select_lex->options so make TMP_TABLE_FORCE_MYISAM ==
OPTION_FOUND_COMMENT (the latter is not used by create_tmp_table).


mysql-test/r/create.result:
  Updated the test result
mysql-test/r/fulltext_order_by.result:
  Drop all tables this test uses
mysql-test/t/fulltext_order_by.test:
  Drop all tables this test uses
parent f3ce475d

mysql-test/r/create.result

+1 −1
Original line number Diff line number Diff line
@@ -606,6 +606,6 @@ create database mysqltest; 
use mysqltest;

create view v1 as select 'foo' from dual;

create table t1 like v1;

ERROR HY000: 'mysqltest.v1' is not a table

ERROR HY000: 'mysqltest.v1' is not BASE TABLE

drop view v1;

drop database mysqltest;

mysql-test/r/fulltext_order_by.result

+1 −1
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t1,t2,t3;

CREATE TABLE t1 (

a INT AUTO_INCREMENT PRIMARY KEY,

message CHAR(20),

mysql-test/t/fulltext_order_by.test

+1 −3
Original line number Diff line number Diff line 
--disable_warnings

DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t1,t2,t3;

--enable_warnings



CREATE TABLE t1 (
@@ -117,8 +117,6 @@ where 
order by 

  match(b.betreff) against ('+abc' in boolean mode) desc;



-- todo psergey: fix

--error 1214 

select a.text, b.id, b.betreff

from 

  t2 a inner join t3 b on a.id = b.forum inner join

sql/item_sum.cc

+4 −2
Original line number Diff line number Diff line
@@ -2275,7 +2275,8 @@ bool Item_sum_count_distinct::setup(THD *thd) 
  DBUG_ASSERT(table == 0);

  if (!(table= create_tmp_table(thd, tmp_table_param, list, (ORDER*) 0, 1,

				0,

				select_lex->options | thd->options,

				(select_lex->options | thd->options) & 

                                ~TMP_TABLE_FORCE_MYISAM,

				HA_POS_ERROR, (char*)"")))

    return TRUE;

  table->file->extra(HA_EXTRA_NO_ROWS);		// Don't update rows
@@ -3057,7 +3058,8 @@ bool Item_func_group_concat::setup(THD *thd) 
  */

  if (!(table= create_tmp_table(thd, tmp_table_param, all_fields,

                                (ORDER*) 0, 0, TRUE,

                                select_lex->options | thd->options,

                                (select_lex->options | thd->options) & 

                                ~TMP_TABLE_FORCE_MYISAM,

                                HA_POS_ERROR, (char*) "")))

    DBUG_RETURN(TRUE);

  table->file->extra(HA_EXTRA_NO_ROWS);

sql/mysql_priv.h

+7 −5
Original line number Diff line number Diff line
@@ -256,6 +256,13 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset; 
#define OPTION_WARNINGS         (1L << 13)      // THD, user

#define OPTION_AUTO_IS_NULL     (1L << 14)      // THD, user, binlog

#define OPTION_FOUND_COMMENT    (1L << 15)      // SELECT, intern, parser

/* 

  Force the used temporary table to be a MyISAM table (because we will use

  fulltext functions when reading from it. This uses the same constant as

  OPTION_FOUND_COMMENT because we've run out of bits and these two values 

  are not used together.

*/

#define TMP_TABLE_FORCE_MYISAM          (1L << 15)

#define OPTION_SAFE_UPDATES     (1L << 16)      // THD, user

#define OPTION_BUFFER_RESULT    (1L << 17)      // SELECT, user

#define OPTION_BIN_LOG          (1L << 18)      // THD, user
@@ -284,11 +291,6 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset; 
#define OPTION_SETUP_TABLES_DONE        (1L << 30) // intern

/* If not set then the thread will ignore all warnings with level notes. */

#define OPTION_SQL_NOTES                (1L << 31) // THD, user

/* 

  Force the used temporary table to be a MyISAM table (because we will use

  fulltext functions when reading from it.

*/

#define TMP_TABLE_FORCE_MYISAM          (1L << 30) 



/*

  Maximum length of time zone name that we support