mirror of
https://github.com/MariaDB/server.git
synced 2025-05-04 06:05:05 +03:00
mysql-test/r/partition.result
mysql-test/t/partition.test sql/ha_partition.cc Bug#40954: Crash in MyISAM index code with concurrency test using partitioned tables Problem was usage of read_range_first with an empty key. Solution was to not to give a key if it was empty. (real author Mattias Jonsson) storage/archive/archive_reader.c client/mysqlslap.c Aligned the copyright texts output from "--version" of tools, to let internal tools be able to change them if needed. storage/ndb/test/tools/connect.cpp storage/ndb/test/run-test/atrt.hpp Corrected a few GPL headers not restricted to GPL version 2 Makefile.am Added missing --report-features to the 'test-bt-fast' target support-files/mysql.spec.sh Reversed the removal of the "%define license GPL" in as internal tools depended on it
This commit is contained in:
Build Team
parent
906e12124c
commit
d2c4816716
@ -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 \
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -14,6 +14,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
|
||||
|
||||
@ -4429,7 +4429,8 @@ int ha_partition::handle_ordered_index_scan(uchar *buf, bool reverse_order)
|
||||
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;
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 SQL database server
|
||||
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@mysql.com>
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user