Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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, 2006-11-29 19:32:36+01:00, msvensson@shellback.(none) +9 -0
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
MERGE: 1.2349.1.28
client/mysql_upgrade.c@stripped, 2006-11-29 19:31:22+01:00, msvensson@shellback.(none) +0 -0
Auto merged
MERGE: 1.12.1.3
configure.in@stripped, 2006-11-29 19:31:22+01:00, msvensson@shellback.(none) +0 -0
Auto merged
MERGE: 1.399.1.1
include/my_sys.h@stripped, 2006-11-29 19:32:34+01:00, msvensson@shellback.(none) +0 -5
Manual merge - my_getpagesize defined further down separate from HAVE_SYS_MMAN_H
MERGE: 1.210.1.1
mysql-test/lib/mtr_report.pl@stripped, 2006-11-29 19:31:22+01:00, msvensson@shellback.(none) +0 -0
Auto merged
MERGE: 1.39.1.3
mysql-test/mysql-test-run.pl@stripped, 2006-11-29 19:31:22+01:00, msvensson@shellback.(none) +1 -0
Auto merged
MERGE: 1.227.1.11
sql-common/my_time.c@stripped, 2006-11-29 19:31:23+01:00, msvensson@shellback.(none) +0 -0
Auto merged
MERGE: 1.31.1.1
sql/item_timefunc.cc@stripped, 2006-11-29 19:31:22+01:00, msvensson@shellback.(none) +0 -0
Auto merged
MERGE: 1.141.1.1
sql/sql_parse.cc@stripped, 2006-11-29 19:31:23+01:00, msvensson@shellback.(none) +0 -0
Auto merged
MERGE: 1.599.1.1
support-files/mysql.spec.sh@stripped, 2006-11-29 19:31:23+01:00, msvensson@shellback.(none) +0 -0
Auto merged
MERGE: 1.170.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: msvensson
# Host: shellback.(none)
# Root: /home/msvensson/mysql/mysql-5.1-merge-from5.0-maint/RESYNC
--- 1.142/sql/item_timefunc.cc 2006-11-29 19:32:44 +01:00
+++ 1.143/sql/item_timefunc.cc 2006-11-29 19:32:44 +01:00
@@ -290,15 +290,16 @@
for (; ptr != end && val != val_end; ptr++)
{
+ /* Skip pre-space between each argument */
+ while (val != val_end && my_isspace(cs, *val))
+ val++;
+
if (*ptr == '%' && ptr+1 != end)
{
int val_len;
char *tmp;
error= 0;
- /* Skip pre-space between each argument */
- while (val != val_end && my_isspace(cs, *val))
- val++;
val_len= (uint) (val_end - val);
switch (*++ptr) {
@@ -3194,7 +3195,9 @@
date_time_format.format.str= (char*) format->ptr();
date_time_format.format.length= format->length();
if (extract_date_time(&date_time_format, val->ptr(), val->length(),
- ltime, cached_timestamp_type, 0, "datetime"))
+ ltime, cached_timestamp_type, 0, "datetime") ||
+ ((fuzzy_date & TIME_NO_ZERO_DATE) &&
+ (ltime->year == 0 || ltime->month == 0 || ltime->day == 0)))
goto null_date;
if (cached_timestamp_type == MYSQL_TIMESTAMP_TIME && ltime->day)
{
@@ -3231,8 +3234,13 @@
bool Item_func_last_day::get_date(TIME *ltime, uint fuzzy_date)
{
- if (get_arg0_date(ltime, fuzzy_date & ~TIME_FUZZY_DATE))
+ if (get_arg0_date(ltime, fuzzy_date & ~TIME_FUZZY_DATE) ||
+ (ltime->month == 0))
+ {
+ null_value= 1;
return 1;
+ }
+ null_value= 0;
uint month_idx= ltime->month-1;
ltime->day= days_in_month[month_idx];
if ( month_idx == 1 && calc_days_in_year(ltime->year) == 366)
--- 1.600/sql/sql_parse.cc 2006-11-29 19:32:44 +01:00
+++ 1.601/sql/sql_parse.cc 2006-11-29 19:32:44 +01:00
@@ -57,10 +57,6 @@
(LP)->sql_command == SQLCOM_DROP_FUNCTION ? \
"FUNCTION" : "PROCEDURE")
-#ifdef SOLARIS
-extern "C" int gethostname(char *name, int namelen);
-#endif
-
static void time_out_user_resource_limits(THD *thd, USER_CONN *uc);
#ifndef NO_EMBEDDED_ACCESS_CHECKS
static int check_for_max_user_connections(THD *thd, USER_CONN *uc);
@@ -2626,10 +2622,11 @@
if (opt_readonly &&
!(thd->security_ctx->master_access & SUPER_ACL) &&
(sql_command_flags[lex->sql_command] & CF_CHANGES_DATA) &&
- !((lex->sql_command == SQLCOM_CREATE_TABLE) &&
- (lex->create_info.options & HA_LEX_CREATE_TMP_TABLE)) &&
- ((lex->sql_command != SQLCOM_UPDATE_MULTI) &&
- some_non_temp_table_to_be_updated(thd, all_tables)))
+ !((lex->sql_command == SQLCOM_CREATE_TABLE) &&
+ (lex->create_info.options & HA_LEX_CREATE_TMP_TABLE)) &&
+ !((lex->sql_command == SQLCOM_DROP_TABLE) && lex->drop_temporary) &&
+ ((lex->sql_command != SQLCOM_UPDATE_MULTI) &&
+ some_non_temp_table_to_be_updated(thd, all_tables)))
{
my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--read-only");
DBUG_RETURN(-1);
@@ -4673,8 +4670,6 @@
select_limit= thd->variables.select_limit;
thd->variables.select_limit= HA_POS_ERROR;
- thd->row_count_func= 0;
-
/*
We never write CALL statements into binlog:
- If the mode is non-prelocked, each statement will be logged
--- 1.172/support-files/mysql.spec.sh 2006-11-29 19:32:44 +01:00
+++ 1.173/support-files/mysql.spec.sh 2006-11-29 19:32:44 +01:00
@@ -193,8 +193,6 @@
%package shared
Summary: MySQL - Shared libraries
Group: Applications/Databases
-Provides: mysql-shared
-Obsoletes: mysql-shared
%description shared
This package contains the shared libraries (*.so*) which certain
@@ -689,12 +687,6 @@
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
-* Thu Nov 16 2006 Joerg Bruehe <joerg@stripped>
-
-- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB)
- replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading
- (bug#22081).
-
* Mon Nov 13 2006 Joerg Bruehe <joerg@stripped>
- Add "--with-partition" to all server builds.
--- 1.41/mysql-test/lib/mtr_report.pl 2006-11-29 19:32:44 +01:00
+++ 1.42/mysql-test/lib/mtr_report.pl 2006-11-29 19:32:44 +01:00
@@ -94,9 +94,13 @@
{
print "[ disabled ] $tinfo->{'comment'}\n";
}
- else
+ elsif ( $tinfo->{'comment'} )
{
print "[ skipped ] $tinfo->{'comment'}\n";
+ }
+ else
+ {
+ print "[ skipped ]\n";
}
}
--- 1.243/mysql-test/mysql-test-run.pl 2006-11-29 19:32:44 +01:00
+++ 1.244/mysql-test/mysql-test-run.pl 2006-11-29 19:32:44 +01:00
@@ -63,10 +63,8 @@
use Sys::Hostname;
use IO::Socket;
use IO::Socket::INET;
-use Data::Dumper;
use strict;
use warnings;
-use diagnostics;
select(STDOUT);
$| = 1; # Automatically flush STDOUT
@@ -88,6 +86,7 @@
require "lib/mtr_match.pl";
require "lib/mtr_misc.pl";
require "lib/mtr_stress.pl";
+require "lib/mtr_unique.pl";
$Devel::Trace::TRACE= 1;
@@ -445,7 +444,6 @@
mtr_exit(0);
}
-
##############################################################################
#
--- 1.33/sql-common/my_time.c 2006-11-29 19:32:44 +01:00
+++ 1.34/sql-common/my_time.c 2006-11-29 19:32:44 +01:00
@@ -411,7 +411,9 @@
if (number_of_fields < 3 ||
l_time->year > 9999 || l_time->month > 12 ||
l_time->day > 31 || l_time->hour > 23 ||
- l_time->minute > 59 || l_time->second > 59)
+ l_time->minute > 59 || l_time->second > 59 ||
+ (l_time->year == 0 && l_time->month == 0 && l_time->day == 0 &&
+ (l_time->hour != 0 || l_time->minute != 0 || l_time->second != 0)))
{
/* Only give warning for a zero date if there is some garbage after */
if (!not_zero_date) /* If zero date */
| Thread |
|---|
| • bk commit into 5.1 tree (msvensson:1.2392) | msvensson | 29 Nov |
