Loading Build-tools/Do-compile +1 −1 Original line number Diff line number Diff line Loading @@ -236,7 +236,7 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) { system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir); safe_cd("${test_dir}/mysql-test"); check_system("./mysql-test-run --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful"); check_system("./mysql-test-run --warnings --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful"); } # Start the server if we are going to run any of the benchmarks Loading Docs/manual.texi +40 −12 Original line number Diff line number Diff line Loading @@ -8104,14 +8104,39 @@ dumping core after you upgrade MySQL. @node Upgrading-from-3.23, Upgrading-from-3.22, Upgrade, Upgrade @subsection Upgrading From Version 3.23 to Version 4.0 You can use your old datafiles without any modification with Version 4.0. If you want to move your data from a MySQL 4.0 server to an older server, you have to use @code{mysqldump}. In general what you have to do when upgrading to 4.0 from an earlier MySQL version: @itemize @item Run the @code{mysql_fix_privilege_tables} to add new privileges and features to the MySQL privilege tables. @item Edit any MySQL startup scripts or configure files to not use any of the deprecated options listed below. @item Convert your old ISAM files to MyISAM files with the command: @code{mysql_convert_table_format database}. Note that this should only be run if all tables in the given database is ISAM or MyISAM tables. If this is not the case you should run @code{ALTER TABLE table_name TYPE=MyISAM} on all ISAM tables. @end itemize MySQL 4.0 will work even if you don't do the above, but you will not be able to use the new security privileges that MySQL 4.0 and you may run into problems when upgrading later to MySQL 4.1 or newer. The ISAM file format still works in MySQL 4.0 but it's deprecated and will be disabled in MySQL 5.0. Old clients should work with a Version 4.0 server without any problems. The following lists tell what you have to watch out for when upgrading to version 4.0; Even if you do the above, you can still downgrade to MySQL 3.23.52 or newer if you run into problems with the MySQL 4.0 series. In this case you have to do a mysqldump of any tables using a fulltext index and restore these in 3.23 (because 4.0 uses a new format for fulltext index). The following is a more complete lists tell what you have to watch out for when upgrading to version 4.0; @itemize @bullet @item Loading Loading @@ -8141,9 +8166,9 @@ before. In particular, you will need @code{REPLICATION SLAVE} The startup parameters @code{myisam_max_extra_sort_file_size} and @code{myisam_max_extra_sort_file_size} are now given in bytes (was megabytes before 4.0.3). External system locking of @code{MyISAM}/@code{ISAM} files is now turned off by default. One can turn this on with @code{--external-locking}. (For most users this is never needed). External system locking of MyISAM/ISAM files is now turned off by default. One can turn this on by doing @code{--external-locking}. (For most users this is never needed). @item The following startup variables/options have been renamed: @multitable @columnfractions .50 .50 Loading Loading @@ -50271,6 +50296,9 @@ each individual 4.0.x release. @itemize @bullet @item Don't increment warnings when setting @code{AUTO_INCREMENT} columns to @code{NULL} in @code{LOAD DATA INFILE}. @item Fixed all boolean type variables/options to work with the old syntax, e.g. all of these work: --lower-case-table-names, --lower-case-table-names=1, -O lower-case-table-names=1, --set-variable=lower-case-table-names=1 Loading Loading @@ -50308,7 +50336,7 @@ Fixed some problems with @code{CREATE TABLE ... SELECT function()}. @code{mysqld} now has the option @code{--temp-pool} enabled by default as this gives better performance with some operating systems. @item Big cleanup in replication code. Big cleanup in replication code (less logging, better error messages, etc..) @item If the @code{--code-file} option is specified, the server calls @code{setrlimit()} to set the maximum allowed core file size to unlimited, Loading Loading @@ -50344,9 +50372,9 @@ Allow @code{DEFAULT} with @code{INSERT} statement. The startup parameters @code{myisam_max_sort_file_size} and @code{myisam_max_extra_sort_file_size} are now given in bytes, not megabytes. @item External system locking of MyISAM/ISAM files is now turned off by default. One can turn this one by doing @code{--external-locking}. (For most users this is never needed). External system locking of @code{MyISAM}/@code{ISAM} files is now turned off by default. One can turn this on with @code{--external-locking}. (For most users this is never needed). @item Fixed core dump bug with @code{INSERT ... SET db_name.table_name.colname=''}. @item configure.in +1 −1 Original line number Diff line number Diff line Loading @@ -1186,7 +1186,7 @@ then else # CC="$CC -Kthread -DOpenUNIX8"; # CXX="$CXX -Kthread -DOpenUNIX8"; CC="$CC -Kthread -DUNIXWARE_7"; CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; CXX="$CXX -Kthread -DUNIXWARE_7"; fi AC_MSG_RESULT("yes") Loading include/my_pthread.h +6 −0 Original line number Diff line number Diff line Loading @@ -487,6 +487,12 @@ int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp, /* READ-WRITE thread locking */ #ifdef HAVE_BROKEN_RWLOCK /* For OpenUnix */ #undef HAVE_PTHREAD_RWLOCK_RDLOCK #undef HAVE_RWLOCK_INIT #undef HAVE_RWLOCK_T #endif #if defined(USE_MUTEX_INSTEAD_OF_RW_LOCKS) /* use these defs for simple mutex locking */ #define rw_lock_t pthread_mutex_t Loading include/mysql_version.h.in +2 −0 Original line number Diff line number Diff line Loading @@ -10,7 +10,9 @@ #else #define PROTOCOL_VERSION @PROTOCOL_VERSION@ #define MYSQL_SERVER_VERSION "@VERSION@" #ifndef MYSQL_SERVER_SUFFIX #define MYSQL_SERVER_SUFFIX "@MYSQL_SERVER_SUFFIX@" #endif #define FRM_VER @DOT_FRM_VERSION@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ #define MYSQL_PORT @MYSQL_TCP_PORT@ Loading Loading
Build-tools/Do-compile +1 −1 Original line number Diff line number Diff line Loading @@ -236,7 +236,7 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) { system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir); safe_cd("${test_dir}/mysql-test"); check_system("./mysql-test-run --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful"); check_system("./mysql-test-run --warnings --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful"); } # Start the server if we are going to run any of the benchmarks Loading
Docs/manual.texi +40 −12 Original line number Diff line number Diff line Loading @@ -8104,14 +8104,39 @@ dumping core after you upgrade MySQL. @node Upgrading-from-3.23, Upgrading-from-3.22, Upgrade, Upgrade @subsection Upgrading From Version 3.23 to Version 4.0 You can use your old datafiles without any modification with Version 4.0. If you want to move your data from a MySQL 4.0 server to an older server, you have to use @code{mysqldump}. In general what you have to do when upgrading to 4.0 from an earlier MySQL version: @itemize @item Run the @code{mysql_fix_privilege_tables} to add new privileges and features to the MySQL privilege tables. @item Edit any MySQL startup scripts or configure files to not use any of the deprecated options listed below. @item Convert your old ISAM files to MyISAM files with the command: @code{mysql_convert_table_format database}. Note that this should only be run if all tables in the given database is ISAM or MyISAM tables. If this is not the case you should run @code{ALTER TABLE table_name TYPE=MyISAM} on all ISAM tables. @end itemize MySQL 4.0 will work even if you don't do the above, but you will not be able to use the new security privileges that MySQL 4.0 and you may run into problems when upgrading later to MySQL 4.1 or newer. The ISAM file format still works in MySQL 4.0 but it's deprecated and will be disabled in MySQL 5.0. Old clients should work with a Version 4.0 server without any problems. The following lists tell what you have to watch out for when upgrading to version 4.0; Even if you do the above, you can still downgrade to MySQL 3.23.52 or newer if you run into problems with the MySQL 4.0 series. In this case you have to do a mysqldump of any tables using a fulltext index and restore these in 3.23 (because 4.0 uses a new format for fulltext index). The following is a more complete lists tell what you have to watch out for when upgrading to version 4.0; @itemize @bullet @item Loading Loading @@ -8141,9 +8166,9 @@ before. In particular, you will need @code{REPLICATION SLAVE} The startup parameters @code{myisam_max_extra_sort_file_size} and @code{myisam_max_extra_sort_file_size} are now given in bytes (was megabytes before 4.0.3). External system locking of @code{MyISAM}/@code{ISAM} files is now turned off by default. One can turn this on with @code{--external-locking}. (For most users this is never needed). External system locking of MyISAM/ISAM files is now turned off by default. One can turn this on by doing @code{--external-locking}. (For most users this is never needed). @item The following startup variables/options have been renamed: @multitable @columnfractions .50 .50 Loading Loading @@ -50271,6 +50296,9 @@ each individual 4.0.x release. @itemize @bullet @item Don't increment warnings when setting @code{AUTO_INCREMENT} columns to @code{NULL} in @code{LOAD DATA INFILE}. @item Fixed all boolean type variables/options to work with the old syntax, e.g. all of these work: --lower-case-table-names, --lower-case-table-names=1, -O lower-case-table-names=1, --set-variable=lower-case-table-names=1 Loading Loading @@ -50308,7 +50336,7 @@ Fixed some problems with @code{CREATE TABLE ... SELECT function()}. @code{mysqld} now has the option @code{--temp-pool} enabled by default as this gives better performance with some operating systems. @item Big cleanup in replication code. Big cleanup in replication code (less logging, better error messages, etc..) @item If the @code{--code-file} option is specified, the server calls @code{setrlimit()} to set the maximum allowed core file size to unlimited, Loading Loading @@ -50344,9 +50372,9 @@ Allow @code{DEFAULT} with @code{INSERT} statement. The startup parameters @code{myisam_max_sort_file_size} and @code{myisam_max_extra_sort_file_size} are now given in bytes, not megabytes. @item External system locking of MyISAM/ISAM files is now turned off by default. One can turn this one by doing @code{--external-locking}. (For most users this is never needed). External system locking of @code{MyISAM}/@code{ISAM} files is now turned off by default. One can turn this on with @code{--external-locking}. (For most users this is never needed). @item Fixed core dump bug with @code{INSERT ... SET db_name.table_name.colname=''}. @item
configure.in +1 −1 Original line number Diff line number Diff line Loading @@ -1186,7 +1186,7 @@ then else # CC="$CC -Kthread -DOpenUNIX8"; # CXX="$CXX -Kthread -DOpenUNIX8"; CC="$CC -Kthread -DUNIXWARE_7"; CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; CXX="$CXX -Kthread -DUNIXWARE_7"; fi AC_MSG_RESULT("yes") Loading
include/my_pthread.h +6 −0 Original line number Diff line number Diff line Loading @@ -487,6 +487,12 @@ int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp, /* READ-WRITE thread locking */ #ifdef HAVE_BROKEN_RWLOCK /* For OpenUnix */ #undef HAVE_PTHREAD_RWLOCK_RDLOCK #undef HAVE_RWLOCK_INIT #undef HAVE_RWLOCK_T #endif #if defined(USE_MUTEX_INSTEAD_OF_RW_LOCKS) /* use these defs for simple mutex locking */ #define rw_lock_t pthread_mutex_t Loading
include/mysql_version.h.in +2 −0 Original line number Diff line number Diff line Loading @@ -10,7 +10,9 @@ #else #define PROTOCOL_VERSION @PROTOCOL_VERSION@ #define MYSQL_SERVER_VERSION "@VERSION@" #ifndef MYSQL_SERVER_SUFFIX #define MYSQL_SERVER_SUFFIX "@MYSQL_SERVER_SUFFIX@" #endif #define FRM_VER @DOT_FRM_VERSION@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ #define MYSQL_PORT @MYSQL_TCP_PORT@ Loading