Skip to content

M
MariaDB
Commit cb147b39 authored by Sergey Petrunya's avatar Sergey Petrunya
Browse files
Options

Merge 5.3 -> 5.3-subqueries-mwl90

parents b8f00542 c6ba9598
Expand all Show whitespace changes
Inline Side-by-side
Showing with 27404 additions and 2204 deletions
.bzrignore
View file @ cb147b39
......@@ -1943,3 +1943,4 @@ storage/pbxt/bin/xtstat
libmysqld/sql_expression_cache.cc
mysql-test/mtr_command
scripts/convert-debug-for-diff
plugin/handler_socket/client/hsclient
BUILD/compile-dist
View file @ cb147b39
......@@ -28,7 +28,7 @@ fi
# Default to gcc for CC and CXX
if test -z "$CXX" ; then
export CXX
CXX=gcc
CXX=g++
# Set some required compile options
if test -z "$CXXFLAGS" ; then
export CXXFLAGS
......
BUILD/compile-pentium64
View file @ cb147b39
......@@ -4,7 +4,10 @@ path=`dirname $0`
. "$path/SETUP.sh"
extra_flags="$pentium64_cflags $fast_cflags"
extra_configs="$pentium_configs $static_link"
# On CentOS/Fedora Core 10 amd64, there is system libz.so but not
# libz.a, so need to use bundled zlib when building static
# binary. Hence we use --with-zlib-dir=bundled
extra_configs="$pentium_configs $static_link --with-zlib-dir=bundled"
CC="$CC --pipe"
strip=yes
......
README
View file @ cb147b39
......@@ -1291,3 +1291,34 @@ Use of any of this software is governed by the terms of the license below:
*/
***************************************************************************
%%The following software may be included in this product:
HandlerSocket plugin for MySQL
Copyright (c) 2010 DeNA Co.,Ltd.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of DeNA Co.,Ltd. nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY DeNA Co.,Ltd. "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
EVENT SHALL DeNA Co.,Ltd. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
***************************************************************************
client/readline.cc
View file @ cb147b39
......@@ -47,6 +47,7 @@ char *batch_readline(LINE_BUFFER *line_buff, bool *truncated)
char *pos;
ulong out_length;
DBUG_ASSERT(truncated != NULL);
LINT_INIT(out_length);
if (!(pos=intern_read_line(line_buff,&out_length, truncated)))
return 0;
......
cmd-line-utils/libedit/vi.c
View file @ cb147b39
......@@ -1012,8 +1012,13 @@ vi_histedit(EditLine *el, int c __attribute__((__unused__)))
if (fd < 0)
return CC_ERROR;
cp = el->el_line.buffer;
write(fd, cp, el->el_line.lastchar - cp +0u);
write(fd, "\n", 1);
if (write(fd, cp, el->el_line.lastchar - cp +0u) == -1 ||
write(fd, "\n", 1) == -1)
{
close(fd);
unlink(tempfile);
return CC_ERROR;
}
pid = fork();
switch (pid) {
case -1:
......
dbug/dbug.c
View file @ cb147b39
......@@ -1481,7 +1481,7 @@ static struct link *ListAddDel(struct link *head, const char *ctlp,
subdir=0;
while (ctlp < end && *ctlp != ',')
ctlp++;
len=ctlp-start;
len= (int) (ctlp-start);
if (start[len-1] == '/')
{
len--;
......@@ -1544,7 +1544,7 @@ static struct link *ListCopy(struct link *orig)
{
struct link *new_malloc;
struct link *head;
int len;
size_t len;
head= NULL;
while (orig != NULL)
......@@ -1999,7 +1999,7 @@ static void DBUGOpenFile(CODE_STATE *cs,
{
if (end)
{
int len=end-name;
int len= (int) (end-name);
memcpy(cs->stack->name, name, len);
cs->stack->name[len]=0;
}
......
include/heap.h
View file @ cb147b39
......@@ -136,6 +136,8 @@ typedef struct st_heap_share
ulong min_records,max_records; /* Params to open */
ulonglong data_length,index_length,max_table_size;
uint key_stat_version; /* version to indicate insert/delete */
uint key_version; /* Updated on key change */
uint file_version; /* Update on clear */
uint records; /* records */
uint blength; /* records rounded up to 2^n */
uint deleted; /* Deleted records in database */
......@@ -173,6 +175,8 @@ typedef struct st_heap_info
enum ha_rkey_function last_find_flag;
TREE_ELEMENT *parents[MAX_TREE_HEIGHT+1];
TREE_ELEMENT **last_pos;
uint key_version; /* Version at last read */
uint file_version; /* Version at scan */
uint lastkey_len;
my_bool implicit_emptied;
#ifdef THREAD
......
include/my_base.h
View file @ cb147b39
......@@ -445,7 +445,8 @@ enum ha_base_keytype {
#define HA_ERR_WRONG_CRC 176 /* Wrong CRC on page */
#define HA_ERR_ROW_NOT_VISIBLE 177
#define HA_ERR_TOO_MANY_CONCURRENT_TRXS 178 /*Too many active concurrent transactions */
#define HA_ERR_LAST 178 /* Copy of last error nr */
#define HA_ERR_ABORTED_BY_USER 179
#define HA_ERR_LAST 179 /* Copy of last error nr */
/* Number of different errors */
#define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1)
......
include/my_handler.h
View file @ cb147b39
......@@ -135,6 +135,9 @@ extern void my_handler_error_unregister(void);
if we're scanning "t.key BETWEEN 10 AND 20" and got a
"t.key=21" tuple (the engine should stop scanning and return
HA_ERR_END_OF_FILE right away).
-1= ICP_ERROR - Reserved for internal errors in engines. Should not be
returned by index_cond_func_xxx
*/
typedef enum icp_result {
......
include/thr_alarm.h
View file @ cb147b39
......@@ -88,6 +88,7 @@ typedef struct st_alarm {
extern uint thr_client_alarm;
extern pthread_t alarm_thread;
extern my_bool my_disable_thr_alarm;
#define thr_alarm_init(A) (*(A))=0
#define thr_alarm_in_use(A) (*(A)!= 0)
......
include/thr_lock.h
View file @ cb147b39
......@@ -123,8 +123,10 @@ typedef struct st_thr_lock_data {
struct st_thr_lock *lock;
pthread_cond_t *cond;
void *status_param; /* Param to status functions */
void *debug_print_param;
enum thr_lock_type type;
enum thr_lock_type org_type; /* Cache for MariaDB */
void *debug_print_param; /* For error messages */
uint priority;
} THR_LOCK_DATA;
......
mysql-test/Makefile.am
View file @ cb147b39
......@@ -109,6 +109,7 @@ TEST_DIRS = t r include std_data std_data/parts collections \
suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include \
suite/innodb_plugin suite/innodb_plugin/t suite/innodb_plugin/r \
suite/innodb_plugin/include \
suite/handler \
suite/engines suite/engines/funcs suite/engines/iuds suite/engines/rr_trx \
suite/engines/funcs/r suite/engines/funcs/t suite/engines/iuds/r \
suite/engines/iuds/t suite/engines/rr_trx/include suite/engines/rr_trx/r \
......
mysql-test/README
View file @ cb147b39
......@@ -4,13 +4,14 @@ this directory. It will fire up the newly built mysqld and test it.
Note that you do not have to have to do "make install", and you could
actually have a co-existing MySQL installation. The tests will not
conflict with it.
conflict with it. To run the test suite in a source directory, you
must do make first.
All tests must pass. If one or more of them fail on your system, please
read the following manual section for instructions on how to report the
problem:
http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html
http://kb.askmonty.org/v/reporting-bugs
If you want to use an already running MySQL server for specific tests,
use the --extern option to mysql-test-run. Please note that in this mode,
......@@ -27,7 +28,6 @@ With no test cases named on the command line, mysql-test-run falls back
to the normal "non-extern" behavior. The reason for this is that some
tests cannot run with an external server.
You can create your own test cases. To create a test case, create a new
file in the t subdirectory using a text editor. The file should have a .test
extension. For example:
......@@ -67,7 +67,12 @@ extension. For example:
edit the test result to the correct results so that we can verify
that the bug is corrected in future releases.
To submit your test case, put your .test file and .result file(s) into
a tar.gz archive, add a README that explains the problem, ftp the
archive to ftp://support.mysql.com/pub/mysql/secret/ and send a mail
to bugs@lists.mysql.com
If you want to submit your test case you can send it
to maria-developers@lists.launchpad.com or attach it to a bug report on
https://bugs.launchpad.net/maria/.
If the test case is really big or if it contains 'not public' data,
then put your .test file and .result file(s) into a tar.gz archive,
add a README that explains the problem, ftp the archive to
ftp://ftp.askmonty.org/private and send a mail to
https://bugs.launchpad.net/maria/ about it.
mysql-test/extra/rpl_tests/rpl_stop_slave.test
View file @ cb147b39
......@@ -42,6 +42,7 @@ send STOP SLAVE SQL_THREAD;
connection slave1;
--echo # To resume slave SQL thread
SET DEBUG_SYNC= 'now SIGNAL signal.continue';
SET DEBUG_SYNC= 'now WAIT_FOR signal.continued';
SET DEBUG_SYNC= 'RESET';
--echo
......
mysql-test/include/check_no_concurrent_insert.inc
View file @ cb147b39
......@@ -43,7 +43,7 @@ connection default;
# of our statement.
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Locked" and info = "insert into $table (i) values (0)";
where state = "Table lock" and info = "insert into $table (i) values (0)";
--source include/wait_condition.inc
--disable_result_log
......
mysql-test/include/have_example_plugin.inc
View file @ cb147b39
......@@ -3,7 +3,7 @@
# i.e it will support dlopen
#
--source include/have_dynamic_loading.inc
--source include/not_windows_embedded.inc
#
# Check if the variable HA_EXAMPLE_SO is set
#
......
mysql-test/include/have_xtradb.inc
View file @ cb147b39
disable_query_log;
--require r/true.require
SELECT (plugin_description LIKE '%xtradb%') AS `TRUE` FROM information_schema.plugins WHERE LOWER(plugin_name) = 'innodb' AND LOWER(plugin_status) = 'active';
enable_query_log;
if (!`SELECT count(*) FROM information_schema.plugins WHERE
plugin_name = 'innodb' AND plugin_status = 'active' AND
plugin_description LIKE '%xtradb%'`){
skip Need XtraDB engine;
}
mysql-test/include/have_xtradb.opt 0 → 100644
View file @ cb147b39
--loose-innodb
--plugin-load=$HA_XTRADB_SO
mysql-test/include/long_test.inc 0 → 100644
View file @ cb147b39
# We use this --source include to mark a test as taking long to run.
# We can use this to schedule such test early (to not be left with
# only one or two long tests running, and rests of works idle), or to
# run a quick test skipping long-running test cases.
mysql-test/lib/mtr_cases.pm
View file @ cb147b39
......@@ -89,6 +89,20 @@ sub init_pattern {
}
sub testcase_sort_order {
my ($a, $b, $sort_criteria)= @_;
my $a_sort_criteria= $sort_criteria->{$a->fullname()};
my $b_sort_criteria= $sort_criteria->{$b->fullname()};
my $res= $a_sort_criteria cmp $b_sort_criteria;
return $res if $res;
# Run slow tests first, trying to avoid getting stuck at the end
# with a slow test in one worker and the other workers idle.
return -1 if $a->{'long_test'} && !$b->{'long_test'};
return 1 if !$a->{'long_test'} && $b->{'long_test'};
return $a->fullname() cmp $b->fullname();
}
##############################################################################
#
# Collect information about test cases to be run
......@@ -177,9 +191,7 @@ sub collect_test_cases ($$$) {
$sort_criteria{$tinfo->fullname()} = join(" ", @criteria);
}
@$cases = sort {
$sort_criteria{$a->fullname()} . $a->fullname() cmp
$sort_criteria{$b->fullname()} . $b->fullname() } @$cases;
@$cases = sort { testcase_sort_order($a, $b, \%sort_criteria) } @$cases;
# For debugging the sort-order
# foreach my $tinfo (@$cases)
......@@ -1065,6 +1077,7 @@ my @tags=
["include/have_example_plugin.inc", "example_plugin_test", 1],
["include/have_oqgraph_engine.inc", "oqgraph_test", 1],
["include/have_ssl.inc", "need_ssl", 1],
["include/long_test.inc", "long_test", 1],
);
......
mysql-test/mysql-test-run.pl
View file @ cb147b39
......@@ -142,7 +142,7 @@ my $path_config_file; # The generated config file, var/my.cnf
# executables will be used by the test suite.
our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
my $DEFAULT_SUITES="main,binlog,federated,rpl,maria,parts,innodb," .
my $DEFAULT_SUITES="main,binlog,federated,rpl,maria,handler,parts,innodb," .
"innodb_plugin,percona,ndb,vcol,oqgraph,sphinx," .
"optimizer_unfixed_bugs";
my $opt_suites;
......@@ -320,6 +320,7 @@ sub main {
gcov_prepare($basedir . "/" . $opt_gcov_src_dir);
}
if (!$opt_suites) {
$opt_suites= $DEFAULT_SUITES;
......@@ -731,9 +732,11 @@ sub run_test_server ($$$) {
last;
}
# Second best choice is the first that does not fulfill
# any of the above conditions
if (!defined $second_best){
# From secondary choices, we prefer to pick a 'long-running' test if
# possible; this helps avoid getting stuck with a few of those at the
# end of high --parallel runs, with most workers being idle.
if (!defined $second_best ||
($t->{'long_test'} && !($tests->[$second_best]{'long_test'}))){
#mtr_report("Setting second_best to $i");
$second_best= $i;
}
......@@ -2376,7 +2379,7 @@ sub setup_vardir() {
$plugindir="$opt_vardir/plugins";
unshift (@opt_extra_mysqld_opt, "--plugin-dir=$plugindir");
mkpath($plugindir);
if (IS_WINDOWS)
if (IS_WINDOWS && !$opt_embedded_server)
{
for (<../storage/*$opt_vs_config/*.dll>,
<../plugin/*$opt_vs_config/*.dll>,
......
mysql-test/r/index_intersect.result
View file @ cb147b39
......@@ -64,22 +64,22 @@ EXPLAIN
SELECT * FROM City WHERE
Name LIKE 'C%' AND Population > 1000000;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City index_merge Population,Name Name,Population 35,4 NULL 9 Using sort_intersect(Name,Population); Using where
1 SIMPLE City index_merge Population,Name Name,Population 35,4 NULL # Using sort_intersect(Name,Population); Using where
EXPLAIN
SELECT * FROM City WHERE
Name LIKE 'M%' AND Population > 1500000;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City index_merge Population,Name Population,Name 4,35 NULL 5 Using sort_intersect(Population,Name); Using where
1 SIMPLE City index_merge Population,Name Population,Name 4,35 NULL # Using sort_intersect(Population,Name); Using where
EXPLAIN
SELECT * FROM City
WHERE Name LIKE 'M%' AND Population > 300000;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City range Population,Name Name 35 NULL 164 Using index condition; Using where; Using MRR
1 SIMPLE City range Population,Name Name 35 NULL # Using index condition; Using where; Using MRR
EXPLAIN
SELECT * FROM City
WHERE Name LIKE 'M%' AND Population > 7000000;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City range Population,Name Population 4 NULL 15 Using index condition; Using where; Using MRR
1 SIMPLE City range Population,Name Population 4 NULL # Using index condition; Using where; Using MRR
SELECT * FROM City USE INDEX ()
WHERE Name LIKE 'C%' AND Population > 1000000;
ID Name Country Population
......@@ -361,17 +361,17 @@ EXPLAIN
SELECT * FROM City
WHERE Name BETWEEN 'M' AND 'N' AND Population > 1000000 AND Country LIKE 'C%';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City index_merge Population,Country,Name Name,Population 35,4 NULL 9 Using sort_intersect(Name,Population); Using where
1 SIMPLE City index_merge Population,Country,Name Name,Population 35,4 NULL # Using sort_intersect(Name,Population); Using where
EXPLAIN
SELECT * FROM City
WHERE Name BETWEEN 'G' AND 'J' AND Population > 1000000 AND Country LIKE 'B%';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City index_merge Population,Country,Name Population,Country 4,3 NULL 19 Using sort_intersect(Population,Country); Using where
1 SIMPLE City index_merge Population,Country,Name Population,Country 4,3 NULL # Using sort_intersect(Population,Country); Using where
EXPLAIN
SELECT * FROM City
WHERE Name BETWEEN 'G' AND 'K' AND Population > 500000 AND Country LIKE 'C%';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City range Population,Country,Name Name 35 NULL 283 Using index condition; Using where; Using MRR
1 SIMPLE City range Population,Country,Name Name 35 NULL # Using index condition; Using where; Using MRR
SELECT * FROM City USE INDEX ()
WHERE Name BETWEEN 'M' AND 'N' AND Population > 1000000 AND Country LIKE 'C%';
ID Name Country Population
......@@ -462,29 +462,29 @@ EXPLAIN
SELECT * FROM City
WHERE ID BETWEEN 501 AND 1000 AND Population > 700000 AND Country LIKE 'C%';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City range PRIMARY,Population,Country Population 4 NULL 359 Using index condition; Using where; Using MRR
1 SIMPLE City range PRIMARY,Population,Country Population 4 NULL # Using index condition; Using where; Using MRR
EXPLAIN
SELECT * FROM City
WHERE ID BETWEEN 1 AND 500 AND Population > 1000000 AND Country LIKE 'A%';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City index_merge PRIMARY,Population,Country Country,Population 3,4 NULL 6 Using sort_intersect(Country,Population); Using where
1 SIMPLE City index_merge PRIMARY,Population,Country Country,Population 3,4 NULL # Using sort_intersect(Country,Population); Using where
EXPLAIN
SELECT * FROM City
WHERE ID BETWEEN 2001 AND 2500 AND Population > 300000 AND Country LIKE 'H%';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City range PRIMARY,Population,Country Country 3 NULL 21 Using index condition; Using where; Using MRR
1 SIMPLE City range PRIMARY,Population,Country Country 3 NULL # Using index condition; Using where; Using MRR
EXPLAIN
SELECT * FROM City
WHERE ID BETWEEN 3701 AND 4000 AND Population > 1000000
AND Country BETWEEN 'S' AND 'Z';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City index_merge PRIMARY,Population,Country Population,PRIMARY 4,4 NULL 17 Using sort_intersect(Population,PRIMARY); Using where
1 SIMPLE City index_merge PRIMARY,Population,Country Population,PRIMARY 4,4 NULL # Using sort_intersect(Population,PRIMARY); Using where
EXPLAIN
SELECT * FROM City
WHERE ID BETWEEN 3001 AND 4000 AND Population > 600000
AND Country BETWEEN 'S' AND 'Z' ;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City range PRIMARY,Population,Country Population 4 NULL 429 Using index condition; Using where; Using MRR
1 SIMPLE City range PRIMARY,Population,Country Population 4 NULL # Using index condition; Using where; Using MRR
SELECT * FROM City USE INDEX ()
WHERE ID BETWEEN 501 AND 1000 AND Population > 700000 AND Country LIKE 'C%';
ID Name Country Population
......@@ -718,33 +718,33 @@ EXPLAIN
SELECT * FROM City WHERE
Name LIKE 'C%' AND Population > 1000000;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City index_merge Population,Name Name,Population 35,4 NULL 9 Using sort_intersect(Name,Population); Using where
1 SIMPLE City index_merge Population,Name Name,Population 35,4 NULL # Using sort_intersect(Name,Population); Using where
EXPLAIN
SELECT * FROM City WHERE
Name LIKE 'M%' AND Population > 1500000;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City index_merge Population,Name Population,Name 4,35 NULL 5 Using sort_intersect(Population,Name); Using where
1 SIMPLE City index_merge Population,Name Population,Name 4,35 NULL # Using sort_intersect(Population,Name); Using where
EXPLAIN
SELECT * FROM City
WHERE Name BETWEEN 'G' AND 'J' AND Population > 1000000 AND Country LIKE 'B%';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City index_merge Population,Country,Name Population,Country 4,3 NULL 19 Using sort_intersect(Population,Country); Using where
1 SIMPLE City index_merge Population,Country,Name Population,Country 4,3 NULL # Using sort_intersect(Population,Country); Using where
EXPLAIN
SELECT * FROM City
WHERE Name BETWEEN 'G' AND 'J' AND Population > 500000 AND Country LIKE 'C%';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City range Population,Country,Name Name 35 NULL 225 Using index condition; Using where; Using MRR
1 SIMPLE City range Population,Country,Name Name 35 NULL # Using index condition; Using where; Using MRR
EXPLAIN
SELECT * FROM City
WHERE ID BETWEEN 1 AND 500 AND Population > 1000000 AND Country LIKE 'A%';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City index_merge PRIMARY,Population,Country Country,Population 3,4 NULL 6 Using sort_intersect(Country,Population); Using where
1 SIMPLE City index_merge PRIMARY,Population,Country Country,Population 3,4 NULL # Using sort_intersect(Country,Population); Using where
EXPLAIN
SELECT * FROM City
WHERE ID BETWEEN 3001 AND 4000 AND Population > 600000
AND Country BETWEEN 'S' AND 'Z';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City range PRIMARY,Population,Country Population 4 NULL 429 Using index condition; Using where; Using MRR
1 SIMPLE City range PRIMARY,Population,Country Population 4 NULL # Using index condition; Using where; Using MRR
SELECT * FROM City WHERE
Name LIKE 'C%' AND Population > 1000000;
ID Name Country Population
......@@ -885,17 +885,17 @@ EXPLAIN
SELECT * FROM City
WHERE Country LIKE 'M%' AND Population > 1000000;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City index_merge Population,CountryID,CountryName Population,CountryID 4,3 NULL 15 Using sort_intersect(Population,CountryID); Using where
1 SIMPLE City index_merge Population,CountryID,CountryName Population,CountryID 4,3 NULL # Using sort_intersect(Population,CountryID); Using where
EXPLAIN
SELECT * FROM City
WHERE Country='CHN' AND Population > 1500000;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City index_merge Population,CountryID,CountryName Population,CountryID 4,3 NULL 11 Using sort_intersect(Population,CountryID); Using where
1 SIMPLE City index_merge Population,CountryID,CountryName Population,CountryID 4,3 NULL # Using sort_intersect(Population,CountryID); Using where
EXPLAIN
SELECT * FROM City
WHERE Country='CHN' AND Population > 1500000 AND Name LIKE 'C%';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE City index_merge Population,Name,CountryID,CountryName CountryName,Population 38,4 NULL 1 Using sort_intersect(CountryName,Population); Using where
1 SIMPLE City index_merge Population,Name,CountryID,CountryName CountryName,Population 38,4 NULL # Using sort_intersect(CountryName,Population); Using where
SELECT * FROM City USE INDEX ()
WHERE Country LIKE 'M%' AND Population > 1000000;
ID Name Country Population
......@@ -1028,7 +1028,7 @@ EXPLAIN
SELECT * FROM t1
WHERE (f1 < 535 OR f1 > 985) AND ( f4='r' OR f4 LIKE 'a%' ) ;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 range PRIMARY,f4 f4 35 NULL 5 Using index condition; Using where; Using MRR
1 SIMPLE t1 range PRIMARY,f4 f4 35 NULL # Using index condition; Using where; Using MRR
SELECT * FROM t1
WHERE (f1 < 535 OR f1 > 985) AND ( f4='r' OR f4 LIKE 'a%' ) ;
f1 f4 f5
......
mysql-test/r/index_intersect_innodb.result
View file @ cb147b39
This diff is collapsed.
mysql-test/r/join.result
View file @ cb147b39
......@@ -1251,3 +1251,37 @@ Handler_read_rnd 0
Handler_read_rnd_next 1
DROP TABLE t1, t2;
End of 5.1 tests
#
# BUG#724275: Crash in JOIN::optimize in maria-5.3
#
create table t1 (a int);
insert into t1 values (1),(2);
insert into t1 select * from t1;
create table t2 (a int, b int, key(a,b));
insert into t2 values (1,1),(1,2),(1,3),(1,4),(2,5),(2,6),(2,7),(2,8),(2,9);
insert into t2 select * from t2;
insert into t2 select * from t2;
insert into t2 select * from t2;
create table t3 (a int, b int, key(a));
insert into t3 values (1,1),(2,2);
select * from
t3 straight_join t1 straight_join t2 force index(a)
where t2.a=1 and t2.b=t1.a and t1.a=t3.b and t3.a=1;
a b a a b
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
1 1 1 1 1
drop table t1,t2,t3;
mysql-test/r/join_cache.result
View file @ cb147b39
This diff is collapsed.
mysql-test/r/join_nested_jcl6.result
View file @ cb147b39
This diff is collapsed.
mysql-test/r/join_outer_jcl6.result
View file @ cb147b39
......@@ -319,11 +319,11 @@ Lilliana Angelovska NULL NULL
explain select t1.name, t2.name, t2.id from t1 left join t2 on (t1.id = t2.owner) where t2.id is null;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 3
1 SIMPLE t2 hash NULL hj_key 2 test.t1.id 3 Using where; Not exists; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 2 test.t1.id 3 Using where; Not exists; Using join buffer (flat, BNLH join)
explain select t1.name, t2.name, t2.id from t1 left join t2 on (t1.id = t2.owner) where t2.name is null;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 3
1 SIMPLE t2 hash NULL hj_key 2 test.t1.id 3 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 2 test.t1.id 3 Using where; Using join buffer (flat, BNLH join)
select count(*) from t1 left join t2 on (t1.id = t2.owner);
count(*)
4
......@@ -339,11 +339,11 @@ Lilliana Angelovska NULL NULL
explain select t1.name, t2.name, t2.id from t2 right join t1 on (t1.id = t2.owner) where t2.id is null;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 3
1 SIMPLE t2 hash NULL hj_key 2 test.t1.id 3 Using where; Not exists; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 2 test.t1.id 3 Using where; Not exists; Using join buffer (flat, BNLH join)
explain select t1.name, t2.name, t2.id from t2 right join t1 on (t1.id = t2.owner) where t2.name is null;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 3
1 SIMPLE t2 hash NULL hj_key 2 test.t1.id 3 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 2 test.t1.id 3 Using where; Using join buffer (flat, BNLH join)
select count(*) from t2 right join t1 on (t1.id = t2.owner);
count(*)
4
......@@ -695,8 +695,8 @@ a1 a2 b1 b2 c1 c2
explain select * from t1 left join t2 on b1 = a1 left join t3 on c1 = a1 and b1 is null;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 3
1 SIMPLE t2 hash NULL hj_key 4 test.t1.a1 2 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t3 hash NULL hj_key 5 test.t1.a1 2 Using where; Using join buffer (incremental, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 4 test.t1.a1 2 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t3 hash_ALL NULL #hash#$hj 5 test.t1.a1 2 Using where; Using join buffer (incremental, BNLH join)
drop table t1, t2, t3;
create table t1 (
a int(11),
......
mysql-test/r/lock_multi.result
View file @ cb147b39
......@@ -162,13 +162,6 @@ ERROR 70100: Query execution was interrupted
unlock tables;
drop table t1;
drop table if exists t1;
create table t1 (a int) ENGINE=MEMORY;
--> client 2
handler t1 open;
ERROR HY000: Table storage engine for 't1' doesn't have this option
--> client 1
drop table t1;
drop table if exists t1;
create table t1 (i int);
connection: default
lock tables t1 write;
......
mysql-test/r/log_tables.result
View file @ cb147b39
......@@ -248,13 +248,13 @@ set global slow_query_log='OFF';
set @save_storage_engine= @@session.storage_engine;
set storage_engine= MEMORY;
alter table mysql.slow_log engine=ndb;
ERROR HY000: This storage engine cannot be used for log tables"
ERROR HY000: This storage engine cannot be used for log tables
alter table mysql.slow_log engine=innodb;
ERROR HY000: This storage engine cannot be used for log tables"
ERROR HY000: This storage engine cannot be used for log tables
alter table mysql.slow_log engine=archive;
ERROR HY000: This storage engine cannot be used for log tables"
ERROR HY000: This storage engine cannot be used for log tables
alter table mysql.slow_log engine=blackhole;
ERROR HY000: This storage engine cannot be used for log tables"
ERROR HY000: This storage engine cannot be used for log tables
set storage_engine= @save_storage_engine;
drop table mysql.slow_log;
drop table mysql.general_log;
......
mysql-test/r/myisam_icp.result
View file @ cb147b39
......@@ -198,3 +198,4 @@ COUNT(*)
12
DROP PROCEDURE insert_data;
DROP TABLE t1, t2, t3;
drop table if exists t0, t1, t1i, t1m;
mysql-test/r/plugin.result
View file @ cb147b39
......@@ -75,9 +75,9 @@ SET SQL_MODE='IGNORE_BAD_TABLE_OPTIONS';
#illegal value fixed
CREATE TABLE t1 (a int) ENGINE=example ULL=10000000000000000000 one_or_two='ttt' YESNO=SSS;
Warnings:
Warning 1652 Incorrect value '10000000000000000000' for option 'ULL'
Warning 1652 Incorrect value 'ttt' for option 'one_or_two'
Warning 1652 Incorrect value 'SSS' for option 'YESNO'
Warning 1653 Incorrect value '10000000000000000000' for option 'ULL'
Warning 1653 Incorrect value 'ttt' for option 'one_or_two'
Warning 1653 Incorrect value 'SSS' for option 'YESNO'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
......
mysql-test/r/select_debug.result 0 → 100644
View file @ cb147b39
#
# Bug #725050: print keyuse info when hash join is used
#
create table t1 (a int, b int);
insert into t1 values (2,2), (1,1);
create table t2 (a int);
insert into t2 values (2), (3);
set session join_cache_level=3;
set @@debug = 'd:t:O,/tmp/trace.out';
explain select t1.b from t1,t2 where t1.b=t2.a;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using where
1 SIMPLE t2 hash_ALL NULL #hash#$hj 5 test.t1.b 2 Using where; Using join buffer (flat, BNLH join)
select t1.b from t1,t2 where t1.b=t2.a;
b
2
set session join_cache_level=default;
drop table t1,t2;
mysql-test/r/select_jcl6.result
View file @ cb147b39
......@@ -1370,7 +1370,7 @@ id select_type table type possible_keys key key_len ref rows Extra
explain select t2.companynr,companyname from t4 left join t2 using (companynr) where t2.companynr is null;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL NULL NULL NULL NULL 12
1 SIMPLE t2 hash NULL hj_key 1 test.t4.companynr 1200 Using where; Not exists; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 1 test.t4.companynr 1200 Using where; Not exists; Using join buffer (flat, BNLH join)
select companynr,companyname from t2 left join t4 using (companynr) where companynr is null;
companynr companyname
select count(*) from t2 left join t4 using (companynr) where companynr is not null;
......@@ -1398,39 +1398,39 @@ id select_type table type possible_keys key key_len ref rows Extra
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
1 SIMPLE t2 hash NULL hj_key 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0 or companynr < 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
1 SIMPLE t2 hash NULL hj_key 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0 and companynr > 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
1 SIMPLE t2 hash NULL hj_key 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
explain select t2.companynr,companyname from t4 left join t2 using (companynr) where t2.companynr > 0 or t2.companynr is null;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL NULL NULL NULL NULL 12
1 SIMPLE t2 hash NULL hj_key 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
explain select t2.companynr,companyname from t4 left join t2 using (companynr) where t2.companynr > 0 or t2.companynr < 0 or t4.companynr > 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12
1 SIMPLE t2 hash NULL hj_key 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
explain select t2.companynr,companyname from t4 left join t2 using (companynr) where ifnull(t2.companynr,1)>0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL NULL NULL NULL NULL 12
1 SIMPLE t2 hash NULL hj_key 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0 or companynr is null;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
1 SIMPLE t2 hash NULL hj_key 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
explain select companynr,companyname from t4 left join t2 using (companynr) where companynr > 0 or companynr < 0 or companynr > 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL PRIMARY NULL NULL NULL 12 Using where
1 SIMPLE t2 hash NULL hj_key 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
explain select companynr,companyname from t4 left join t2 using (companynr) where ifnull(companynr,1)>0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 ALL NULL NULL NULL NULL 12 Using where
1 SIMPLE t2 hash NULL hj_key 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 1 test.t4.companynr 1199 Using where; Using join buffer (flat, BNLH join)
select distinct t2.companynr,t4.companynr from t2,t4 where t2.companynr=t4.companynr+1;
companynr companynr
37 36
......@@ -1438,7 +1438,7 @@ companynr companynr
explain select distinct t2.companynr,t4.companynr from t2,t4 where t2.companynr=t4.companynr+1;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t4 index NULL PRIMARY 1 NULL 12 Using index; Using temporary
1 SIMPLE t2 hash NULL hj_key 1 func 1199 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 1 func 1199 Using where; Using join buffer (flat, BNLH join)
select t2.fld1,t2.companynr,fld3,period from t3,t2 where t2.fld1 = 38208 and t2.fld1=t3.t2nr and period = 1008 or t2.fld1 = 38008 and t2.fld1 =t3.t2nr and period = 1008;
fld1 companynr fld3 period
038008 37 reporters 1008
......@@ -2337,7 +2337,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t3 system NULL NULL NULL NULL 0 const row not found
1 SIMPLE t4 const id4 NULL NULL NULL 1
1 SIMPLE t1 ALL NULL NULL NULL NULL 2
1 SIMPLE t2 hash NULL hj_key 4 test.t1.id1 1 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 4 test.t1.id1 1 Using where; Using join buffer (flat, BNLH join)
select * from t1 left join t2 on id1 = id2 left join t3 on id1 = id3
left join t4 on id3 = id4 where id2 = 1 or id4 = 1;
id1 id2 id3 id4 id44
......@@ -2917,11 +2917,11 @@ a
EXPLAIN SELECT t1.a FROM t1 STRAIGHT_JOIN t2 ON t1.a=t2.a;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 5 Using where
1 SIMPLE t2 hash NULL hj_key 5 test.t1.a 3 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_ALL NULL #hash#$hj 5 test.t1.a 3 Using where; Using join buffer (flat, BNLH join)
EXPLAIN SELECT t1.a FROM t1 INNER JOIN t2 ON t1.a=t2.a;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ALL NULL NULL NULL NULL 3 Using where
1 SIMPLE t1 hash NULL hj_key 5 test.t2.a 5 Using where; Using join buffer (flat, BNLH join)
1 SIMPLE t1 hash_ALL NULL #hash#$hj 5 test.t2.a 5 Using where; Using join buffer (flat, BNLH join)
DROP TABLE t1,t2;
select x'10' + 0, X'10' + 0, b'10' + 0, B'10' + 0;
x'10' + 0 X'10' + 0 b'10' + 0 B'10' + 0
......
mysql-test/r/sp-threads.result
View file @ cb147b39
......@@ -35,7 +35,7 @@ call bug9486();
show processlist;
Id User Host db Command Time State Info
# root localhost test Sleep # NULL
# root localhost test Query # Locked update t1, t2 set val= 1 where id1=id2
# root localhost test Query # Table lock update t1, t2 set val= 1 where id1=id2
# root localhost test Query # NULL show processlist
# root localhost test Sleep # NULL
unlock tables;
......
mysql-test/r/subselect.result
View file @ cb147b39
......@@ -4957,6 +4957,17 @@ sum(a) sub
1 3
deallocate prepare stmt1;
drop table t1,t2;
#
# Bug LP#693935/#58727: Assertion failure with
# a single row subquery returning more than one row
#
create table t1 (a char(1) charset utf8);
insert into t1 values ('a'), ('b');
create table t2 (a binary(1));
insert into t2 values ('x'), ('y');
select * from t2 where a=(select a from t1) and a='x';
ERROR 21000: Subquery returns more than 1 row
drop table t1,t2;
End of 5.1 tests
#
# No BUG#, a case brought from 5.2's innodb_mysql_lock.test
......
mysql-test/r/subselect3_jcl6.result
View file @ cb147b39
......@@ -1031,10 +1031,10 @@ explain select t21.* from t21,t22 where t21.a = t22.a and
t22.a in (select t12.a from t11, t12 where t11.a in(255,256) and t11.a = t12.a and t11.c is null) and t22.c is null order by t21.a;
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 8 Using temporary; Using filesort
1 PRIMARY t21 hash NULL hj_key 4 test.t11.a 26 Using where; Using join buffer (flat, BNLH join)
1 PRIMARY t22 hash NULL hj_key 4 test.t11.a 26 Using where; Using join buffer (incremental, BNLH join)
1 PRIMARY t21 hash_ALL NULL #hash#$hj 4 test.t11.a 26 Using where; Using join buffer (flat, BNLH join)
1 PRIMARY t22 hash_ALL NULL #hash#$hj 4 test.t11.a 26 Using where; Using join buffer (incremental, BNLH join)
2 SUBQUERY t11 ALL NULL NULL NULL NULL 8 Using where
2 SUBQUERY t12 hash NULL hj_key 4 test.t11.a 8 Using where; Using join buffer (flat, BNLH join)
2 SUBQUERY t12 hash_ALL NULL #hash#$hj 4 test.t11.a 8 Using where; Using join buffer (flat, BNLH join)
select t21.* from t21,t22 where t21.a = t22.a and
t22.a in (select t12.a from t11, t12 where t11.a in(255,256) and t11.a = t12.a and t11.c is null) and t22.c is null order by t21.a;
a b c
......@@ -1155,7 +1155,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY A ALL NULL NULL NULL NULL 10 Using join buffer (flat, BNL join)
1 PRIMARY B ALL NULL NULL NULL NULL 10 Using join buffer (incremental, BNL join)
1 PRIMARY C ALL NULL NULL NULL NULL 10 Using join buffer (incremental, BNL join)
1 PRIMARY D hash NULL hj_key 5 test.E.a 10 Using where; End temporary; Using join buffer (incremental, BNLH join)
1 PRIMARY D hash_ALL NULL #hash#$hj 5 test.E.a 10 Using where; End temporary; Using join buffer (incremental, BNLH join)
flush status;
select count(*) from t0 A, t0 B, t0 C, t0 D where D.a in (select a from t1 E);
count(*)
......@@ -1193,11 +1193,11 @@ insert into t3 values (1),(2);
explain select * from t2 where a in (select a from t1);
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t2 ALL NULL NULL NULL NULL 2 Using where; Start temporary
1 PRIMARY t1 hash NULL hj_key 4 test.t2.a 4 Using where; End temporary; Using join buffer (flat, BNLH join)
1 PRIMARY t1 hash_ALL NULL #hash#$hj 4 test.t2.a 4 Using where; End temporary; Using join buffer (flat, BNLH join)
explain select * from t2 where a in (select a from t2);
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t2 ALL NULL NULL NULL NULL 2 Using where; Start temporary
1 PRIMARY t2 hash NULL hj_key 5 test.t2.a 2 Using where; End temporary; Using join buffer (flat, BNLH join)
1 PRIMARY t2 hash_ALL NULL #hash#$hj 5 test.t2.a 2 Using where; End temporary; Using join buffer (flat, BNLH join)
explain select * from t2 where a in (select a from t3);
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t2 ALL NULL NULL NULL NULL 2 Start temporary
......@@ -1212,7 +1212,7 @@ insert into t1 values (1),(2);
explain select * from t1 where a in (select a from t1);
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t1 ALL NULL NULL NULL NULL 2 Using where; Start temporary
1 PRIMARY t1 hash NULL hj_key 6 test.t1.a 2 Using where; End temporary; Using join buffer (flat, BNLH join)
1 PRIMARY t1 hash_ALL NULL #hash#$hj 6 test.t1.a 2 Using where; End temporary; Using join buffer (flat, BNLH join)
drop table t1;
set @@optimizer_switch=@save_optimizer_switch;
create table t1 (a int);
......
mysql-test/r/subselect4.result
View file @ cb147b39
......@@ -689,3 +689,21 @@ id select_type table type possible_keys key key_len ref rows Extra
2 DEPENDENT SUBQUERY X ALL NULL NULL NULL NULL 10
2 DEPENDENT SUBQUERY B ALL a,b NULL NULL NULL 1000 Range checked for each record (index map: 0x3)
drop table t1, t2;
#
# BUG#723822: Crash in get_constant_key_infix with EXISTS ( SELECT .. DISTINCT )
#
CREATE TABLE t1 ( f1 int(11), f3 varchar(1)) ;
INSERT INTO t1 VALUES ('8','c'),('5','f');
ALTER TABLE t1 ADD KEY (f3,f1);
CREATE TABLE t2 ( f4 varchar(1)) ;
INSERT INTO t2 VALUES ('f'),('d');
SELECT * FROM t2
WHERE EXISTS (
SELECT DISTINCT f3
FROM t1
WHERE f3 <= t2.f4
);
f4
f
d
drop table t1,t2;
mysql-test/r/subselect_no_mat.result
View file @ cb147b39
......@@ -4956,6 +4956,17 @@ sum(a) sub
1 3
deallocate prepare stmt1;
drop table t1,t2;
#
# Bug LP#693935/#58727: Assertion failure with
# a single row subquery returning more than one row
#
create table t1 (a char(1) charset utf8);
insert into t1 values ('a'), ('b');
create table t2 (a binary(1));
insert into t2 values ('x'), ('y');
select * from t2 where a=(select a from t1) and a='x';
ERROR 21000: Subquery returns more than 1 row
drop table t1,t2;
End of 5.1 tests
#
# No BUG#, a case brought from 5.2's innodb_mysql_lock.test
......
mysql-test/r/subselect_no_opts.result
View file @ cb147b39
......@@ -4953,6 +4953,17 @@ sum(a) sub
1 3
deallocate prepare stmt1;
drop table t1,t2;
#
# Bug LP#693935/#58727: Assertion failure with
# a single row subquery returning more than one row
#
create table t1 (a char(1) charset utf8);
insert into t1 values ('a'), ('b');
create table t2 (a binary(1));
insert into t2 values ('x'), ('y');
select * from t2 where a=(select a from t1) and a='x';
ERROR 21000: Subquery returns more than 1 row
drop table t1,t2;
End of 5.1 tests
#
# No BUG#, a case brought from 5.2's innodb_mysql_lock.test
......
mysql-test/r/subselect_no_semijoin.result
View file @ cb147b39
......@@ -4953,6 +4953,17 @@ sum(a) sub
1 3
deallocate prepare stmt1;
drop table t1,t2;
#
# Bug LP#693935/#58727: Assertion failure with
# a single row subquery returning more than one row
#
create table t1 (a char(1) charset utf8);
insert into t1 values ('a'), ('b');
create table t2 (a binary(1));
insert into t2 values ('x'), ('y');
select * from t2 where a=(select a from t1) and a='x';
ERROR 21000: Subquery returns more than 1 row
drop table t1,t2;
End of 5.1 tests
#
# No BUG#, a case brought from 5.2's innodb_mysql_lock.test
......
mysql-test/r/subselect_sj2_jcl6.result
View file @ cb147b39
......@@ -138,7 +138,7 @@ a, mid(filler1, 1,10), length(filler1)=length(filler2) as Z
from t1 ot where a in (select a from t2 it);
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 22
1 PRIMARY ot hash NULL hj_key 5 test.it.a 32 Using where; Using join buffer (flat, BNLH join)
1 PRIMARY ot hash_ALL NULL #hash#$hj 5 test.it.a 32 Using where; Using join buffer (flat, BNLH join)
2 SUBQUERY it ALL NULL NULL NULL NULL 22 Using where
select
a, mid(filler1, 1,10), length(filler1)=length(filler2) as Z
......@@ -206,7 +206,7 @@ a, mid(filler1, 1,10), length(filler1)=length(filler2) as Z
from t1 ot where a in (select a from t2 it);
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 22
1 PRIMARY ot hash NULL hj_key 5 test.it.a 52 Using where; Using join buffer (flat, BNLH join)
1 PRIMARY ot hash_ALL NULL #hash#$hj 5 test.it.a 52 Using where; Using join buffer (flat, BNLH join)
2 SUBQUERY it ALL NULL NULL NULL NULL 22 Using where
select
a, mid(filler1, 1,10), length(filler1)=length(filler2) as Z
......@@ -592,7 +592,7 @@ explain
select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t1 ALL NULL NULL NULL NULL 3
1 PRIMARY t2 hash NULL hj_key 5 test.t1.a 3 Using where; Using join buffer (flat, BNLH join)
1 PRIMARY t2 hash_ALL NULL #hash#$hj 5 test.t1.a 3 Using where; Using join buffer (flat, BNLH join)
2 DEPENDENT SUBQUERY t3 unique_subquery PRIMARY PRIMARY 4 func 1 Using index
drop table t0, t1, t2, t3;
create table t1 (a int);
......
mysql-test/r/table_elim.result
View file @ cb147b39
......@@ -535,3 +535,34 @@ HAVING
field4 != 6;
field1 field2 field3 field4 field5 field6
drop table t0,t1,t2,t3,t4,t5,t6;
#
# BUG#675118: Elimination of a table results in an invalid execution plan
#
CREATE TABLE t1 (f1 int(11), PRIMARY KEY (f1)) ;
CREATE TABLE t2 (f4 varchar(1024), KEY (f4)) ;
Warnings:
Warning 1071 Specified key was too long; max key length is 1000 bytes
INSERT IGNORE INTO t2 VALUES ('xcddwntkbxyorzdv'),
('cnxxcddwntkbxyor'),('r'),('r'), ('did'),('I'),('when'),
('hczkfqjeggivdvac'),('e'),('okay'),('up');
CREATE TABLE t3 (f4 varchar(1024), f1 int(11), f2 int(11)) ;
INSERT IGNORE INTO t3 VALUES ('f','4','0'),('n','5','-996540416');
CREATE TABLE t4 (f1 int(11), f3 varchar(10)) ;
INSERT IGNORE INTO t4 VALUES ('8','n'),('9','nwzcerzsgx'),('10','c');
CREATE TABLE t5 (f5 int(11), KEY (f5)) ;
EXPLAIN
SELECT t3.f2
FROM t2
LEFT JOIN t3
LEFT JOIN t4
LEFT JOIN t1 ON t4.f1 = t1.f1
JOIN t5 ON t4.f3 ON t3.f1 = t5.f5 ON t2.f4 = t3.f4
WHERE t3.f2 ;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t3 ALL NULL NULL NULL NULL 2 Using where
1 SIMPLE t5 ref f5 f5 5 test.t3.f1 2 Using where; Using index
1 SIMPLE t4 ALL NULL NULL NULL NULL 3 Using where
1 SIMPLE t2 ALL f4 NULL NULL NULL 11 Using where; Using join buffer (flat, BNL join)
# ^^ The above must not produce a QEP of t3,t5,t2,t4
# as that violates the "no interleaving of outer join nests" rule.
DROP TABLE t1,t2,t3,t4,t5;
mysql-test/r/table_options.result
View file @ cb147b39
......@@ -3,9 +3,9 @@ SET @OLD_SQL_MODE=@@SQL_MODE;
SET SQL_MODE='IGNORE_BAD_TABLE_OPTIONS';
create table t1 (a int fkey=vvv, key akey (a) dff=vvv) tkey1='1v1';
Warnings:
Warning 1651 Unknown option 'fkey'
Warning 1651 Unknown option 'dff'
Warning 1651 Unknown option 'tkey1'
Warning 1652 Unknown option 'fkey'
Warning 1652 Unknown option 'dff'
Warning 1652 Unknown option 'tkey1'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
......@@ -16,10 +16,10 @@ drop table t1;
#reassiginig options in the same line
create table t1 (a int fkey=vvv, key akey (a) dff=vvv) tkey1=1v1 TKEY1=DEFAULT tkey1=1v2 tkey2=2v1;
Warnings:
Warning 1651 Unknown option 'fkey'
Warning 1651 Unknown option 'dff'
Warning 1651 Unknown option 'tkey1'
Warning 1651 Unknown option 'tkey2'
Warning 1652 Unknown option 'fkey'
Warning 1652 Unknown option 'dff'
Warning 1652 Unknown option 'tkey1'
Warning 1652 Unknown option 'tkey2'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
......@@ -29,7 +29,7 @@ t1 CREATE TABLE `t1` (
#add option
alter table t1 tkey4=4v1;
Warnings:
Warning 1651 Unknown option 'tkey4'
Warning 1652 Unknown option 'tkey4'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
......@@ -39,8 +39,8 @@ t1 CREATE TABLE `t1` (
#remove options
alter table t1 tkey3=DEFAULT tkey4=DEFAULT;
Warnings:
Warning 1651 Unknown option 'tkey3'
Warning 1651 Unknown option 'tkey4'
Warning 1652 Unknown option 'tkey3'
Warning 1652 Unknown option 'tkey4'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
......@@ -50,11 +50,11 @@ t1 CREATE TABLE `t1` (
drop table t1;
create table t1 (a int fkey1=v1, key akey (a) kkey1=v1) tkey1=1v1 tkey1=1v2 TKEY1=DEFAULT tkey2=2v1 tkey3=3v1;
Warnings:
Warning 1651 Unknown option 'fkey1'
Warning 1651 Unknown option 'kkey1'
Warning 1651 Unknown option 'TKEY1'
Warning 1651 Unknown option 'tkey2'
Warning 1651 Unknown option 'tkey3'
Warning 1652 Unknown option 'fkey1'
Warning 1652 Unknown option 'kkey1'
Warning 1652 Unknown option 'TKEY1'
Warning 1652 Unknown option 'tkey2'
Warning 1652 Unknown option 'tkey3'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
......@@ -64,7 +64,7 @@ t1 CREATE TABLE `t1` (
#change field with option with the same value
alter table t1 change a a int `FKEY1`='v1';
Warnings:
Warning 1651 Unknown option 'FKEY1'
Warning 1652 Unknown option 'FKEY1'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
......@@ -74,7 +74,7 @@ t1 CREATE TABLE `t1` (
#change field with option with a different value
alter table t1 change a a int fkey1=v2;
Warnings:
Warning 1651 Unknown option 'fkey1'
Warning 1652 Unknown option 'fkey1'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
......@@ -93,7 +93,7 @@ t1 CREATE TABLE `t1` (
#new key with options
alter table t1 add key bkey (b) kkey2=v1;
Warnings:
Warning 1651 Unknown option 'kkey2'
Warning 1652 Unknown option 'kkey2'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
......@@ -105,8 +105,8 @@ t1 CREATE TABLE `t1` (
#new column with options
alter table t1 add column c int fkey1=v1 fkey2=v2;
Warnings:
Warning 1651 Unknown option 'fkey1'
Warning 1651 Unknown option 'fkey2'
Warning 1652 Unknown option 'fkey1'
Warning 1652 Unknown option 'fkey2'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
......@@ -141,7 +141,7 @@ t1 CREATE TABLE `t1` (
#add column with options after delete
alter table t1 add column b int fkey2=v1;
Warnings:
Warning 1651 Unknown option 'fkey2'
Warning 1652 Unknown option 'fkey2'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
......@@ -154,7 +154,7 @@ t1 CREATE TABLE `t1` (
#add key
alter table t1 add key bkey (b) kkey2=v2;
Warnings:
Warning 1651 Unknown option 'kkey2'
Warning 1652 Unknown option 'kkey2'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
......@@ -168,7 +168,7 @@ t1 CREATE TABLE `t1` (
drop table t1;
create table t1 (a int) tkey1=100;
Warnings:
Warning 1651 Unknown option 'tkey1'
Warning 1652 Unknown option 'tkey1'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
......
mysql-test/suite/binlog/t/binlog_stm_row.test
View file @ cb147b39
......@@ -60,7 +60,7 @@ let $wait_condition=
--echo # con1
let $wait_condition=
SELECT COUNT(*) = 1 FROM information_schema.processlist WHERE
state = "Locked" and info = "INSERT INTO t2 VALUES (3)";
state = "Table Lock" and info = "INSERT INTO t2 VALUES (3)";
--source include/wait_condition.inc
SELECT RELEASE_LOCK('Bug#34306');
--connection con2
......
mysql-test/suite/federated/federated_debug.test
View file @ cb147b39
--source include/have_debug.inc
--source include/long_test.inc
--source federated.inc
--echo #
......
mysql-test/suite/funcs_1/datadict/processlist_val.inc
View file @ cb147b39
......@@ -368,13 +368,13 @@ echo
;
connection default;
echo
# Poll till INFO is no more NULL and State = 'Locked'.
# Poll till INFO is no more NULL and State = "Table Lock".
;
let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
WHERE INFO IS NOT NULL AND STATE = 'Locked';
WHERE INFO IS NOT NULL AND STATE = "Table Lock";
--source include/wait_condition.inc
#
# Expect to see the state 'Locked' for the third connection because the SELECT
# Expect to see the state "Table Lock" for the third connection because the SELECT
# collides with the WRITE TABLE LOCK.
--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> 9 <TIME_MS>
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
......@@ -423,10 +423,10 @@ echo
;
connection default;
echo
# Poll till INFO is no more NULL and State = 'Locked'.
# Poll till INFO is no more NULL and State = "Table Lock".
;
let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
WHERE INFO IS NOT NULL AND STATE = 'Locked';
WHERE INFO IS NOT NULL AND STATE = "Table Lock";
--source include/wait_condition.inc
echo
# Expect result:
......
mysql-test/suite/handler/aria.result 0 → 100644
View file @ cb147b39
This diff is collapsed.
mysql-test/suite/handler/aria.test 0 → 100644
View file @ cb147b39
# t/handler_innodb.test
#
# test of HANDLER ...
#
# Last update:
# 2006-07-31 ML test refactored (MySQL 5.1)
# code of t/handler.test and t/innodb_handler.test united
# main testing code put into handler.inc
# rename t/innodb_handler.test to t/handler_innodb.test
#
--source include/have_maria.inc
let $engine_type= Aria;
--source init.inc
--source handler.inc
--echo #
--echo # BUG #46456: HANDLER OPEN + TRUNCATE + DROP (temporary) TABLE, crash
--echo #
CREATE TABLE t1 AS SELECT 1 AS f1;
HANDLER t1 OPEN;
TRUNCATE t1;
--error ER_UNKNOWN_TABLE
HANDLER t1 READ FIRST;
DROP TABLE t1;
CREATE TEMPORARY TABLE t1 AS SELECT 1 AS f1;
HANDLER t1 OPEN;
TRUNCATE t1;
--error ER_UNKNOWN_TABLE
HANDLER t1 READ FIRST;
DROP TABLE t1;
--echo #
--echo # Bug #54007: assert in ha_myisam::index_next , HANDLER
--echo #
CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a), KEY b(b), KEY ab(a, b));
HANDLER t1 OPEN;
HANDLER t1 READ FIRST;
HANDLER t1 READ `PRIMARY` NEXT;
HANDLER t1 READ ab NEXT;
HANDLER t1 READ b NEXT;
HANDLER t1 READ NEXT;
HANDLER t1 CLOSE;
INSERT INTO t1 VALUES (2, 20), (1, 10), (4, 40), (3, 30);
HANDLER t1 OPEN;
HANDLER t1 READ FIRST;
HANDLER t1 READ NEXT;
HANDLER t1 READ `PRIMARY` NEXT;
HANDLER t1 READ `PRIMARY` NEXT;
HANDLER t1 READ ab NEXT;
HANDLER t1 READ ab NEXT;
HANDLER t1 READ b NEXT;
HANDLER t1 READ b NEXT;
HANDLER t1 READ b NEXT;
HANDLER t1 READ b NEXT;
HANDLER t1 READ b NEXT;
HANDLER t1 READ NEXT;
HANDLER t1 READ NEXT;
HANDLER t1 READ NEXT;
HANDLER t1 CLOSE;
HANDLER t1 OPEN;
HANDLER t1 READ FIRST;
HANDLER t1 READ `PRIMARY` PREV;
HANDLER t1 READ `PRIMARY` PREV;
HANDLER t1 READ b PREV;
HANDLER t1 READ b PREV;
HANDLER t1 CLOSE;
HANDLER t1 OPEN;
HANDLER t1 READ FIRST;
HANDLER t1 READ `PRIMARY` PREV LIMIT 3;
HANDLER t1 READ b NEXT LIMIT 5;
HANDLER t1 CLOSE;
DROP TABLE t1;
--echo End of 5.1 tests
mysql-test/suite/handler/heap.result 0 → 100644
View file @ cb147b39
This diff is collapsed.
mysql-test/suite/handler/heap.test 0 → 100644
View file @ cb147b39
# test of HANDLER with HEAP tables
#
let $engine_type= MEMORY;
let $key_type=using btree;
--source init.inc
--source handler.inc
#
# Test what happens if table is changed (Unique test for HEAP)
#
connect (con1,localhost,root,,);
connection default;
CREATE TABLE t1(a INT, b INT, KEY(a), KEY b using btree (b), KEY ab using btree(a, b)) engine=memory;
INSERT INTO t1 VALUES (2, 20), (2,20), (1, 10), (4, 40), (3, 30), (5,50), (6,50);
HANDLER t1 OPEN;
HANDLER t1 READ a>=(2) limit 3;
HANDLER t1 READ a PREV;
HANDLER t1 READ a PREV;
HANDLER t1 READ a PREV;
HANDLER t1 READ b>=(20) limit 3;
HANDLER t1 READ b PREV;
HANDLER t1 READ b PREV LIMIT 2;
HANDLER t1 READ ab=(3,30) limit 3;
HANDLER t1 READ ab>=(3,30) limit 3;
# Test FIRST/LAST on hash and btree keys
--error ER_ILLEGAL_HA
HANDLER t1 READ a FIRST;
--error ER_ILLEGAL_HA
HANDLER t1 READ a LAST;
HANDLER t1 READ b FIRST LIMIT 2;
HANDLER t1 READ ab LAST LIMIT 2;
# Table scan
HANDLER t1 READ FIRST LIMIT 10;
# Index scan
HANDLER t1 READ b FIRST;
insert into t1 values (7,50);
--error ER_CHECKREAD
HANDLER t1 READ b NEXT;
HANDLER t1 READ b FIRST;
connection con1;
insert into t1 values (7,50);
connection default;
--error ER_CHECKREAD
HANDLER t1 READ b NEXT;
HANDLER t1 READ FIRST;
connection con1;
insert into t1 values (8,50);
connection default;
HANDLER t1 READ NEXT;
connection con1;
delete from t1 where a=3;
connection default;
HANDLER t1 READ NEXT LIMIT 2;
connection con1;
delete from t1;
connection default;
--error ER_CHECKREAD
HANDLER t1 READ NEXT LIMIT 2;
HANDLER t1 CLOSE;
DROP TABLE t1;
disconnect con1;
#
# LP#702786 Two handler read f1 next gives different errors
#
create table t1 (f1 integer not null, key (f1)) engine=Memory;
insert into t1 values (1);
HANDLER t1 OPEN;
--error 1031
HANDLER t1 READ f1 NEXT;
--error 1031
HANDLER t1 READ f1 NEXT;
--error 1031
HANDLER t1 READ f1 NEXT;
HANDLER t1 CLOSE;
DROP TABLE t1;
--echo End of 5.3 tests
mysql-test/suite/handler/init.inc 0 → 100644
View file @ cb147b39
# Setup things for handler.inc
#
# Input variables
# $engine_type -- storage engine to be tested
# $key_type -- set if you want a non standard key type
#
# This scripts sets up default values for:
# $other_engine_type -- storage engine <> $engine_type
# $other_handler_engine_type -- storage engine <> $engine_type, if possible
# 1. $other_handler_engine_type must support handler
# 2. $other_handler_engine_type must point to an all
# time available storage engine
# have to be set before sourcing this script.
#
# Handler tests don't work with embedded server
#
-- source include/not_embedded.inc
eval SET SESSION STORAGE_ENGINE = $engine_type;
let $other_engine_type= CSV;
let $other_handler_engine_type= MyISAM;
--disable_warnings
drop table if exists t1,t3,t4,t5;
--enable_warnings
# Create default test table
eval create table t1 (a int, b char(10), key a $key_type (a), key b $key_type (a,b));
insert into t1 values
(17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"),
(14,"aaa"),(16,"ccc"),(16,"xxx"),
(20,"ggg"),(21,"hhh"),(22,"iii"),(23,"xxx"),(24,"xxx"),(25,"xxx");
mysql-test/t/handler_innodb.test → mysql-test/suite/handler/innodb.test
View file @ cb147b39
......@@ -5,16 +5,24 @@
# Last update:
# 2006-07-31 ML test refactored (MySQL 5.1)
# code of t/handler.test and t/innodb_handler.test united
# main testing code put into include/handler.inc
# main testing code put into handler.inc
# rename t/innodb_handler.test to t/handler_innodb.test
#
# should work in embedded server after mysqltest is fixed
--source include/not_embedded.inc
--source include/have_innodb.inc
let $engine_type= InnoDB;
let $other_engine_type= MEMORY;
let $other_handler_engine_type= MyISAM;
--source include/handler.inc
--source init.inc
--source handler.inc
#
# LP#697610 ha_index_prev(uchar*): Assertion `inited==INDEX'
#
CREATE TABLE t1 (f1 integer, f2 integer, primary key (f1), key (f2)) engine=innodb;
INSERT INTO t1 VALUES (1,1),(2,2),(3,3);
HANDLER t1 OPEN;
HANDLER t1 READ FIRST WHERE f2 <= 1;
HANDLER t1 READ `PRIMARY` PREV;
DROP TABLE t1;
mysql-test/suite/handler/interface.result 0 → 100644
View file @ cb147b39
drop table if exists t1,t3,t4,t5;
drop database if exists test_test;
SET SESSION STORAGE_ENGINE = MyISAM;
drop table if exists t1,t3,t4,t5;
create table t1 (a int, b char(10), key a (a), key b (a,b));
insert into t1 values
(17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"),
(14,"aaa"),(16,"ccc"),(16,"xxx"),
(20,"ggg"),(21,"hhh"),(22,"iii"),(23,"xxx"),(24,"xxx"),(25,"xxx");
handler t1 open;
handler t1 read a=(SELECT 1);
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1)' at line 1
handler t1 read a=(1) FIRST;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'FIRST' at line 1
handler t1 read a=(1) NEXT;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NEXT' at line 1
handler t1 read last;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
handler t1 close;
drop table t1;
CREATE TABLE t1(a INT, PRIMARY KEY(a));
insert into t1 values(1),(2);
handler t1 open;
handler t1 read primary=(1);
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'primary=(1)' at line 1
handler t1 read `primary`=(1);
a
1
handler t1 close;
drop table t1;
create database test_test;
use test_test;
create table t1(table_id char(20), primary key (table_id));
insert into t1 values ('test_test.t1');
insert into t1 values ('');
handler t1 open;
handler t1 read first limit 9;
table_id
test_test.t1
create table t2(table_id char(20), primary key (table_id));
insert into t2 values ('test_test.t2');
insert into t2 values ('');
handler t2 open;
handler t2 read first limit 9;
table_id
test_test.t2
use test;
create table t1(table_id char(20), primary key (table_id));
insert into t1 values ('test.t1');
insert into t1 values ('');
handler t1 open;
ERROR 42000: Not unique table/alias: 't1'
use test;
handler test.t1 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler test_test.t1 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler t1 read first limit 9;
table_id
test_test.t1
handler test_test.t2 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler t2 read first limit 9;
table_id
test_test.t2
handler test_test.t1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t1 close;
drop table test_test.t1;
handler test_test.t2 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t2 close;
drop table test_test.t2;
drop database test_test;
use test;
handler test.t1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t1 close;
ERROR 42S02: Unknown table 't1' in HANDLER
drop table test.t1;
create database test_test;
use test_test;
create table t1 (c1 char(20));
insert into t1 values ('test_test.t1');
create table t3 (c1 char(20));
insert into t3 values ('test_test.t3');
handler t1 open;
handler t1 read first limit 9;
c1
test_test.t1
handler t1 open h1;
handler h1 read first limit 9;
c1
test_test.t1
use test;
create table t1 (c1 char(20));
create table t2 (c1 char(20));
create table t3 (c1 char(20));
insert into t1 values ('t1');
insert into t2 values ('t2');
insert into t3 values ('t3');
handler t1 open;
ERROR 42000: Not unique table/alias: 't1'
handler t2 open t1;
ERROR 42000: Not unique table/alias: 't1'
handler t3 open t1;
ERROR 42000: Not unique table/alias: 't1'
handler t1 read first limit 9;
c1
test_test.t1
handler test.t1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler test.t1 open h1;
ERROR 42000: Not unique table/alias: 'h1'
handler test_test.t1 open h1;
ERROR 42000: Not unique table/alias: 'h1'
handler test_test.t3 open h3;
handler test.t1 open h2;
handler t1 read first limit 9;
c1
test_test.t1
handler h1 read first limit 9;
c1
test_test.t1
handler h2 read first limit 9;
c1
t1
handler h3 read first limit 9;
c1
test_test.t3
handler h2 read first limit 9;
c1
t1
handler test.h1 close;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'close' at line 1
handler t1 close;
handler h1 close;
handler h2 close;
handler t1 read first limit 9;
ERROR 42S02: Unknown table 't1' in HANDLER
handler h1 read first limit 9;
ERROR 42S02: Unknown table 'h1' in HANDLER
handler h2 read first limit 9;
ERROR 42S02: Unknown table 'h2' in HANDLER
handler h3 read first limit 9;
c1
test_test.t3
handler h3 read first limit 9;
c1
test_test.t3
use test_test;
handler h3 read first limit 9;
c1
test_test.t3
handler test.h3 read first limit 9;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'read first limit 9' at line 1
handler h3 close;
use test;
drop table t3;
drop table t2;
drop table t1;
drop database test_test;
create table t1 (c1 int);
create table t2 (c1 int);
insert into t1 values (1);
insert into t2 values (2);
connection: default
handler t1 open;
handler t1 read first;
c1
1
connection: flush
flush tables;;
connection: default
handler t2 open;
handler t2 read first;
c1
2
handler t1 read next;
c1
1
handler t1 close;
handler t2 close;
drop table t1,t2;
create table t1 (a int);
handler t1 open as t1_alias;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
flush tables;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias close;
drop table t1;
create table t1 (a int);
handler t1 open as t1_alias;
handler t1_alias read first;
a
drop table t1;
handler t1_alias read next;
ERROR 42S02: Unknown table 't1_alias' in HANDLER
create table t1 (c1 int);
connection: default
handler t1 open;
handler t1 read first;
c1
connection: flush
rename table t1 to t2;;
connection: default
handler t2 open;
handler t2 read first;
c1
handler t1 read next;
ERROR 42S02: Table 'test.t1' doesn't exist
handler t1 close;
handler t2 close;
drop table t2;
create table t1 (a int, b char(1), key a (a), key b (a,b));
insert into t1 values (0,"a"),(1,"b"),(2,"c"),(3,"d"),(4,"e"),
(5,"f"),(6,"g"),(7,"h"),(8,"i"),(9,"j");
handler t1 open;
handler t1 read a first;
a b
0 a
handler t1 read a next;
a b
1 b
flush tables;
handler t1 read a next;
a b
0 a
handler t1 read a next;
a b
1 b
flush tables with read lock;
handler t1 read a next;
a b
0 a
unlock tables;
drop table t1;
handler t1 read a next;
ERROR 42S02: Unknown table 't1' in HANDLER
drop table if exists t1;
create table t1 (a int not null);
insert into t1 values (1);
handler t1 open;
alter table t1 engine=csv;
handler t1 read a next;
ERROR HY000: Table storage engine for 't1' doesn't have this option
handler t1 close;
drop table t1;
USE information_schema;
HANDLER COLUMNS OPEN;
ERROR HY000: Incorrect usage of HANDLER OPEN and information_schema
PREPARE h_r FROM 'HANDLER t1 READ `PRIMARY` LAST';
ERROR 42S02: Unknown table 't1' in HANDLER
mysql-test/suite/handler/interface.test 0 → 100644
View file @ cb147b39
This diff is collapsed.
mysql-test/t/handler_myisam.test → mysql-test/suite/handler/myisam.test
View file @ cb147b39
......@@ -5,20 +5,14 @@
# Last update:
# 2006-07-31 ML test refactored (MySQL 5.1)
# code of t/handler.test and t/innodb_handler.test united
# main testing code put into include/handler.inc
# main testing code put into handler.inc
# rename t/handler.test to t/handler_myisam.test
#
# should work in embedded server after mysqltest is fixed
--source include/not_embedded.inc
let $engine_type= MyISAM;
let $other_engine_type= MEMORY;
# There is unfortunately no other all time available storage engine
# which supports the handler interface
let $other_handler_engine_type= MyISAM;
--source include/handler.inc
--source init.inc
--source handler.inc
--echo #
--echo # BUG #46456: HANDLER OPEN + TRUNCATE + DROP (temporary) TABLE, crash
......@@ -37,18 +31,6 @@ TRUNCATE t1;
HANDLER t1 READ FIRST;
DROP TABLE t1;
--echo #
--echo # BUG#51877 - HANDLER interface causes invalid memory read
--echo #
CREATE TABLE t1(a INT, KEY(a));
HANDLER t1 OPEN;
HANDLER t1 READ a FIRST;
INSERT INTO t1 VALUES(1);
HANDLER t1 READ a NEXT;
HANDLER t1 CLOSE;
DROP TABLE t1;
--echo #
--echo # Bug #54007: assert in ha_myisam::index_next , HANDLER
--echo #
......
mysql-test/suite/innodb/r/innodb_mysql.result
View file @ cb147b39
......@@ -2625,6 +2625,14 @@ ref NULL
rows 3
Extra Using index
DROP TABLE t1;
#
# ALTER TABLE IGNORE didn't ignore duplicates for unique add index
#
create table t1 (a int primary key, b int) engine = innodb;
insert into t1 values (1,1),(2,1);
alter ignore table t1 add unique `main` (b);
drop table t1;
#
End of 5.1 tests
#
# Test for bug #39932 "create table fails if column for FK is in different
......@@ -2664,7 +2672,7 @@ SELECT t1.pk FROM t1,t2
WHERE t1.pk = t2.pk AND t2.pk <> 8;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index PRIMARY PRIMARY 4 NULL 11 Using where; Using index
1 SIMPLE t2 hash PRIMARY PRIMARY 4 test.t1.pk 13 Using index; Using join buffer (flat, BNLH join)
1 SIMPLE t2 hash_range PRIMARY #hash#PRIMARY:PRIMARY 4:4 test.t1.pk 7 Using where; Using index; Using join buffer (flat, BNLH join)
SELECT t1.pk FROM t1,t2
WHERE t1.pk = t2.pk AND t2.pk <> 8;
pk
......
mysql-test/suite/innodb/t/innodb_mysql.test
View file @ cb147b39
......@@ -840,6 +840,17 @@ CREATE INDEX b ON t1(a,b,c,d);
DROP TABLE t1;
--echo #
--echo # ALTER TABLE IGNORE didn't ignore duplicates for unique add index
--echo #
create table t1 (a int primary key, b int) engine = innodb;
insert into t1 values (1,1),(2,1);
alter ignore table t1 add unique `main` (b);
drop table t1;
--echo #
--echo End of 5.1 tests
--echo #
......
mysql-test/suite/maria/r/maria.result
View file @ cb147b39
select * from INFORMATION_SCHEMA.ENGINES where ENGINE="ARIA";
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
Aria YES Crash-safe tables with MyISAM heritage YES NO NO
Aria YES Crash-safe tables with MyISAM heritage NO NO NO
set global storage_engine=aria;
set session storage_engine=aria;
set global aria_page_checksum=0;
......@@ -2624,3 +2624,19 @@ KEY (v3)
INSERT INTO t1 ( f1 , f2 , f3 , f4 ) SELECT f1 , f4 , f1 , f4 FROM t1;
DELETE FROM t1;
drop table t1;
create table t1 (a int not null primary key, b blob) engine=maria transactional=1;
insert into t1 values(1,repeat('a',8000));
insert into t1 values(2,repeat('b',8000));
insert into t1 values(3,repeat('c',8000));
flush tables;
delete from t1 where a>1;
insert into t1 values(1,repeat('d',8000*3));
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
flush tables;
check table t1;
Table Op Msg_type Msg_text
test.t1 check status OK
repair table t1 extended;
Table Op Msg_type Msg_text
test.t1 repair status OK
drop table t1;
mysql-test/suite/maria/r/maria3.result
View file @ cb147b39
select * from INFORMATION_SCHEMA.ENGINES where ENGINE="ARIA";
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
Aria YES Crash-safe tables with MyISAM heritage YES NO NO
Aria YES Crash-safe tables with MyISAM heritage NO NO NO
set global storage_engine=aria;
set session storage_engine=aria;
set global aria_page_checksum=0;
......
mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
View file @ cb147b39
......@@ -6,6 +6,7 @@
# Binary must be compiled with debug for crash to occur
--source include/have_debug.inc
--source include/have_maria.inc
--source include/long_test.inc
set global aria_log_file_size=4294967295;
let $MARIA_LOG=.;
......
mysql-test/suite/maria/t/maria.test
View file @ cb147b39
......@@ -1910,6 +1910,24 @@ INSERT INTO t1 ( f1 , f2 , f3 , f4 ) SELECT f1 , f4 , f1 , f4 FROM t1;
DELETE FROM t1;
drop table t1;
#
# Test of problem where REPAIR finds old deleted rows.
#
create table t1 (a int not null primary key, b blob) engine=maria transactional=1;
insert into t1 values(1,repeat('a',8000));
insert into t1 values(2,repeat('b',8000));
insert into t1 values(3,repeat('c',8000));
flush tables;
delete from t1 where a>1;
--error 1062
insert into t1 values(1,repeat('d',8000*3));
flush tables;
check table t1;
# This failed by finding 2 extra rows.
repair table t1 extended;
drop table t1;
#
# End of test
#
......
mysql-test/suite/parts/inc/partition_check_drop.inc
View file @ cb147b39
......@@ -66,10 +66,10 @@ if ($found_garbage)
}
# Do a manual cleanup, because the following tests should not suffer from
# remaining files
--exec rm -f $MYSQLD_DATADIR/test/t1* || true
--exec perl -e "unlink(<$MYSQLD_DATADIR/test/t1*>)"
if ($with_directories)
{
--exec rm -f $MYSQLTEST_VARDIR/tmp/t1* || true
--exec perl -e "unlink(<$MYSQLD_DATADIR/test/tmp/t1*>)"
}
}
--enable_query_log
mysql-test/suite/parts/t/partition_alter2_1_myisam.test
View file @ cb147b39
......@@ -22,6 +22,8 @@
# any of the variables.
#
--source include/long_test.inc
#------------------------------------------------------------------------------#
# General not engine specific settings and requirements
......
mysql-test/suite/parts/t/partition_alter2_2_myisam.test
View file @ cb147b39
......@@ -22,6 +22,8 @@
# any of the variables.
#
--source include/long_test.inc
#------------------------------------------------------------------------------#
# General not engine specific settings and requirements
......
mysql-test/suite/parts/t/partition_basic_innodb.test
View file @ cb147b39
......@@ -22,6 +22,8 @@
# any of the variables.
#
--source include/long_test.inc
#------------------------------------------------------------------------------#
# General not engine specific settings and requirements
......
mysql-test/suite/parts/t/partition_decimal_myisam.test
View file @ cb147b39
......@@ -22,6 +22,8 @@
# any of the variables.
#
--source include/long_test.inc
#------------------------------------------------------------------------------#
# General not engine specific settings and requirements
......
mysql-test/suite/parts/t/partition_float_myisam.test
View file @ cb147b39
......@@ -22,6 +22,8 @@
# any of the variables.
#
--source include/long_test.inc
#------------------------------------------------------------------------------#
# General not engine specific settings and requirements
......
mysql-test/suite/parts/t/partition_int_myisam.test
View file @ cb147b39
......@@ -22,6 +22,8 @@
# any of the variables.
#
--source include/long_test.inc
#------------------------------------------------------------------------------#
# General not engine specific settings and requirements
......
mysql-test/suite/pbxt/r/lock_multi.result
View file @ cb147b39
......@@ -139,7 +139,7 @@ lock table t1 read;
update t1 set i= 10;
select * from t1;
Timeout in wait_condition.inc for select count(*) = 1 from information_schema.processlist
where state = "Locked" and info = "select * from t1"
where state = "Table Lock" and info = "select * from t1"
kill query ID;
i
ERROR 70100: Query execution was interrupted
......
mysql-test/suite/pbxt/t/lock_multi.test
View file @ cb147b39
......@@ -48,7 +48,7 @@ insert t1 select * from t2;
connection locker;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Locked" and info = "insert t1 select * from t2";
where state = "Table Lock" and info = "insert t1 select * from t2";
--source include/wait_condition.inc
drop table t2;
connection reader;
......@@ -72,7 +72,7 @@ connection locker;
# Sleep a bit till the insert of connection reader is in work and hangs
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Locked" and info = "insert t1 select * from t2";
where state = "Table Lock" and info = "insert t1 select * from t2";
--source include/wait_condition.inc
drop table t2;
connection reader;
......@@ -251,7 +251,7 @@ connection reader;
# Wait till connection writer is blocked
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Locked" and info = "alter table t1 auto_increment=0";
where state = "Table Lock" and info = "alter table t1 auto_increment=0";
--source include/wait_condition.inc
send
alter table t1 auto_increment=0;
......@@ -259,7 +259,7 @@ connection locker;
# Wait till connection reader is blocked
let $wait_condition=
select count(*) = 2 from information_schema.processlist
where state = "Locked" and info = "alter table t1 auto_increment=0";
where state = "Table Lock" and info = "alter table t1 auto_increment=0";
--source include/wait_condition.inc
unlock tables;
connection writer;
......@@ -414,16 +414,16 @@ update t1 set i= 10;
connection reader;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Locked" and info = "update t1 set i= 10";
where state = "Table Lock" and info = "update t1 set i= 10";
--source include/wait_condition.inc
send
select * from t1;
connection default;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Locked" and info = "select * from t1";
where state = "Table Lock" and info = "select * from t1";
--source include/wait_condition.inc
let $ID= `select id from information_schema.processlist where state = "Locked" and info = "update t1 set i= 10"`;
let $ID= `select id from information_schema.processlist where state = "Table Lock" and info = "update t1 set i= 10"`;
--replace_result $ID ID
eval kill query $ID;
connection reader;
......@@ -557,7 +557,7 @@ connection waiter;
connection default;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
where state = "Locked" and info = "insert into t1 values(1)";
where state = "Table Lock" and info = "insert into t1 values(1)";
--source include/wait_condition.inc
let $tlwb= `show status like 'Table_locks_waited'`;
unlock tables;
......
mysql-test/suite/rpl/r/rpl_stop_slave.result
View file @ cb147b39
......@@ -38,6 +38,7 @@ STOP SLAVE SQL_THREAD;
[ On Slave1 ]
# To resume slave SQL thread
SET DEBUG_SYNC= 'now SIGNAL signal.continue';
SET DEBUG_SYNC= 'now WAIT_FOR signal.continued';
SET DEBUG_SYNC= 'RESET';
[ On Slave ]
......@@ -63,6 +64,7 @@ STOP SLAVE SQL_THREAD;
[ On Slave1 ]
# To resume slave SQL thread
SET DEBUG_SYNC= 'now SIGNAL signal.continue';
SET DEBUG_SYNC= 'now WAIT_FOR signal.continued';
SET DEBUG_SYNC= 'RESET';
[ On Slave ]
......@@ -89,6 +91,7 @@ STOP SLAVE SQL_THREAD;
[ On Slave1 ]
# To resume slave SQL thread
SET DEBUG_SYNC= 'now SIGNAL signal.continue';
SET DEBUG_SYNC= 'now WAIT_FOR signal.continued';
SET DEBUG_SYNC= 'RESET';
[ On Slave ]
......@@ -115,6 +118,7 @@ STOP SLAVE SQL_THREAD;
[ On Slave1 ]
# To resume slave SQL thread
SET DEBUG_SYNC= 'now SIGNAL signal.continue';
SET DEBUG_SYNC= 'now WAIT_FOR signal.continued';
SET DEBUG_SYNC= 'RESET';
[ On Slave ]
......
mysql-test/suite/rpl/t/rpl_deadlock_innodb.test
View file @ cb147b39
......@@ -7,5 +7,6 @@
########################################################
-- source include/not_ndb_default.inc
-- source include/have_innodb.inc
-- source include/long_test.inc
let $engine_type=innodb;
-- source extra/rpl_tests/rpl_deadlock.test
mysql-test/suite/rpl/t/rpl_row_sp003.test
View file @ cb147b39
This diff is collapsed.
mysql-test/suite/vcol/r/vcol_archive.result
View file @ cb147b39
This diff is collapsed.
mysql-test/suite/vcol/r/vcol_csv.result
View file @ cb147b39
This diff is collapsed.
mysql-test/suite/vcol/r/vcol_memory.result
View file @ cb147b39
This diff is collapsed.
mysql-test/suite/vcol/r/vcol_merge.result
View file @ cb147b39
This diff is collapsed.
mysql-test/suite/vcol/t/rpl_vcol.test
View file @ cb147b39
This diff is collapsed.
mysql-test/suite/vcol/t/vcol_csv.test
View file @ cb147b39
This diff is collapsed.
mysql-test/suite/vcol/t/vcol_merge.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/index_intersect.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/insert_notembedded.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/join.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/join_cache.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/join_outer.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/lock_multi.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/merge-big.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/multi_update.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/multi_update2.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/myisam_icp.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/pool_of_threads.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/query_cache.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/query_cache_28249.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/select_debug.test 0 → 100644
View file @ cb147b39
This diff is collapsed.
mysql-test/t/sp_notembedded.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/sp_sync.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/status.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/subselect.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/subselect4.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/table_elim.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/trigger_notembedded.test
View file @ cb147b39
This diff is collapsed.
mysql-test/t/variables-big.test
View file @ cb147b39
This diff is collapsed.
mysql-test/valgrind.supp
View file @ cb147b39
This diff is collapsed.
mysys/hash.c
View file @ cb147b39
This diff is collapsed.
mysys/my_handler_errors.h
View file @ cb147b39
This diff is collapsed.
mysys/thr_alarm.c
View file @ cb147b39
This diff is collapsed.
mysys/thr_lock.c
View file @ cb147b39
This diff is collapsed.
mysys/tree.c
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/AUTHORS 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/ChangeLog 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/Makefile.am 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/README 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/autogen.sh 0 → 100755
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/client/Makefile.am 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/client/hsclient.cpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/client/hspool_test.pl 0 → 100755
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/client/hstest.cpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/client/hstest.pl 0 → 100755
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/client/hstest_hs.sh 0 → 100755
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/client/hstest_hs_more50.sh 0 → 100755
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/client/hstest_md.sh 0 → 100755
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/client/hstest_my.sh 0 → 100755
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/client/hstest_my_more50.sh 0 → 100755
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/configure.ac 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/docs-en/about-handlersocket.en.txt 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/docs-en/configuration-options.en.txt 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/docs-en/installation.en.txt 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/docs-en/perl-client.en.txt 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/docs-en/protocol.en.txt 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/docs-ja/about-handlersocket.ja.txt 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/docs-ja/installation.ja.txt 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/docs-ja/perl-client.ja.txt 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/docs-ja/protocol.ja.txt 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/handlersocket/COPYRIGHT.txt 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/handlersocket/Makefile.am 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/handlersocket/Makefile.plain.template 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/handlersocket/database.cpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/handlersocket/database.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/handlersocket/handlersocket.cpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/handlersocket/hstcpsvr.cpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/handlersocket/hstcpsvr.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/handlersocket/hstcpsvr_worker.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/handlersocket/mysql_incl.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/COPYRIGHT.txt 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/Makefile.am 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/Makefile.plain 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/allocator.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/auto_addrinfo.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/auto_file.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/auto_ptrcontainer.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/config.cpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/config.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/escape.cpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/escape.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/fatal.cpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/fatal.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/hstcpcli.cpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/hstcpcli.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/libhsclient.spec.template 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/mutex.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/socket.cpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/socket.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/string_buffer.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/string_ref.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/string_util.cpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/string_util.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/thread.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/libhsclient/util.hpp 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/misc/microbench-hs.log 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/misc/microbench-my.log 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/perl-Net-HandlerSocket/COPYRIGHT.txt 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/perl-Net-HandlerSocket/Changes 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.xs 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/perl-Net-HandlerSocket/MANIFEST 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/perl-Net-HandlerSocket/README 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/perl-Net-HandlerSocket/ppport.h 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/perl-Net-HandlerSocket/t/HandlerSocket.t 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/plug.in 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/common/binary_my.cnf 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/common/compat.sh 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/common/hstest.pm 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/run.sh 0 → 100755
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test01.expected 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test01.pl 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test02.expected 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test02.pl 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test03.expected 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test03.pl 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test04.expected 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test04.pl 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test05.expected 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test05.pl 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test06.expected 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test06.pl 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test07.expected 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test07.pl 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test08.expected 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test08.pl 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test09.expected 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test09.pl 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test10.expected 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test10.pl 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test11.expected 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test11.pl 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test12.expected 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test12.pl 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test13.expected 0 → 100644
View file @ cb147b39
This diff is collapsed.
plugin/handler_socket/regtest/test_01_lib/test13.pl 0 → 100644
View file @ cb147b39
This diff is collapsed.
scripts/mysql_convert_table_format.sh
View file @ cb147b39
This diff is collapsed.
scripts/mysql_install_db.sh
View file @ cb147b39
This diff is collapsed.
sql-common/client.c
View file @ cb147b39
This diff is collapsed.
sql-common/client_plugin.c
View file @ cb147b39
This diff is collapsed.
sql-common/my_time.c
View file @ cb147b39
This diff is collapsed.
sql/CMakeLists.txt
View file @ cb147b39
This diff is collapsed.
sql/Makefile.am
View file @ cb147b39
This diff is collapsed.
sql/debug_sync.cc
View file @ cb147b39
This diff is collapsed.
sql/filesort.cc
View file @ cb147b39
This diff is collapsed.
sql/ha_partition.h
View file @ cb147b39
This diff is collapsed.
sql/handler.cc
View file @ cb147b39
This diff is collapsed.
sql/handler.h
View file @ cb147b39
This diff is collapsed.
sql/item.h
View file @ cb147b39
This diff is collapsed.
sql/item_func.cc
View file @ cb147b39
This diff is collapsed.
sql/item_func.h
View file @ cb147b39
This diff is collapsed.
sql/item_subselect.cc
View file @ cb147b39
This diff is collapsed.
sql/item_subselect.h
View file @ cb147b39
This diff is collapsed.
sql/lock.cc
View file @ cb147b39
This diff is collapsed.
sql/log.cc
View file @ cb147b39
This diff is collapsed.
sql/multi_range_read.cc
View file @ cb147b39
This diff is collapsed.
sql/mysql_priv.h
View file @ cb147b39
This diff is collapsed.
sql/mysqld.cc
View file @ cb147b39
This diff is collapsed.
sql/net_serv.cc
View file @ cb147b39
This diff is collapsed.
sql/opt_range.cc
View file @ cb147b39
This diff is collapsed.
sql/opt_range_mrr.cc
View file @ cb147b39
This diff is collapsed.
sql/share/errmsg.txt
View file @ cb147b39
This diff is collapsed.
sql/sql_base.cc
View file @ cb147b39
This diff is collapsed.
sql/sql_class.cc
View file @ cb147b39
This diff is collapsed.
sql/sql_class.h
View file @ cb147b39
This diff is collapsed.
sql/sql_db.cc
View file @ cb147b39
This diff is collapsed.
sql/sql_delete.cc
View file @ cb147b39
This diff is collapsed.
sql/sql_handler.cc
View file @ cb147b39
This diff is collapsed.
sql/sql_handler.h 0 → 100644
View file @ cb147b39
This diff is collapsed.
sql/sql_join_cache.cc
View file @ cb147b39
This diff is collapsed.
sql/sql_join_cache.h
View file @ cb147b39
This diff is collapsed.
sql/sql_lifo_buffer.h
View file @ cb147b39
This diff is collapsed.
sql/sql_parse.cc
View file @ cb147b39
This diff is collapsed.
sql/sql_prepare.cc
View file @ cb147b39
This diff is collapsed.
sql/sql_rename.cc
View file @ cb147b39
This diff is collapsed.
sql/sql_select.cc
View file @ cb147b39
This diff is collapsed.
sql/sql_select.h
View file @ cb147b39
This diff is collapsed.
sql/sql_show.cc
View file @ cb147b39
This diff is collapsed.
sql/sql_string.h
View file @ cb147b39
This diff is collapsed.
sql/sql_table.cc
View file @ cb147b39
This diff is collapsed.
sql/sql_test.cc
View file @ cb147b39
This diff is collapsed.
sql/sql_trigger.cc
View file @ cb147b39
This diff is collapsed.
sql/table.cc
View file @ cb147b39
This diff is collapsed.
sql/table.h
View file @ cb147b39
This diff is collapsed.
sql/uniques.cc
View file @ cb147b39
This diff is collapsed.
storage/federated/ha_federated.cc
View file @ cb147b39
This diff is collapsed.
storage/heap/ha_heap.cc
View file @ cb147b39
This diff is collapsed.
storage/heap/ha_heap.h
View file @ cb147b39
This diff is collapsed.
storage/heap/hp_clear.c
View file @ cb147b39
This diff is collapsed.
storage/heap/hp_delete.c
View file @ cb147b39
This diff is collapsed.
storage/heap/hp_rfirst.c
View file @ cb147b39
This diff is collapsed.
storage/heap/hp_rkey.c
View file @ cb147b39
This diff is collapsed.
storage/heap/hp_rlast.c
View file @ cb147b39
This diff is collapsed.
storage/heap/hp_rnext.c
View file @ cb147b39
This diff is collapsed.
storage/heap/hp_rprev.c
View file @ cb147b39
This diff is collapsed.
storage/heap/hp_rsame.c
View file @ cb147b39
This diff is collapsed.
storage/heap/hp_scan.c
View file @ cb147b39
This diff is collapsed.
storage/heap/hp_update.c
View file @ cb147b39
This diff is collapsed.
storage/heap/hp_write.c
View file @ cb147b39
This diff is collapsed.
storage/ibmdb2i/db2i_ioBuffers.h
View file @ cb147b39
This diff is collapsed.
storage/innodb_plugin/trx/trx0sys.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ha_maria.cc
View file @ cb147b39
This diff is collapsed.
storage/maria/ha_maria.h
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_bitmap.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_blockrec.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_blockrec.h
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_check.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_extra.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_ft_boolean_search.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_key.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_open.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_pagecache.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_pagecache.h
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_recovery.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_recovery.h
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_recovery_util.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_rkey.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_rnext.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_rnext_same.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_rprev.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_rsame.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_rt_index.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_search.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_sort.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_static.c
View file @ cb147b39
This diff is collapsed.
storage/maria/ma_unique.c
View file @ cb147b39
This diff is collapsed.
storage/maria/maria_def.h
View file @ cb147b39
This diff is collapsed.
storage/maria/maria_read_log.c
View file @ cb147b39
This diff is collapsed.
storage/myisam/ha_myisam.cc
View file @ cb147b39
This diff is collapsed.
storage/myisam/ha_myisam.h
View file @ cb147b39
This diff is collapsed.
storage/myisam/mi_extra.c
View file @ cb147b39
This diff is collapsed.
storage/myisam/mi_key.c
View file @ cb147b39
This diff is collapsed.
storage/myisam/mi_rkey.c
View file @ cb147b39
This diff is collapsed.
storage/myisam/mi_rnext.c
View file @ cb147b39
This diff is collapsed.
storage/myisam/mi_rnext_same.c
View file @ cb147b39
This diff is collapsed.
storage/myisam/mi_rprev.c
View file @ cb147b39
This diff is collapsed.
storage/myisam/mi_search.c
View file @ cb147b39
This diff is collapsed.
storage/myisam/mi_static.c
View file @ cb147b39
This diff is collapsed.
storage/myisam/myisamdef.h
View file @ cb147b39
This diff is collapsed.
storage/myisammrg/ha_myisammrg.cc
View file @ cb147b39
This diff is collapsed.
storage/ndb/include/ndbapi/NdbError.hpp
View file @ cb147b39
This diff is collapsed.
storage/ndb/include/util/File.hpp
View file @ cb147b39
This diff is collapsed.
storage/oqgraph/ha_oqgraph.cc
View file @ cb147b39
This diff is collapsed.
storage/pbxt/src/lock_xt.cc
View file @ cb147b39
This diff is collapsed.
storage/pbxt/src/memory_xt.h
View file @ cb147b39
This diff is collapsed.
storage/pbxt/src/table_xt.cc
View file @ cb147b39
This diff is collapsed.
storage/xtradb/buf/buf0buf.c
View file @ cb147b39
This diff is collapsed.
storage/xtradb/fil/fil0fil.c
View file @ cb147b39
This diff is collapsed.
storage/xtradb/handler/ha_innodb.cc
View file @ cb147b39
This diff is collapsed.
storage/xtradb/handler/ha_innodb.h
View file @ cb147b39
This diff is collapsed.
storage/xtradb/include/db0err.h
View file @ cb147b39
This diff is collapsed.
storage/xtradb/include/row0mysql.h
View file @ cb147b39
This diff is collapsed.
storage/xtradb/row/row0sel.c
View file @ cb147b39
This diff is collapsed.
storage/xtradb/trx/trx0sys.c
View file @ cb147b39
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7