Commit 228d5c42 authored by unknown's avatar unknown
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into moonbone.local:/work/13535-bug-4.1-mysql


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
parents 61dfc334 78e8833f

mysql-test/r/select.result

+10 −0
Original line number Diff line number Diff line
@@ -2633,3 +2633,13 @@ select * from t1,t2 where f1=f3 and (f1,f2) <=> (2,null); 
f1	f2	f3

2	NULL	2

drop table t1,t2;

create table t1 (f1 int not null auto_increment primary key, f2 varchar(10));

create table t11 like t1;

insert into t1 values(1,""),(2,"");

show table status like 't1%';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	9	Dynamic	2	20	X	X	X	X	X	X	X	X	latin1_swedish_ci	NULL		

t11	MyISAM	9	Dynamic	0	0	X	X	X	X	X	X	X	X	latin1_swedish_ci	NULL		

select 123 as a from t1 where f1 is null;

a

drop table t1,t11;

mysql-test/t/select.test

+10 −0
Original line number Diff line number Diff line
@@ -2178,4 +2178,14 @@ select * from t1,t2 where f1=f3 and (f1,f2) = (2,null); 
select * from t1,t2 where f1=f3 and (f1,f2) <=> (2,null);

drop table t1,t2; 



#

# Bug #13535

#

create table t1 (f1 int not null auto_increment primary key, f2 varchar(10));

create table t11 like t1;

insert into t1 values(1,""),(2,"");

--replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X

show table status like 't1%';

select 123 as a from t1 where f1 is null;

drop table t1,t11;

# End of 4.1 tests

sql/sql_show.cc

+9 −3
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild) 
  TABLE *table;

  Protocol *protocol= thd->protocol;

  TIME time;

  int res= 0;

  DBUG_ENTER("mysqld_extend_show_tables");



  (void) sprintf(path,"%s/%s",mysql_data_home,db);
@@ -632,10 +633,15 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild) 
      close_thread_tables(thd,0);

    }

    if (protocol->write())

      DBUG_RETURN(-1);

    {

      res= -1;

      break;

    }

  }

  thd->insert_id(0);

  if (!res)

    send_eof(thd);

  DBUG_RETURN(0);

  DBUG_RETURN(res);

}