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

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

Browse Source 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2002-07-17 14:52:09 +03:00
commit 581c60d14f
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Docs/manual.texi
View File

@ -49674,12 +49674,22 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
@cindex changes, version 4.0 @cindex changes, version 4.0
@menu @menu
* News-4.0.3:: Changes in release 4.0.3
* News-4.0.2:: Changes in release 4.0.2 (01 July 2002) * News-4.0.2:: Changes in release 4.0.2 (01 July 2002)
* News-4.0.1:: Changes in release 4.0.1 (23 Dec 2001) * News-4.0.1:: Changes in release 4.0.1 (23 Dec 2001)
* News-4.0.0:: Changes in release 4.0.0 (Oct 2001: Alpha) * News-4.0.0:: Changes in release 4.0.0 (Oct 2001: Alpha)
@end menu @end menu
@node News-4.0.2, News-4.0.1, News-4.0.x, News-4.0.x @node News-4.0.3, News-4.0.2, News-4.0.x, News-4.0.x
@appendixsubsec Changes in release 4.0.3
@itemize @bullet
@item
Fixed a bug that made the pager option in the mysql client non-functional.
@end itemize
@node News-4.0.2, News-4.0.1, News-4.0.3, News-4.0.x
@appendixsubsec Changes in release 4.0.2 (01 July 2002) @appendixsubsec Changes in release 4.0.2 (01 July 2002)
@itemize @bullet @itemize @bullet
@ -49942,6 +49952,7 @@ GRANT ... WITH MAX_QUERIES_PER_HOUR N1
Added @code{mysql_secure_installation} to the @file{scripts/} directory. Added @code{mysql_secure_installation} to the @file{scripts/} directory.
@end itemize @end itemize
@node News-4.0.1, News-4.0.0, News-4.0.2, News-4.0.x @node News-4.0.1, News-4.0.0, News-4.0.2, News-4.0.x
@appendixsubsec Changes in release 4.0.1 (23 Dec 2001) @appendixsubsec Changes in release 4.0.1 (23 Dec 2001)
@ -50016,6 +50027,7 @@ the @code{FIRST} and @code{AFTER} keywords.
Indexes are now used with @code{ORDER BY} on a whole @code{InnoDB} table. Indexes are now used with @code{ORDER BY} on a whole @code{InnoDB} table.
@end itemize @end itemize
@node News-4.0.0, , News-4.0.1, News-4.0.x @node News-4.0.0, , News-4.0.1, News-4.0.x
@appendixsubsec Changes in release 4.0.0 (Oct 2001: Alpha) @appendixsubsec Changes in release 4.0.0 (Oct 2001: Alpha)

6
sql/mysqld.cc
View File

@ -4493,17 +4493,17 @@ static void get_options(int argc,char **argv)
default_table_type_name=ha_table_typelib.type_names[default_table_type-1]; default_table_type_name=ha_table_typelib.type_names[default_table_type-1];
default_tx_isolation_name=tx_isolation_typelib.type_names[default_tx_isolation]; default_tx_isolation_name=tx_isolation_typelib.type_names[default_tx_isolation];
/* To be deleted in MySQL 4.0 */ /* To be deleted in MySQL 4.0 */
if (!thd->variables.record_rnd_cache_size) if (thd && !thd->variables.record_rnd_cache_size)
thd->variables.record_rnd_cache_size= my_default_record_cache_size; thd->variables.record_rnd_cache_size= my_default_record_cache_size;
/* Fix variables that are base 1024*1024 */ /* Fix variables that are base 1024*1024 */
myisam_max_temp_length= myisam_max_temp_length=
(my_off_t) min(((ulonglong) (my_off_t) min(((ulonglong)
thd->variables.myisam_max_sort_file_size)*1024 * 1024, global_system_variables.myisam_max_sort_file_size)*1024 * 1024,
(ulonglong) MAX_FILE_SIZE); (ulonglong) MAX_FILE_SIZE);
myisam_max_extra_temp_length= myisam_max_extra_temp_length=
(my_off_t) min(((ulonglong) (my_off_t) min(((ulonglong)
thd->variables.myisam_max_extra_sort_file_size)*1024*1024, global_system_variables.myisam_max_extra_sort_file_size)*1024*1024,
(ulonglong) MAX_FILE_SIZE); (ulonglong) MAX_FILE_SIZE);
myisam_block_size=(uint) 1 << my_bit_log2(opt_myisam_block_size); myisam_block_size=(uint) 1 << my_bit_log2(opt_myisam_block_size);