2801 Joerg Bruehe 2008-12-29 [merge]
Merge the bashism removal from 5.1 to 6.0-build
modified:
BUILD/compile-dist
2800 Joerg Bruehe 2008-12-29 [merge]
Merge main 6.0 into 6.0-build
modified:
.bzr-mysql/default.conf
configure.in
mysql-test/suite/funcs_1/t/disabled.def
mysql-test/suite/maria/t/maria-lock.test
sql/opt_range.cc
sql/protocol.cc
sql/sql_base.cc
sql/sql_select.cc
storage/falcon/TransformLib/StringTransform.cpp
2799 Kent Boortz 2008-12-28 [merge]
Merge
modified:
support-files/my-small.cnf.sh
support-files/mysql.spec.sh
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf 2008-12-17 18:40:14 +0000
+++ b/.bzr-mysql/default.conf 2008-12-29 11:56:47 +0000
@@ -1,4 +1,5 @@
[MYSQL]
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0
post_commit_to = "commits@stripped"
post_push_to = "commits@stripped"
tree_name = "mysql-6.0"
=== modified file 'BUILD/compile-dist'
--- a/BUILD/compile-dist 2008-11-22 15:24:06 +0000
+++ b/BUILD/compile-dist 2008-12-29 12:05:15 +0000
@@ -11,16 +11,33 @@ test -f Makefile && make maintainer-clea
path=`dirname $0`
. $path/autorun.sh
+gmake=
+for x in gmake gnumake make; do
+ if $x --version 2>/dev/null | grep GNU > /dev/null; then
+ gmake=$x
+ break;
+ fi
+done
+
+if [ -z "$gmake" ]; then
+ # Our build may not depend on GNU make, but I wouldn't count on it
+ echo "Please install GNU make, and ensure it is in your path as gnumake, gmake, or make" >&2
+ exit 2
+fi
+
# Default to gcc for CC and CXX
if test -z "$CXX" ; then
+ export CXX
CXX=gcc
# Set some required compile options
if test -z "$CXXFLAGS" ; then
+ export CXXFLAGS
CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"
fi
fi
if test -z "$CC" ; then
+ export CC
CC=gcc
fi
@@ -28,32 +45,18 @@ fi
# Use ccache, if available
if ccache -V > /dev/null 2>&1
then
- if echo "$CC" | grep "ccache" > /dev/null
+ if echo "$CC" | grep -v ccache > /dev/null
then
- :
- else
+ export CC
CC="ccache $CC"
fi
- if echo "$CXX" | grep "ccache" > /dev/null
+ if echo "$CXX" | grep -v ccache > /dev/null
then
- :
- else
+ export CXX
CXX="ccache $CXX"
fi
fi
-if test -z "$MAKE"
-then
- if gmake -v > /dev/null 2>&1
- then
- MAKE="gmake"
- else
- MAKE="make"
- fi
-fi
-
-export CC CXX MAKE
-
# Make sure to enable all features that affect "make dist"
# Remember that configure restricts the man pages to the configured features !
./configure \
@@ -61,5 +64,5 @@ export CC CXX MAKE
--with-embedded-server \
--with-falcon \
--with-ndbcluster
-$MAKE
+$gmake
=== modified file 'configure.in'
--- a/configure.in 2008-12-20 01:41:31 +0000
+++ b/configure.in 2008-12-29 12:05:15 +0000
@@ -11,7 +11,7 @@ AC_CANONICAL_SYSTEM
# When changing major version number please also check switch statement
# in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 6.0.9-alpha)
+AM_INIT_AUTOMAKE(mysql, 6.0.10-alpha)
AM_CONFIG_HEADER([include/config.h:config.h.in])
NDB_VERSION_MAJOR=6
=== modified file 'mysql-test/suite/funcs_1/t/disabled.def'
--- a/mysql-test/suite/funcs_1/t/disabled.def 2008-12-09 18:59:54 +0000
+++ b/mysql-test/suite/funcs_1/t/disabled.def 2008-12-15 08:35:48 +0000
@@ -10,5 +10,4 @@
#
##############################################################################
-ndb_storedproc: Something's not right in the test... also this test does not exist in 5.1
ndb_views: Bug #40860 funcs_1.ndb_views fail
=== modified file 'mysql-test/suite/maria/t/maria-lock.test'
--- a/mysql-test/suite/maria/t/maria-lock.test 2008-10-23 16:29:52 +0000
+++ b/mysql-test/suite/maria/t/maria-lock.test 2008-12-16 12:11:49 +0000
@@ -2,6 +2,7 @@
# Different cases involving locking that has failed with Maria
#
# Can't test with embedded server
+-- source include/have_maria.inc
-- source include/not_embedded.inc
--disable_warnings
=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc 2008-12-17 18:40:14 +0000
+++ b/sql/opt_range.cc 2008-12-29 11:56:47 +0000
@@ -4827,7 +4827,7 @@ static TRP_RANGE *get_key_scans_params(P
tree->n_ror_scans++;
tree->ror_scans_map.set_bit(idx);
}
- if (read_time > found_read_time && found_records != HA_POS_ERROR)
+ if (found_records != HA_POS_ERROR && read_time > found_read_time)
{
read_time= found_read_time;
best_records= found_records;
=== modified file 'sql/protocol.cc'
--- a/sql/protocol.cc 2008-12-10 14:30:52 +0000
+++ b/sql/protocol.cc 2008-12-16 11:29:22 +0000
@@ -930,7 +930,7 @@ bool Protocol_text::store(const char *fr
{
CHARSET_INFO *tocs= this->thd->variables.character_set_results;
#ifndef DBUG_OFF
- DBUG_PRINT("info", ("Protocol_text::store field %u (%u): %*s", field_pos,
+ DBUG_PRINT("info", ("Protocol_text::store field %u (%u): %.*s", field_pos,
field_count, (int) length, from));
DBUG_ASSERT(field_pos < field_count);
DBUG_ASSERT(field_types == 0 ||
=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc 2008-12-17 19:46:23 +0000
+++ b/sql/sql_base.cc 2008-12-29 11:56:47 +0000
@@ -6524,7 +6524,14 @@ int setup_wild(THD *thd, TABLE_LIST *tab
/* make * substituting permanent */
SELECT_LEX *select_lex= thd->lex->current_select;
select_lex->with_wild= 0;
- select_lex->item_list= fields;
+
+ /*
+ The assignment below is translated to memcpy() call (at least on some
+ platforms). memcpy() expects that source and destination areas do not
+ overlap. That problem was detected by valgrind.
+ */
+ if (&select_lex->item_list != &fields)
+ select_lex->item_list= fields;
thd->restore_active_arena(arena, &backup);
}
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc 2008-12-17 19:46:23 +0000
+++ b/sql/sql_select.cc 2008-12-29 11:56:47 +0000
@@ -4901,6 +4901,7 @@ add_key_part(DYNAMIC_ARRAY *keyuse_array
keyuse.null_rejecting= key_field->null_rejecting;
keyuse.cond_guard= key_field->cond_guard;
keyuse.sj_pred_no= key_field->sj_pred_no;
+ keyuse.ref_table_rows= 0;
(void) insert_dynamic(keyuse_array,(uchar*) &keyuse);
}
}
=== modified file 'storage/falcon/TransformLib/StringTransform.cpp'
--- a/storage/falcon/TransformLib/StringTransform.cpp 2007-09-20 15:44:25 +0000
+++ b/storage/falcon/TransformLib/StringTransform.cpp 2008-12-16 11:29:22 +0000
@@ -39,7 +39,7 @@ StringTransform::StringTransform()
StringTransform::~StringTransform()
{
- delete data;
+ delete [] data;
}
StringTransform::StringTransform(const char *string, bool copyFlag)
| Thread |
|---|
| • bzr push into mysql-6.0 branch (joerg:2799 to 2801) | Joerg Bruehe | 29 Dec |
