1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge paul@work.mysql.com:/home/bk/mysql-4.0

Browse Source 
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
This commit is contained in:
unknown 2002-07-30 09:35:37 -05:00
commit bd2dc33581
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docs/Support/docbook-fixup.pl
View File

@ -38,7 +38,7 @@ $data =~ s/FIXUPmdashFIXUP/\&mdash\;/g;
$data =~ s/FIXUPdoubledashFIXUP/--/g;
$data =~ s/FIXUPstrongFIXUP/<emphasis\ role\=bold>/g;
$data =~ s/FIXUPstrongFIXUP/<emphasis\ role\=\"bold\">/g;
$data =~ s/FIXUPendstrongFIXUP/<\/emphasis>/g;
$data =~ s/FIXUPemphFIXUP/<emphasis>/g;

2
Docs/manual.texi
View File

@ -5594,7 +5594,7 @@ InnoDB: Doublewrite buffer created
InnoDB: creating foreign key constraint system tables
InnoDB: foreign key constraint system tables created
011024 10:58:25 InnoDB: Started
@end example
@end example
For further information about running MySQL on Windows,
see @ref{Windows}.

2
sql/sql_olap.cc
View File

@ -46,7 +46,7 @@ static int make_new_olap_select(LEX *lex, SELECT_LEX *select_lex, List<Item> new
{
THD *thd=current_thd;
Item *item, *new_item;
Item_string *constant= new Item_string("ALL",3);
Item_null *constant= new Item_null("ALL");
SELECT_LEX *new_select = (SELECT_LEX *) thd->memdup((char*) select_lex, sizeof(*select_lex));
if (!new_select)

7
sql/sql_select.cc
View File

@ -4040,9 +4040,12 @@ static bool create_myisam_tmp_table(TABLE *table,TMP_TABLE_PARAM *param,
}
MI_CREATE_INFO create_info;
bzero((char*) &create_info,sizeof(create_info));
if ((options & (OPTION_BIG_TABLES | SELECT_SMALL_RESULT)) ==
OPTION_BIG_TABLES)
if ((options & (OPTION_BIG_TABLES | SELECT_SMALL_RESULT)) !=
SELECT_SMALL_RESULT)
{
create_info.data_file_length= ~(ulonglong) 0;
create_info.max_rows= ~(ulonglong) 0;
}
if ((error=mi_create(table->real_name,table->keys,&keydef,
(uint) (param->recinfo-param->start_recinfo),