Commit 36668b3c authored by unknown's avatar unknown
Browse files

Propagate the new '--with-big-tables' flag from 4.1 to 5.0. 

Incomplete, as the macro body must ne in the new file 'config/ac-macros/misc.m4'
which will follow in a separate changeset.


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Merge the 4.0 and 4.1 change of the new '--with-big-tables' flag.
configure.in:
  Call the new macro to evaluate the '--with-big-tables' flag.
mysql-test/mysql-test-run.sh:
  No change in 5.0, as 4.1 was a backport (Martin).
mysql-test/r/ps_7ndb.result:
  Merge from 4.1 (Martin).
parents 646f072d 328781c9

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -2373,6 +2373,7 @@ AC_SUBST(readline_basedir) 
AC_SUBST(readline_link)

AC_SUBST(readline_h_ln_cmd)



MYSQL_CHECK_BIG_TABLES

MYSQL_CHECK_BDB

MYSQL_CHECK_INNODB

MYSQL_CHECK_EXAMPLEDB

mysql-test/r/ps_7ndb.result

+11 −11
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ test_sequence 
------ simple select tests ------

prepare stmt1 from ' select * from t9 order by c1 ' ;

execute stmt1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t9	t9	c1	c1	1	4	1	N	49155	0	63

def	test	t9	t9	c2	c2	2	6	1	Y	32768	0	63

def	test	t9	t9	c3	c3	9	9	1	Y	32768	0	63
@@ -1144,7 +1144,7 @@ test_sequence 
------ explain select tests ------

prepare stmt1 from ' explain select * from t9 ' ;

execute stmt1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					id	8	3	1	N	32929	0	63

def					select_type	253	19	6	N	1	31	8

def					table	253	64	2	N	1	31	8
@@ -1782,7 +1782,7 @@ t5 CREATE TABLE `t5` ( 
  `param15` longblob

) ENGINE=MyISAM DEFAULT CHARSET=latin1

select * from t5 ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t5	t5	const01	const01	8	1	1	N	32769	0	63

def	test	t5	t5	param01	param01	8	20	1	Y	32768	0	63

def	test	t5	t5	const02	const02	246	3	3	N	1	1	63
@@ -1894,7 +1894,7 @@ from t9 where c1= 1 ; 
@arg01:=  c1	@arg02:=  c2	@arg03:=  c3	@arg04:=  c4	@arg05:=  c5	@arg06:=  c6	@arg07:=  c7	@arg08:=  c8	@arg09:=  c9	@arg10:= c10	@arg11:= c11	@arg12:= c12	@arg13:= c13	@arg14:= c14	@arg15:= c15	@arg16:= c16	@arg17:= c17	@arg18:= c18	@arg19:= c19	@arg20:= c20	@arg21:= c21	@arg22:= c22	@arg23:= c23	@arg24:= c24	@arg25:= c25	@arg26:= c26	@arg27:= c27	@arg28:= c28	@arg29:= c29	@arg30:= c30	@arg31:= c31	@arg32:= c32

1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday

execute full_info ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					@arg01	253	20	1	Y	128	31	63

def					@arg02	253	20	1	Y	128	31	63

def					@arg03	253	20	1	Y	128	31	63
@@ -1941,7 +1941,7 @@ from t9 where c1= 0 ; 
@arg01:=  c1	@arg02:=  c2	@arg03:=  c3	@arg04:=  c4	@arg05:=  c5	@arg06:=  c6	@arg07:=  c7	@arg08:=  c8	@arg09:=  c9	@arg10:= c10	@arg11:= c11	@arg12:= c12	@arg13:= c13	@arg14:= c14	@arg15:= c15	@arg16:= c16	@arg17:= c17	@arg18:= c18	@arg19:= c19	@arg20:= c20	@arg21:= c21	@arg22:= c22	@arg23:= c23	@arg24:= c24	@arg25:= c25	@arg26:= c26	@arg27:= c27	@arg28:= c28	@arg29:= c29	@arg30:= c30	@arg31:= c31	@arg32:= c32

