2757 Tomas Ulin 2008-11-26 [merge]
merge
modified:
Makefile.am
client/mysqlslap.c
mysql-test/r/partition.result
mysql-test/t/partition.test
sql/ha_partition.cc
storage/archive/archive_reader.c
storage/ndb/test/tools/connect.cpp
support-files/mysql.spec.sh
2756 Tomas Ulin 2008-11-24
post merge fixes: split test and do not run all in ndb
added:
mysql-test/extra/rpl_tests/rpl_row_basic_no_pk.test
modified:
mysql-test/extra/rpl_tests/rpl_row_basic.test
mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test
mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test
=== modified file 'Makefile.am'
--- a/Makefile.am 2008-11-21 16:13:14 +0000
+++ b/Makefile.am 2008-11-26 12:26:00 +0000
@@ -180,7 +180,7 @@ test-bt:
test-bt-fast:
-cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --comment=ps --force --timer \
- --skip-ndbcluster --ps-protocol
+ --skip-ndbcluster --ps-protocol --report-features
-if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
cd mysql-test ; \
MTR_BUILD_THREAD=auto \
=== modified file 'client/mysqlslap.c'
--- a/client/mysqlslap.c 2008-02-08 11:13:33 +0000
+++ b/client/mysqlslap.c 2008-11-25 02:04:58 +0000
@@ -688,9 +688,7 @@ static void usage(void)
{
print_version();
puts("Copyright (C) 2005 MySQL AB");
- puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\
- \nand you are welcome to modify and redistribute it under the GPL \
- license\n");
+ puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
puts("Run a query multiple times against the server\n");
printf("Usage: %s [OPTIONS]\n",my_progname);
print_defaults("my",load_default_groups);
=== modified file 'mysql-test/r/partition.result'
--- a/mysql-test/r/partition.result 2008-11-05 14:53:28 +0000
+++ b/mysql-test/r/partition.result 2008-11-25 02:04:58 +0000
@@ -1,4 +1,16 @@
drop table if exists t1, t2;
+CREATE TABLE t1 (
+pk INT NOT NULL AUTO_INCREMENT,
+PRIMARY KEY (pk)
+)
+/*!50100 PARTITION BY HASH (pk)
+PARTITIONS 2 */;
+INSERT INTO t1 VALUES (NULL);
+INSERT INTO t1 VALUES (NULL);
+INSERT INTO t1 VALUES (NULL);
+SELECT * FROM t1 WHERE pk < 0 ORDER BY pk;
+pk
+DROP TABLE t1;
CREATE TABLE t1 (a INT NOT NULL, KEY(a))
PARTITION BY RANGE(a)
(PARTITION p1 VALUES LESS THAN (200), PARTITION pmax VALUES LESS THAN MAXVALUE);
=== modified file 'mysql-test/t/partition.test'
--- a/mysql-test/t/partition.test 2008-11-05 14:53:28 +0000
+++ b/mysql-test/t/partition.test 2008-11-25 02:04:58 +0000
@@ -15,6 +15,21 @@ drop table if exists t1, t2;
--enable_warnings
#
+# Bug#40954: Crash if range search and order by.
+#
+CREATE TABLE t1 (
+ pk INT NOT NULL AUTO_INCREMENT,
+ PRIMARY KEY (pk)
+)
+/*!50100 PARTITION BY HASH (pk)
+PARTITIONS 2 */;
+INSERT INTO t1 VALUES (NULL);
+INSERT INTO t1 VALUES (NULL);
+INSERT INTO t1 VALUES (NULL);
+SELECT * FROM t1 WHERE pk < 0 ORDER BY pk;
+DROP TABLE t1;
+
+#
# Bug#40494: Crash MYSQL server crashes on range access with partitioning
# and order by
#
=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc 2008-11-21 16:13:14 +0000
+++ b/sql/ha_partition.cc 2008-11-26 12:26:00 +0000
@@ -4429,7 +4429,8 @@ int ha_partition::handle_ordered_index_s
This can only read record to table->record[0], as it was set when
the table was being opened. We have to memcpy data ourselves.
*/
- error= file->read_range_first(&m_start_key, end_range, eq_range, TRUE);
+ error= file->read_range_first(m_start_key.key? &m_start_key: NULL,
+ end_range, eq_range, TRUE);
memcpy(rec_buf_ptr, table->record[0], m_rec_length);
reverse_order= FALSE;
break;
=== modified file 'storage/archive/archive_reader.c'
--- a/storage/archive/archive_reader.c 2008-11-14 16:29:38 +0000
+++ b/storage/archive/archive_reader.c 2008-11-25 02:04:58 +0000
@@ -375,9 +375,7 @@ static void usage(void)
{
print_version();
puts("Copyright 2007-2008 MySQL AB, 2008 Sun Microsystems, Inc.");
- puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\
- \nand you are welcome to modify and redistribute it under the GPL \
- license\n");
+ puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
puts("Read and modify Archive files directly\n");
printf("Usage: %s [OPTIONS] file_to_be_looked_at [file_for_backup]\n", my_progname);
print_defaults("my", load_default_groups);
=== modified file 'storage/ndb/test/tools/connect.cpp'
--- a/storage/ndb/test/tools/connect.cpp 2008-02-20 09:04:29 +0000
+++ b/storage/ndb/test/tools/connect.cpp 2008-11-26 12:26:00 +0000
@@ -2,8 +2,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh 2008-11-14 16:29:38 +0000
+++ b/support-files/mysql.spec.sh 2008-11-25 02:04:58 +0000
@@ -41,6 +41,7 @@
%else
%define release 0.glibc23
%endif
+%define license GPL
%define mysqld_user mysql
%define mysqld_group mysql
%define server_suffix -standard
@@ -74,7 +75,7 @@ Summary: MySQL: a very fast and reliable
Group: Applications/Databases
Version: @MYSQL_NO_DASH_VERSION@
Release: %{release}
-License: Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. Under GPL license as shown in the Description field.
+License: Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. Under %{license} license as shown in the Description field.
Source: http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz
URL: http://www.mysql.com/
Packager: Sun Microsystems, Inc. Product Engineering Team <build@stripped>
@@ -361,7 +362,7 @@ CFLAGS="$CFLAGS" \
CXXFLAGS="$CXXFLAGS" \
BuildMySQL "\
--with-debug \
- --with-comment=\"MySQL Community Server - Debug (GPL)\"")
+ --with-comment=\"MySQL Community Server - Debug (%{license})\"")
# We might want to save the config log file
if test -n "$MYSQL_DEBUGCONFLOG_DEST"
@@ -382,7 +383,7 @@ CFLAGS="$CFLAGS" \
CXXFLAGS="$CXXFLAGS" \
BuildMySQL "\
--with-embedded-server \
- --with-comment=\"MySQL Community Server (GPL)\"")
+ --with-comment=\"MySQL Community Server (%{license})\"")
# We might want to save the config log file
if test -n "$MYSQL_CONFLOG_DEST"
then
| Thread |
|---|
| • bzr push into mysql-5.1 branch (tomas.ulin:2756 to 2757) | Tomas Ulin | 26 Nov |
