Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-05-14 16:39:00-06:00, tsmith@stripped +23 -0
Merge siva.hindu.god:/home/tsmith/m/bk/51
into siva.hindu.god:/home/tsmith/m/bk/maint/51
MERGE: 1.2475.1.40
configure.in@stripped, 2007-05-14 16:38:47-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.456.1.3
include/my_global.h@stripped, 2007-05-14 16:38:47-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.163.1.5
mysql-test/mysql-test-run.pl@stripped, 2007-05-14 16:38:47-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.296.2.1
mysql-test/r/type_datetime.result@stripped, 2007-05-14 16:38:48-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.43.1.2
mysql-test/t/outfile.test@stripped, 2007-05-14 16:38:48-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.15.1.2
mysql-test/t/type_datetime.test@stripped, 2007-05-14 16:38:48-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.25.1.2
sql/field.cc@stripped, 2007-05-14 16:38:48-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.387.2.2
sql/field.h@stripped, 2007-05-14 16:38:48-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.222.2.2
sql/item.cc@stripped, 2007-05-14 16:38:48-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.266.1.2
sql/item.h@stripped, 2007-05-14 16:38:48-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.240.1.2
sql/item_cmpfunc.cc@stripped, 2007-05-14 16:38:49-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.270.1.2
sql/item_func.cc@stripped, 2007-05-14 16:38:49-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.380.4.1
sql/item_func.h@stripped, 2007-05-14 16:38:49-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.169.1.2
sql/log.cc@stripped, 2007-05-14 16:38:49-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.279.1.1
sql/my_decimal.cc@stripped, 2007-05-14 16:38:49-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.16.1.2
sql/my_decimal.h@stripped, 2007-05-14 16:38:49-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.15.2.2
sql/mysql_priv.h@stripped, 2007-05-14 16:38:50-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.501.2.2
sql/mysqld.cc@stripped, 2007-05-14 16:38:50-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.638.1.1
sql/sql_base.cc@stripped, 2007-05-14 16:38:50-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.396.1.3
sql/sql_class.h@stripped, 2007-05-14 16:38:51-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.355.2.2
sql/sql_show.cc@stripped, 2007-05-14 16:38:51-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.408.1.2
sql/structs.h@stripped, 2007-05-14 16:38:51-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.65.1.3
storage/myisam/ha_myisam.cc@stripped, 2007-05-14 16:38:51-06:00, tsmith@stripped +0 -0
Auto merged
MERGE: 1.217.1.1
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tsmith
# Host: siva.hindu.god
# Root: /home/tsmith/m/bk/maint/51/RESYNC
--- 1.460/configure.in 2007-05-10 07:07:07 -06:00
+++ 1.461/configure.in 2007-05-14 16:38:47 -06:00
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
#
# When changing major version number please also check switch statement
# in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.1.18-beta)
+AM_INIT_AUTOMAKE(mysql, 5.1.19-beta)
AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10
--- 1.218/storage/myisam/ha_myisam.cc 2007-04-15 10:45:11 -06:00
+++ 1.219/storage/myisam/ha_myisam.cc 2007-05-14 16:38:51 -06:00
@@ -1037,8 +1037,8 @@ int ha_myisam::optimize(THD* thd, HA_CHE
param.sort_buffer_length= check_opt->sort_buffer_size;
if ((error= repair(thd,param,1)) && param.retry_repair)
{
- sql_print_warning("Warning: Optimize table got errno %d, retrying",
- my_errno);
+ sql_print_warning("Warning: Optimize table got errno %d on %s.%s, retrying",
+ my_errno, param.db_name, param.table_name);
param.testflag&= ~T_REP_BY_SORT;
error= repair(thd,param,1);
}
@@ -1427,8 +1427,8 @@ int ha_myisam::enable_indexes(uint mode)
param.tmpdir=&mysql_tmpdir_list;
if ((error= (repair(thd,param,0) != HA_ADMIN_OK)) && param.retry_repair)
{
- sql_print_warning("Warning: Enabling keys got errno %d, retrying",
- my_errno);
+ sql_print_warning("Warning: Enabling keys got errno %d on %s.%s, retrying",
+ my_errno, param.db_name, param.table_name);
/* Repairing by sort failed. Now try standard repair method. */
param.testflag&= ~(T_REP_BY_SORT | T_QUICK);
error= (repair(thd,param,0) != HA_ADMIN_OK);
--- 1.390/sql/item_func.cc 2007-05-11 09:56:48 -06:00
+++ 1.391/sql/item_func.cc 2007-05-14 16:38:49 -06:00
@@ -2023,9 +2023,9 @@ double my_double_round(double value, lon
tmp=(abs_dec < array_elements(log_10) ?
log_10[abs_dec] : pow(10.0,(double) abs_dec));
- if (dec_negative && isinf(tmp))
+ if (dec_negative && my_isinf(tmp))
tmp2= 0;
- else if (!dec_negative && isinf(value * tmp))
+ else if (!dec_negative && my_isinf(value * tmp))
tmp2= value;
else if (truncate)
{
--- 1.280/sql/log.cc 2007-04-27 11:03:49 -06:00
+++ 1.281/sql/log.cc 2007-05-14 16:38:49 -06:00
@@ -3891,7 +3891,7 @@ void MYSQL_BIN_LOG::rotate_and_purge(uin
#ifdef HAVE_REPLICATION
if (expire_logs_days)
{
- long purge_time= (long) (time(0) - expire_logs_days*24*60*60);
+ time_t purge_time= time(0) - expire_logs_days*24*60*60;
if (purge_time >= 0)
purge_logs_before_date(purge_time);
}
--- 1.644/sql/mysqld.cc 2007-05-10 00:06:06 -06:00
+++ 1.645/sql/mysqld.cc 2007-05-14 16:38:50 -06:00
@@ -3502,7 +3502,7 @@ server.");
#ifdef HAVE_REPLICATION
if (opt_bin_log && expire_logs_days)
{
- long purge_time= (long) (time(0) - expire_logs_days*24*60*60);
+ time_t purge_time= time(0) - expire_logs_days*24*60*60;
if (purge_time >= 0)
mysql_bin_log.purge_logs_before_date(purge_time);
}
@@ -6665,6 +6665,7 @@ SHOW_VAR status_vars[]= {
{"Com_analyze", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_ANALYZE]), SHOW_LONG_STATUS},
{"Com_backup_table", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_BACKUP_TABLE]), SHOW_LONG_STATUS},
{"Com_begin", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_BEGIN]), SHOW_LONG_STATUS},
+ {"Com_call_procedure", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_CALL]), SHOW_LONG_STATUS},
{"Com_change_db", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_CHANGE_DB]), SHOW_LONG_STATUS},
{"Com_change_master", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_CHANGE_MASTER]), SHOW_LONG_STATUS},
{"Com_check", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_CHECK]), SHOW_LONG_STATUS},
--- 1.303/mysql-test/mysql-test-run.pl 2007-05-07 13:32:02 -06:00
+++ 1.304/mysql-test/mysql-test-run.pl 2007-05-14 16:38:47 -06:00
@@ -1082,7 +1082,7 @@ sub command_line_setup () {
# On some operating systems, there is a limit to the length of a
# UNIX domain socket's path far below PATH_MAX, so try to avoid long
# socket path names.
- $sockdir = tempdir(CLEANUP => 0) if ( length($sockdir) >= 80 );
+ $sockdir = tempdir(CLEANUP => 0) if ( length($sockdir) >= 70 );
$master->[0]=
{
--- 1.16/mysql-test/t/outfile.test 2007-05-04 03:41:56 -06:00
+++ 1.17/mysql-test/t/outfile.test 2007-05-14 16:38:48 -06:00
@@ -41,9 +41,9 @@ eval select * into dumpfile "../tmp/outf
eval select * into dumpfile "../tmp/outfile-test.3" from t1;
enable_query_log;
select load_file(concat(@tmpdir,"/outfile-test.not-exist"));
---exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.1
---exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.2
---exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.3
+--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.1
+--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.2
+--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.3
drop table t1;
# Bug#8191
@@ -51,7 +51,7 @@ disable_query_log;
eval select 1 into outfile "../tmp/outfile-test.4";
enable_query_log;
select load_file(concat(@tmpdir,"/outfile-test.4"));
---exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.4
+--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.4
#
# Bug #5382: 'explain select into outfile' crashes the server
@@ -75,7 +75,7 @@ eval SELECT * INTO OUTFILE "../tmp/outfi
FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
FROM information_schema.schemata LIMIT 0, 5;
# enable_query_log;
---exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.4
+--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.4
use information_schema;
# disable_query_log;
@@ -83,7 +83,7 @@ eval SELECT * INTO OUTFILE "../tmp/outfi
FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
FROM schemata LIMIT 0, 5;
enable_query_log;
---exec rm $MYSQLTEST_VARDIR/tmp/outfile-test.4
+--remove_file $MYSQLTEST_VARDIR/tmp/outfile-test.4
use test;
#
--- 1.168/include/my_global.h 2007-05-05 00:20:31 -06:00
+++ 1.169/include/my_global.h 2007-05-14 16:38:47 -06:00
@@ -867,12 +867,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
#define isnan(x) ((x) != (x))
#endif
-#if !defined(HAVE_ISINF)
-/* The configure check for "isinf with math.h" has failed */
-#ifdef isinf
-#undef isinf
-#endif
-#define isinf(X) (!finite(X) && !isnan(X))
+#ifdef HAVE_ISINF
+/* isinf() can be used in both C and C++ code */
+#define my_isinf(X) isinf(X)
+#else
+#define my_isinf(X) (!finite(X) && !isnan(X))
#endif
/* Define missing math constants. */
| Thread |
|---|
| • bk commit into 5.1 tree (tsmith:1.2488) | tim | 15 May |