0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL

execute full_info ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					@arg01	253	20	1	Y	128	31	63

def					@arg02	253	20	0	Y	128	31	63

def					@arg03	253	20	0	Y	128	31	63
@@ -1991,7 +1991,7 @@ execute stmt1 using @my_key ; 
@arg01:=  c1	@arg02:=  c2	@arg03:=  c3	@arg04:=  c4	@arg05:=  c5	@arg06:=  c6	@arg07:=  c7	@arg08:=  c8	@arg09:=  c9	@arg10:= c10	@arg11:= c11	@arg12:= c12	@arg13:= c13	@arg14:= c14	@arg15:= c15	@arg16:= c16	@arg17:= c17	@arg18:= c18	@arg19:= c19	@arg20:= c20	@arg21:= c21	@arg22:= c22	@arg23:= c23	@arg24:= c24	@arg25:= c25	@arg26:= c26	@arg27:= c27	@arg28:= c28	@arg29:= c29	@arg30:= c30	@arg31:= c31	@arg32:= c32

1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday

execute full_info ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					@arg01	253	20	1	Y	128	31	63

def					@arg02	253	20	1	Y	128	31	63

def					@arg03	253	20	1	Y	128	31	63
@@ -2031,7 +2031,7 @@ execute stmt1 using @my_key ; 
@arg01:=  c1	@arg02:=  c2	@arg03:=  c3	@arg04:=  c4	@arg05:=  c5	@arg06:=  c6	@arg07:=  c7	@arg08:=  c8	@arg09:=  c9	@arg10:= c10	@arg11:= c11	@arg12:= c12	@arg13:= c13	@arg14:= c14	@arg15:= c15	@arg16:= c16	@arg17:= c17	@arg18:= c18	@arg19:= c19	@arg20:= c20	@arg21:= c21	@arg22:= c22	@arg23:= c23	@arg24:= c24	@arg25:= c25	@arg26:= c26	@arg27:= c27	@arg28:= c28	@arg29:= c29	@arg30:= c30	@arg31:= c31	@arg32:= c32

0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL

execute full_info ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					@arg01	253	20	1	Y	128	31	63

def					@arg02	253	20	0	Y	128	31	63

def					@arg03	253	20	0	Y	128	31	63
@@ -2079,7 +2079,7 @@ into @arg01, @arg02, @arg03, @arg04, @arg05, @arg06, @arg07, @arg08, 
@arg25, @arg26, @arg27, @arg28, @arg29, @arg30, @arg31, @arg32

from t9 where c1= 1 ;

execute full_info ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					@arg01	253	20	1	Y	128	31	63

def					@arg02	253	20	1	Y	128	31	63

def					@arg03	253	20	1	Y	128	31	63
@@ -2123,7 +2123,7 @@ into @arg01, @arg02, @arg03, @arg04, @arg05, @arg06, @arg07, @arg08, 
@arg25, @arg26, @arg27, @arg28, @arg29, @arg30, @arg31, @arg32

from t9 where c1= 0 ;

execute full_info ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					@arg01	253	20	1	Y	128	31	63

def					@arg02	253	20	0	Y	128	31	63

def					@arg03	253	20	0	Y	128	31	63
@@ -2169,7 +2169,7 @@ from t9 where c1= ?" ; 
set @my_key= 1 ;

execute stmt1 using @my_key ;

execute full_info ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					@arg01	253	20	1	Y	128	31	63

def					@arg02	253	20	1	Y	128	31	63

def					@arg03	253	20	1	Y	128	31	63
@@ -2207,7 +2207,7 @@ def @arg32 253 8192 6 Y 0 31 8 
set @my_key= 0 ;

execute stmt1 using @my_key ;

execute full_info ;

Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					@arg01	253	20	1	Y	128	31	63

def					@arg02	253	20	0	Y	128	31	63

def					@arg03	253	20	0	Y	128	31	63