Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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-06-04 11:24:49+02:00, joerg@trift2. +6 -0
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
MERGE: 1.2505.1.35
include/config-win.h@stripped, 2007-06-04 11:24:36+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.100.1.1
mysql-test/mysql-test-run.pl@stripped, 2007-06-04 11:24:36+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.303.1.5
mysql-test/t/disabled.def@stripped, 2007-06-04 11:24:36+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.253.2.2
mysql-test/t/mysqltest.test@stripped, 2007-06-04 11:24:36+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.73.1.2
mysql-test/t/ps.test@stripped, 2007-06-04 11:24:36+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.114.1.1
sql/sql_parse.cc@stripped, 2007-06-04 11:24:37+02:00, joerg@trift2. +0 -0
Auto merged
MERGE: 1.668.2.2
# 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: joerg
# Host: trift2.
# Root: /MySQL/M51/push-5.1/RESYNC
--- 1.101/include/config-win.h 2007-06-01 09:43:50 +02:00
+++ 1.102/include/config-win.h 2007-06-04 11:24:36 +02:00
@@ -250,8 +250,6 @@
#endif
-#define STACK_DIRECTION -1
-
/* Optimized store functions for Intel x86 */
#ifndef _WIN64
--- 1.675/sql/sql_parse.cc 2007-06-01 09:43:54 +02:00
+++ 1.676/sql/sql_parse.cc 2007-06-04 11:24:37 +02:00
@@ -5022,17 +5022,14 @@
Check stack size; Send error if there isn't enough stack to continue
****************************************************************************/
-#if STACK_DIRECTION < 0
-#define used_stack(A,B) (long) (A - B)
-#else
-#define used_stack(A,B) (long) (B - A)
-#endif
+#ifndef EMBEDDED_LIBRARY
+
+#define used_stack(A,B) (long)(A > B ? A - B : B - A)
#ifndef DBUG_OFF
long max_stack_used;
#endif
-#ifndef EMBEDDED_LIBRARY
/*
Note: The 'buf' parameter is necessary, even if it is unused here.
- fix_fields functions has a "dummy" buffer large enough for the
--- 1.306/mysql-test/mysql-test-run.pl 2007-05-30 17:27:49 +02:00
+++ 1.307/mysql-test/mysql-test-run.pl 2007-06-04 11:24:36 +02:00
@@ -1804,6 +1804,18 @@
$ENV{'CHARSETSDIR'}= $path_charsetsdir;
$ENV{'UMASK'}= "0660"; # The octal *string*
$ENV{'UMASK_DIR'}= "0770"; # The octal *string*
+
+ #
+ # MySQL tests can produce output in various character sets
+ # (especially, ctype_xxx.test). To avoid confusing Perl
+ # with output which is incompatible with the current locale
+ # settings, we reset the current values of LC_ALL and LC_CTYPE to "C".
+ # For details, please see
+ # Bug#27636 tests fails if LC_* variables set to *_*.UTF-8
+ #
+ $ENV{'LC_ALL'}= "C";
+ $ENV{'LC_CTYPE'}= "C";
+
$ENV{'LC_COLLATE'}= "C";
$ENV{'USE_RUNNING_SERVER'}= $opt_extern;
$ENV{'MYSQL_TEST_DIR'}= $glob_mysql_test_dir;
@@ -3850,13 +3862,15 @@
}
else
{
- mtr_add_arg($args, "%s--master-user=root", $prefix);
- mtr_add_arg($args, "%s--master-connect-retry=1", $prefix);
- mtr_add_arg($args, "%s--master-host=127.0.0.1", $prefix);
- mtr_add_arg($args, "%s--master-password=", $prefix);
- mtr_add_arg($args, "%s--master-port=%d", $prefix,
- $master->[0]->{'port'}); # First master
-
+ if ($mysql_version_id < 50200)
+ {
+ mtr_add_arg($args, "%s--master-user=root", $prefix);
+ mtr_add_arg($args, "%s--master-connect-retry=1", $prefix);
+ mtr_add_arg($args, "%s--master-host=127.0.0.1", $prefix);
+ mtr_add_arg($args, "%s--master-password=", $prefix);
+ mtr_add_arg($args, "%s--master-port=%d", $prefix,
+ $master->[0]->{'port'}); # First master
+ }
my $slave_server_id= 2 + $idx;
my $slave_rpl_rank= $slave_server_id;
mtr_add_arg($args, "%s--server-id=%d", $prefix, $slave_server_id);
--- 1.261/mysql-test/t/disabled.def 2007-06-01 09:43:50 +02:00
+++ 1.262/mysql-test/t/disabled.def 2007-06-04 11:24:36 +02:00
@@ -43,7 +43,6 @@
#rpl_ndb_dd_advance : Bug#25913 rpl_ndb_dd_advance fails randomly
-rpl_ndb_stm_innodb : Bug#26783
ndb_partition_error2 : HF is not sure if the test can work as internded on all the platforms
im_options_set : Bug#20294: Instance manager tests fail randomly
--- 1.76/mysql-test/t/mysqltest.test 2007-05-31 12:29:02 +02:00
+++ 1.77/mysql-test/t/mysqltest.test 2007-06-04 11:24:36 +02:00
@@ -48,11 +48,6 @@
--error 0
select otto from (select 1 as otto) as t1;
-# expectation <> response
--- // --error 1054
--- // select otto from (select 1 as otto) as t1;
-
-
# ----------------------------------------------------------------------------
# Negative case(statement):
# The derived table t1 does not contain a column named 'friedrich' .
@@ -333,9 +328,9 @@
# This is a comment
# This is a ; comment
# This is a -- comment
--- This is also a comment
--- # This is also a comment
--- This is also a ; comment
+# -- This is also a comment
+# -- # This is also a comment
+# -- This is also a ; comment
# ----------------------------------------------------------------------------
# Test comments with embedded command
@@ -1873,7 +1868,7 @@
--disable_query_log
--exec $MYSQL_TEST --help 2>&1 > /dev/null
--exec $MYSQL_TEST --version 2>&1 > /dev/null
---enable_quary_log
+--enable_query_log
--disable_abort_on_error
--error 1
--exec $MYSQL_TEST a b c 2>&1 > /dev/null
--- 1.115/mysql-test/t/ps.test 2007-05-28 13:29:55 +02:00
+++ 1.116/mysql-test/t/ps.test 2007-06-04 11:24:36 +02:00
@@ -1,4 +1,5 @@
-- source include/not_embedded.inc
+-- source include/have_log_bin.inc
#
# SQL Syntax for Prepared Statements test
#
| Thread |
|---|
| • bk commit into 5.1 tree (joerg:1.2526) | Joerg Bruehe | 4 Jun |
