Commit 0d6367f6 authored by unknown's avatar unknown
Browse files

bug #24633 (sql_mode NO_DIR_IN_CREATE doesn't work with partitioned tables) 

additional patch to fix SHOW CREATE behaviour


mysql-test/r/partition.result:
  result fixed
mysql-test/t/partition.test:
  testcase
sql/sql_partition.cc:
  check MODE_NO_DIR_IN_CREATE for partitioned tables in SHOW CREATE statement
parent 32a19db3

mysql-test/r/partition.result

+7 −1
Original line number Diff line number Diff line
@@ -1231,5 +1231,11 @@ partition p01 values less than (1000) 
data directory='/not/existing'

    index directory='/not/existing'

);

DROP TABLE t1;

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `i` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (i) (PARTITION p01 VALUES LESS THAN (1000) ENGINE = MyISAM) */

DROP TABLE t1, t2;

set @@sql_mode=@org_mode;

End of 5.1 tests

mysql-test/t/partition.test

+13 −1
Original line number Diff line number Diff line
@@ -1467,6 +1467,16 @@ drop table t1, t2; 
# Bug #24633 SQL MODE "NO_DIR_IN_CREATE" does not work with partitioned tables 

#



disable_query_log;

eval create table t2 (i int )

partition by range (i)

(

    partition p01 values less than (1000)

    data directory="$MYSQLTEST_VARDIR/master-data/test/"

    index directory="$MYSQLTEST_VARDIR/master-data/test/"

);

enable_query_log;



set @org_mode=@@sql_mode;

set @@sql_mode='NO_DIR_IN_CREATE';

select @@sql_mode;
@@ -1478,6 +1488,8 @@ partition by range (i) 
    index directory='/not/existing'

);



DROP TABLE t1;

show create table t2;

DROP TABLE t1, t2;

set @@sql_mode=@org_mode;



--echo End of 5.1 tests

sql/sql_partition.cc

+9 −6
Original line number Diff line number Diff line
@@ -1892,12 +1892,15 @@ static int add_partition_options(File fptr, partition_element *p_elem) 
    err+= add_keyword_int(fptr,"MAX_ROWS",(longlong)p_elem->part_max_rows);

  if (p_elem->part_min_rows)

    err+= add_keyword_int(fptr,"MIN_ROWS",(longlong)p_elem->part_min_rows);

  if (!(current_thd->variables.sql_mode & MODE_NO_DIR_IN_CREATE))

  {

    if (p_elem->data_file_name)

      err+= add_keyword_string(fptr, "DATA DIRECTORY", TRUE, 

                               p_elem->data_file_name);

    if (p_elem->index_file_name)

      err+= add_keyword_string(fptr, "INDEX DIRECTORY", TRUE, 

                               p_elem->index_file_name);

  }

  if (p_elem->part_comment)

    err+= add_keyword_string(fptr, "COMMENT", TRUE, p_elem->part_comment);

  return err + add_engine(fptr,p_elem->engine_type);