Merge 10.3 into 10.4
This commit is contained in:
commit
2c3c851d2c
@ -1,5 +1,5 @@
|
|||||||
# Copyright (c) 2006, 2017, Oracle and/or its affiliates.
|
# Copyright (c) 2006, 2017, Oracle and/or its affiliates.
|
||||||
# Copyright (c) 2008, 2019, MariaDB Corporation.
|
# Copyright (c) 2008, 2020, MariaDB Corporation.
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
@ -245,6 +245,11 @@ INCLUDE(wsrep)
|
|||||||
INCLUDE(cpack_rpm)
|
INCLUDE(cpack_rpm)
|
||||||
INCLUDE(cpack_deb)
|
INCLUDE(cpack_deb)
|
||||||
|
|
||||||
|
OPTION(WITH_DBUG_TRACE "Enable DBUG_ENTER()/DBUG_EXIT()" ON)
|
||||||
|
IF(WITH_DBUG_TRACE)
|
||||||
|
ADD_DEFINITIONS(-DDBUG_TRACE)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
# Always enable debug sync for debug builds.
|
# Always enable debug sync for debug builds.
|
||||||
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
|
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
|
||||||
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
|
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
** master/autocommit code by Brian Aker <brian@tangent.org>
|
** master/autocommit code by Brian Aker <brian@tangent.org>
|
||||||
** SSL by
|
** SSL by
|
||||||
** Andrei Errapart <andreie@no.spam.ee>
|
** Andrei Errapart <andreie@no.spam.ee>
|
||||||
** Tõnu Samuel <tonu@please.do.not.remove.this.spam.ee>
|
** Tõnu Samuel <tonu@please.do.not.remove.this.spam.ee>
|
||||||
** XML by Gary Huntress <ghuntress@mediaone.net> 10/10/01, cleaned up
|
** XML by Gary Huntress <ghuntress@mediaone.net> 10/10/01, cleaned up
|
||||||
** and adapted to mysqldump 05/11/01 by Jani Tolonen
|
** and adapted to mysqldump 05/11/01 by Jani Tolonen
|
||||||
** Added --single-transaction option 06/06/2002 by Peter Zaitsev
|
** Added --single-transaction option 06/06/2002 by Peter Zaitsev
|
||||||
|
@ -4,6 +4,10 @@
|
|||||||
|
|
||||||
char *push1=0;
|
char *push1=0;
|
||||||
|
|
||||||
|
#ifndef DBUG_TRACE
|
||||||
|
#define DBUG_TRACE
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <my_global.h> /* This includes dbug.h */
|
#include <my_global.h> /* This includes dbug.h */
|
||||||
#include <my_sys.h>
|
#include <my_sys.h>
|
||||||
#include <my_pthread.h>
|
#include <my_pthread.h>
|
||||||
|
@ -29,6 +29,13 @@ extern ulong my_time_to_wait_for_lock;
|
|||||||
|
|
||||||
#if defined(HAVE_ALARM) && !defined(NO_ALARM_LOOP)
|
#if defined(HAVE_ALARM) && !defined(NO_ALARM_LOOP)
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
#ifdef HAVE_SIGHANDLER_T
|
||||||
|
#define sig_return sighandler_t
|
||||||
|
#elif defined(SOLARIS) || defined(__sun) || defined(__APPLE__)
|
||||||
|
typedef void (*sig_return)(int); /* Returns type from signal */
|
||||||
|
#else
|
||||||
|
typedef void (*sig_return)(void); /* Returns type from signal */
|
||||||
|
#endif
|
||||||
#define ALARM_VARIABLES uint alarm_old=0; \
|
#define ALARM_VARIABLES uint alarm_old=0; \
|
||||||
sig_return alarm_signal=0
|
sig_return alarm_signal=0
|
||||||
#define ALARM_INIT my_have_got_alarm=0 ; \
|
#define ALARM_INIT my_have_got_alarm=0 ; \
|
||||||
|
@ -67,6 +67,7 @@ extern void dbug_free_code_state(void **code_state_store);
|
|||||||
extern const char* _db_get_func_(void);
|
extern const char* _db_get_func_(void);
|
||||||
extern int (*dbug_sanity)(void);
|
extern int (*dbug_sanity)(void);
|
||||||
|
|
||||||
|
#ifdef DBUG_TRACE
|
||||||
#define DBUG_LEAVE do { \
|
#define DBUG_LEAVE do { \
|
||||||
_db_stack_frame_.line= __LINE__; \
|
_db_stack_frame_.line= __LINE__; \
|
||||||
_db_return_ (&_db_stack_frame_); \
|
_db_return_ (&_db_stack_frame_); \
|
||||||
@ -85,6 +86,13 @@ extern int (*dbug_sanity)(void);
|
|||||||
#define DBUG_VOID_RETURN do {DBUG_LEAVE; return;} while(0)
|
#define DBUG_VOID_RETURN do {DBUG_LEAVE; return;} while(0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#else
|
||||||
|
#define DBUG_LEAVE
|
||||||
|
#define DBUG_ENTER(a)
|
||||||
|
#define DBUG_RETURN(a1) return(a1)
|
||||||
|
#define DBUG_VOID_RETURN return
|
||||||
|
#endif
|
||||||
|
|
||||||
#define DBUG_EXECUTE(keyword,a1) \
|
#define DBUG_EXECUTE(keyword,a1) \
|
||||||
do {if (_db_keyword_(0, (keyword), 0)) { a1 }} while(0)
|
do {if (_db_keyword_(0, (keyword), 0)) { a1 }} while(0)
|
||||||
#define DBUG_EXECUTE_IF(keyword,a1) \
|
#define DBUG_EXECUTE_IF(keyword,a1) \
|
||||||
|
@ -561,13 +561,6 @@ typedef int my_socket; /* File descriptor for sockets */
|
|||||||
#endif
|
#endif
|
||||||
/* Type for functions that handles signals */
|
/* Type for functions that handles signals */
|
||||||
#define sig_handler RETSIGTYPE
|
#define sig_handler RETSIGTYPE
|
||||||
C_MODE_START
|
|
||||||
#ifdef HAVE_SIGHANDLER_T
|
|
||||||
#define sig_return sighandler_t
|
|
||||||
#else
|
|
||||||
typedef void (*sig_return)(void); /* Returns type from signal */
|
|
||||||
#endif
|
|
||||||
C_MODE_END
|
|
||||||
#if defined(__GNUC__) && !defined(_lint)
|
#if defined(__GNUC__) && !defined(_lint)
|
||||||
typedef char pchar; /* Mixed prototypes can take char */
|
typedef char pchar; /* Mixed prototypes can take char */
|
||||||
typedef char puchar; /* Mixed prototypes can take char */
|
typedef char puchar; /* Mixed prototypes can take char */
|
||||||
|
@ -53,7 +53,7 @@ typedef struct st_queue {
|
|||||||
#define queue_top(queue) ((queue)->root[1])
|
#define queue_top(queue) ((queue)->root[1])
|
||||||
#define queue_element(queue,index) ((queue)->root[index])
|
#define queue_element(queue,index) ((queue)->root[index])
|
||||||
#define queue_end(queue) ((queue)->root[(queue)->elements])
|
#define queue_end(queue) ((queue)->root[(queue)->elements])
|
||||||
#define queue_replace_top(queue) _downheap(queue, 1, (queue)->root[1])
|
#define queue_replace_top(queue) _downheap(queue, 1)
|
||||||
#define queue_set_cmp_arg(queue, set_arg) (queue)->first_cmp_arg= set_arg
|
#define queue_set_cmp_arg(queue, set_arg) (queue)->first_cmp_arg= set_arg
|
||||||
#define queue_set_max_at_top(queue, set_arg) \
|
#define queue_set_max_at_top(queue, set_arg) \
|
||||||
(queue)->max_at_top= set_arg ? -1 : 1
|
(queue)->max_at_top= set_arg ? -1 : 1
|
||||||
@ -61,23 +61,23 @@ typedef struct st_queue {
|
|||||||
typedef int (*queue_compare)(void *,uchar *, uchar *);
|
typedef int (*queue_compare)(void *,uchar *, uchar *);
|
||||||
|
|
||||||
int init_queue(QUEUE *queue,uint max_elements,uint offset_to_key,
|
int init_queue(QUEUE *queue,uint max_elements,uint offset_to_key,
|
||||||
pbool max_at_top, queue_compare compare,
|
my_bool max_at_top, queue_compare compare,
|
||||||
void *first_cmp_arg, uint offset_to_queue_pos,
|
void *first_cmp_arg, uint offset_to_queue_pos,
|
||||||
uint auto_extent);
|
uint auto_extent);
|
||||||
int reinit_queue(QUEUE *queue,uint max_elements,uint offset_to_key,
|
int reinit_queue(QUEUE *queue,uint max_elements,uint offset_to_key,
|
||||||
pbool max_at_top, queue_compare compare,
|
my_bool max_at_top, queue_compare compare,
|
||||||
void *first_cmp_arg, uint offset_to_queue_pos,
|
void *first_cmp_arg, uint offset_to_queue_pos,
|
||||||
uint auto_extent);
|
uint auto_extent);
|
||||||
int resize_queue(QUEUE *queue, uint max_elements);
|
int resize_queue(QUEUE *queue, uint max_elements);
|
||||||
void delete_queue(QUEUE *queue);
|
void delete_queue(QUEUE *queue);
|
||||||
void queue_insert(QUEUE *queue,uchar *element);
|
void queue_insert(QUEUE *queue, uchar *element);
|
||||||
int queue_insert_safe(QUEUE *queue, uchar *element);
|
int queue_insert_safe(QUEUE *queue, uchar *element);
|
||||||
uchar *queue_remove(QUEUE *queue,uint idx);
|
uchar *queue_remove(QUEUE *queue,uint idx);
|
||||||
void queue_replace(QUEUE *queue,uint idx);
|
void queue_replace(QUEUE *queue,uint idx);
|
||||||
|
|
||||||
#define queue_remove_all(queue) { (queue)->elements= 0; }
|
#define queue_remove_all(queue) { (queue)->elements= 0; }
|
||||||
#define queue_is_full(queue) (queue->elements == queue->max_elements)
|
#define queue_is_full(queue) (queue->elements == queue->max_elements)
|
||||||
void _downheap(QUEUE *queue, uint idx, uchar *element);
|
void _downheap(QUEUE *queue, uint idx);
|
||||||
void queue_fix(QUEUE *queue);
|
void queue_fix(QUEUE *queue);
|
||||||
#define is_queue_inited(queue) ((queue)->root != 0)
|
#define is_queue_inited(queue) ((queue)->root != 0)
|
||||||
|
|
||||||
|
@ -150,6 +150,9 @@ typedef my_socket YASSL_SOCKET_T;
|
|||||||
#include <openssl/ssl.h>
|
#include <openssl/ssl.h>
|
||||||
#undef Timeval
|
#undef Timeval
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
|
#ifdef DEPRECATED
|
||||||
|
#undef DEPRECATED
|
||||||
|
#endif
|
||||||
|
|
||||||
enum enum_ssl_init_error
|
enum enum_ssl_init_error
|
||||||
{
|
{
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 1768cb6c322d403c1e372b368cc3c23b660b7930
|
Subproject commit ca8f94f727dba19a6ac43691df53fdc829e2124e
|
@ -206,7 +206,7 @@ int main(int argc, const char** argv )
|
|||||||
} else {
|
} else {
|
||||||
if (strcmp(arg, "--verbose") == 0)
|
if (strcmp(arg, "--verbose") == 0)
|
||||||
verbose++;
|
verbose++;
|
||||||
else if (strncmp(arg, "--parent-pid", 10) == 0)
|
else if (strncmp(arg, "--parent-pid", 12) == 0)
|
||||||
{
|
{
|
||||||
/* Override parent_pid with a value provided by user */
|
/* Override parent_pid with a value provided by user */
|
||||||
const char* start;
|
const char* start;
|
||||||
|
@ -405,7 +405,7 @@ c int(11) YES NULL
|
|||||||
explain select * from t1,t2 where t1.b = t2.c and t1.c = t2.b;
|
explain select * from t1,t2 where t1.b = t2.c and t1.c = t2.b;
|
||||||
id select_type table type possible_keys key key_len ref rows Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t2 ALL NULL NULL NULL NULL 10 Using where
|
1 SIMPLE t2 ALL NULL NULL NULL NULL 10 Using where
|
||||||
1 SIMPLE t1 ref b,c b 5 test.t2.c 1 Using where
|
1 SIMPLE t1 eq_ref b,c b 5 test.t2.c 1 Using where
|
||||||
select * from t1,t2 where t1.b = t2.c and t1.c = t2.b;
|
select * from t1,t2 where t1.b = t2.c and t1.c = t2.b;
|
||||||
a a b c
|
a a b c
|
||||||
1 1 1 1
|
1 1 1 1
|
||||||
|
@ -3340,11 +3340,11 @@ show keys from t1;
|
|||||||
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
|
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
|
||||||
t1 0 PRIMARY 1 pk A 1010 NULL NULL BTREE
|
t1 0 PRIMARY 1 pk A 1010 NULL NULL BTREE
|
||||||
t1 0 a 1 a A 1010 NULL NULL YES BTREE
|
t1 0 a 1 a A 1010 NULL NULL YES BTREE
|
||||||
# t1 must use ref(t1.a=t0.a) and rows must be 1 (and not 45):
|
# t1 must use eq_ref(t1.a=t0.a) and rows must be 1 (and not 45):
|
||||||
explain select * from t0,t1 where t0.a=t1.a;
|
explain select * from t0,t1 where t0.a=t1.a;
|
||||||
id select_type table type possible_keys key key_len ref rows Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t0 ALL NULL NULL NULL NULL 10 Using where
|
1 SIMPLE t0 ALL NULL NULL NULL NULL 10 Using where
|
||||||
1 SIMPLE t1 ref a a 5 test.t0.a 1
|
1 SIMPLE t1 eq_ref a a 5 test.t0.a 1
|
||||||
drop table t0,t1;
|
drop table t0,t1;
|
||||||
#
|
#
|
||||||
# MDEV-21383: Possible range plan is not used under certain conditions
|
# MDEV-21383: Possible range plan is not used under certain conditions
|
||||||
|
@ -1745,7 +1745,7 @@ analyze table t1;
|
|||||||
set myisam_stats_method=@tmp1;
|
set myisam_stats_method=@tmp1;
|
||||||
show keys from t1;
|
show keys from t1;
|
||||||
|
|
||||||
--echo # t1 must use ref(t1.a=t0.a) and rows must be 1 (and not 45):
|
--echo # t1 must use eq_ref(t1.a=t0.a) and rows must be 1 (and not 45):
|
||||||
explain select * from t0,t1 where t0.a=t1.a;
|
explain select * from t0,t1 where t0.a=t1.a;
|
||||||
|
|
||||||
drop table t0,t1;
|
drop table t0,t1;
|
||||||
|
@ -643,3 +643,45 @@ SHOW STATUS LIKE 'Last_query_cost';
|
|||||||
Variable_name Value
|
Variable_name Value
|
||||||
Last_query_cost 14.199000
|
Last_query_cost 14.199000
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
#
|
||||||
|
# MDEV-21480: Unique key using ref access though eq_ref access can be used
|
||||||
|
#
|
||||||
|
create table t1(a int, b int,c int, primary key(a), unique key(b,c));
|
||||||
|
insert into t1 select seq, seq, seq from seq_1_to_10;
|
||||||
|
create table t2(a int, b int,c int);
|
||||||
|
insert into t2 select seq, seq, seq+1 from seq_1_to_100;
|
||||||
|
EXPLAIN SELECT t1.c, t2.c FROM t1, t2 WHERE t1.b=t2.a and t1.c=t2.b;
|
||||||
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
|
1 SIMPLE t2 ALL NULL NULL NULL NULL 100 Using where
|
||||||
|
1 SIMPLE t1 eq_ref b b 10 test.t2.a,test.t2.b 1 Using index
|
||||||
|
SELECT t1.c, t2.c FROM t1, t2 WHERE t1.b=t2.a and t1.c=t2.b;
|
||||||
|
c c
|
||||||
|
1 2
|
||||||
|
2 3
|
||||||
|
3 4
|
||||||
|
4 5
|
||||||
|
5 6
|
||||||
|
6 7
|
||||||
|
7 8
|
||||||
|
8 9
|
||||||
|
9 10
|
||||||
|
10 11
|
||||||
|
alter table t1 drop PRIMARY KEY;
|
||||||
|
alter table t1 add PRIMARY KEY(b,c);
|
||||||
|
EXPLAIN SELECT t1.c, t2.c FROM t1, t2 WHERE t1.b=t2.a and t1.c=t2.b;
|
||||||
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
|
1 SIMPLE t2 ALL NULL NULL NULL NULL 100 Using where
|
||||||
|
1 SIMPLE t1 eq_ref PRIMARY,b PRIMARY 8 test.t2.a,test.t2.b 1 Using index
|
||||||
|
SELECT t1.c, t2.c FROM t1, t2 WHERE t1.b=t2.a and t1.c=t2.b;
|
||||||
|
c c
|
||||||
|
1 2
|
||||||
|
2 3
|
||||||
|
3 4
|
||||||
|
4 5
|
||||||
|
5 6
|
||||||
|
6 7
|
||||||
|
7 8
|
||||||
|
8 9
|
||||||
|
9 10
|
||||||
|
10 11
|
||||||
|
drop table t1,t2;
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
--disable_warnings
|
--disable_warnings
|
||||||
drop table if exists t1,t2,t3;
|
drop table if exists t1,t2,t3;
|
||||||
--enable_warnings
|
--enable_warnings
|
||||||
|
--source include/have_sequence.inc
|
||||||
SET SQL_WARNINGS=1;
|
SET SQL_WARNINGS=1;
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -582,3 +583,23 @@ EXPLAIN SELECT a, SUM( b ) FROM t1 FORCE INDEX( a ) GROUP BY a;
|
|||||||
SHOW STATUS LIKE 'Last_query_cost';
|
SHOW STATUS LIKE 'Last_query_cost';
|
||||||
|
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
--echo #
|
||||||
|
--echo # MDEV-21480: Unique key using ref access though eq_ref access can be used
|
||||||
|
--echo #
|
||||||
|
|
||||||
|
create table t1(a int, b int,c int, primary key(a), unique key(b,c));
|
||||||
|
insert into t1 select seq, seq, seq from seq_1_to_10;
|
||||||
|
|
||||||
|
create table t2(a int, b int,c int);
|
||||||
|
insert into t2 select seq, seq, seq+1 from seq_1_to_100;
|
||||||
|
|
||||||
|
EXPLAIN SELECT t1.c, t2.c FROM t1, t2 WHERE t1.b=t2.a and t1.c=t2.b;
|
||||||
|
SELECT t1.c, t2.c FROM t1, t2 WHERE t1.b=t2.a and t1.c=t2.b;
|
||||||
|
|
||||||
|
alter table t1 drop PRIMARY KEY;
|
||||||
|
alter table t1 add PRIMARY KEY(b,c);
|
||||||
|
EXPLAIN SELECT t1.c, t2.c FROM t1, t2 WHERE t1.b=t2.a and t1.c=t2.b;
|
||||||
|
SELECT t1.c, t2.c FROM t1, t2 WHERE t1.b=t2.a and t1.c=t2.b;
|
||||||
|
|
||||||
|
drop table t1,t2;
|
||||||
|
@ -1589,7 +1589,7 @@ WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE'
|
|||||||
ORDER BY t2.c LIMIT 1;
|
ORDER BY t2.c LIMIT 1;
|
||||||
id select_type table type possible_keys key key_len ref rows Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t2 range a,b,c c 5 NULL 420 Using where
|
1 SIMPLE t2 range a,b,c c 5 NULL 420 Using where
|
||||||
1 SIMPLE t1 ref a a 39 test.t2.a,const 1 Using where; Using index
|
1 SIMPLE t1 eq_ref a a 39 test.t2.a,const 1 Using where; Using index
|
||||||
SELECT d FROM t3 AS t1, t2 AS t2
|
SELECT d FROM t3 AS t1, t2 AS t2
|
||||||
WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE'
|
WHERE t2.b=14 AND t2.a=t1.a AND 5.1<t2.c AND t1.b='DE'
|
||||||
ORDER BY t2.c LIMIT 1;
|
ORDER BY t2.c LIMIT 1;
|
||||||
|
@ -69,7 +69,7 @@ t4.b=t0.a and t4.a in (select max(t2.a) from t1, t2 group by t2.b);
|
|||||||
id select_type table type possible_keys key key_len ref rows Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 5
|
1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 5
|
||||||
1 PRIMARY t0 ALL NULL NULL NULL NULL 10 Using where; Using join buffer (flat, BNL join)
|
1 PRIMARY t0 ALL NULL NULL NULL NULL 10 Using where; Using join buffer (flat, BNL join)
|
||||||
1 PRIMARY t4 ref a a 10 <subquery2>.max(t2.a),test.t0.a 1
|
1 PRIMARY t4 eq_ref a a 10 <subquery2>.max(t2.a),test.t0.a 1
|
||||||
2 MATERIALIZED t2 ALL NULL NULL NULL NULL 5 Using temporary
|
2 MATERIALIZED t2 ALL NULL NULL NULL NULL 5 Using temporary
|
||||||
2 MATERIALIZED t1 ALL NULL NULL NULL NULL 10 Using join buffer (flat, BNL join)
|
2 MATERIALIZED t1 ALL NULL NULL NULL NULL 10 Using join buffer (flat, BNL join)
|
||||||
insert into t4 select 100 + (B.a *100 + A.a), 100 + (B.a*100 + A.a), 'filler' from t4 A, t0 B;
|
insert into t4 select 100 + (B.a *100 + A.a), 100 + (B.a*100 + A.a), 'filler' from t4 A, t0 B;
|
||||||
@ -79,7 +79,7 @@ t4.b in (select max(t2.a) from t1, t2 group by t2.b);
|
|||||||
id select_type table type possible_keys key key_len ref rows Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 PRIMARY <subquery3> ALL distinct_key NULL NULL NULL 5
|
1 PRIMARY <subquery3> ALL distinct_key NULL NULL NULL 5
|
||||||
1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 5 Using join buffer (flat, BNL join)
|
1 PRIMARY <subquery2> ALL distinct_key NULL NULL NULL 5 Using join buffer (flat, BNL join)
|
||||||
1 PRIMARY t4 ref a a 10 <subquery2>.max(t2.a),<subquery3>.max(t2.a) 1
|
1 PRIMARY t4 eq_ref a a 10 <subquery2>.max(t2.a),<subquery3>.max(t2.a) 1
|
||||||
3 MATERIALIZED t2 ALL NULL NULL NULL NULL 5 Using temporary
|
3 MATERIALIZED t2 ALL NULL NULL NULL NULL 5 Using temporary
|
||||||
3 MATERIALIZED t1 ALL NULL NULL NULL NULL 10 Using join buffer (flat, BNL join)
|
3 MATERIALIZED t1 ALL NULL NULL NULL NULL 10 Using join buffer (flat, BNL join)
|
||||||
2 MATERIALIZED t2 ALL NULL NULL NULL NULL 5 Using temporary
|
2 MATERIALIZED t2 ALL NULL NULL NULL NULL 5 Using temporary
|
||||||
|
@ -279,7 +279,7 @@ insert into t2 values
|
|||||||
explain select t1.* from t1 left join t2 on t2.a=t1.a;
|
explain select t1.* from t1 left join t2 on t2.a=t1.a;
|
||||||
id select_type table type possible_keys key key_len ref rows Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 index NULL PRIMARY 10 NULL 2 Using index
|
1 SIMPLE t1 index NULL PRIMARY 10 NULL 2 Using index
|
||||||
1 SIMPLE t2 ref a a 3 test.t1.a 1 Using where
|
1 SIMPLE t2 eq_ref a a 3 test.t1.a 1 Using where
|
||||||
drop table t1, t2;
|
drop table t1, t2;
|
||||||
#
|
#
|
||||||
# check UPDATE/DELETE that look like they could be eliminated
|
# check UPDATE/DELETE that look like they could be eliminated
|
||||||
|
@ -373,6 +373,32 @@ my $opt_stop_keep_alive= $ENV{MTR_STOP_KEEP_ALIVE};
|
|||||||
select(STDOUT);
|
select(STDOUT);
|
||||||
$| = 1; # Automatically flush STDOUT
|
$| = 1; # Automatically flush STDOUT
|
||||||
|
|
||||||
|
my $set_titlebar;
|
||||||
|
|
||||||
|
|
||||||
|
BEGIN {
|
||||||
|
if (IS_WINDOWS) {
|
||||||
|
my $have_win32_console= 0;
|
||||||
|
eval {
|
||||||
|
require Win32::Console;
|
||||||
|
Win32::Console->import();
|
||||||
|
$have_win32_console = 1;
|
||||||
|
};
|
||||||
|
eval 'sub HAVE_WIN32_CONSOLE { $have_win32_console }';
|
||||||
|
} else {
|
||||||
|
sub HAVE_WIN32_CONSOLE { 0 };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (-t STDOUT) {
|
||||||
|
if (IS_WINDOWS and HAVE_WIN32_CONSOLE) {
|
||||||
|
$set_titlebar = sub {Win32::Console::Title $_[0];};
|
||||||
|
} elsif (defined $ENV{TERM} and $ENV{TERM} =~ /xterm/) {
|
||||||
|
$set_titlebar = sub { print "\e];$_[0]\a"; };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
main();
|
main();
|
||||||
|
|
||||||
sub main {
|
sub main {
|
||||||
@ -878,7 +904,7 @@ sub run_test_server ($$$) {
|
|||||||
delete $next->{reserved};
|
delete $next->{reserved};
|
||||||
}
|
}
|
||||||
|
|
||||||
xterm_stat(scalar(@$tests));
|
titlebar_stat(scalar(@$tests)) if $set_titlebar;
|
||||||
|
|
||||||
if ($next) {
|
if ($next) {
|
||||||
# We don't need this any more
|
# We don't need this any more
|
||||||
@ -6521,19 +6547,16 @@ sub time_format($) {
|
|||||||
|
|
||||||
our $num_tests;
|
our $num_tests;
|
||||||
|
|
||||||
sub xterm_stat {
|
sub titlebar_stat {
|
||||||
if (-t STDOUT and defined $ENV{TERM} and $ENV{TERM} =~ /xterm/) {
|
my ($left) = @_;
|
||||||
my ($left) = @_;
|
|
||||||
|
|
||||||
# 2.5 -> best by test
|
# 2.5 -> best by test
|
||||||
$num_tests = $left + 2.5 unless $num_tests;
|
$num_tests = $left + 2.5 unless $num_tests;
|
||||||
|
|
||||||
my $done = $num_tests - $left;
|
my $done = $num_tests - $left;
|
||||||
my $spent = time - $^T;
|
my $spent = time - $^T;
|
||||||
|
|
||||||
syswrite STDOUT, sprintf
|
&$set_titlebar(sprintf "mtr: spent %s on %d tests. %s (%d tests) left",
|
||||||
"\e];mtr: spent %s on %d tests. %s (%d tests) left\a",
|
|
||||||
time_format($spent), $done,
|
time_format($spent), $done,
|
||||||
time_format($spent/$done * $left), $left;
|
time_format($spent/$done * $left), $left);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,6 @@ galera_kill_nochanges : MDEV-18280 Galera test failure on galera_split_brain and
|
|||||||
galera_load_data : MDEV-19968 galera.galera_load_data
|
galera_load_data : MDEV-19968 galera.galera_load_data
|
||||||
galera_many_tables_nopk : MDEV-18182 Galera test failure on galera.galera_many_tables_nopk
|
galera_many_tables_nopk : MDEV-18182 Galera test failure on galera.galera_many_tables_nopk
|
||||||
galera_mdl_race : MDEV-21524 galera.galera_mdl_race
|
galera_mdl_race : MDEV-21524 galera.galera_mdl_race
|
||||||
galera_parallel_autoinc_largetrx : MDEV-20916 galera.galera_parallel_autoinc_largetrx
|
|
||||||
galera_parallel_simple : MDEV-20318 galera.galera_parallel_simple fails
|
galera_parallel_simple : MDEV-20318 galera.galera_parallel_simple fails
|
||||||
galera_pc_ignore_sb : MDEV-20888 galera.galera_pc_ignore_sb
|
galera_pc_ignore_sb : MDEV-20888 galera.galera_pc_ignore_sb
|
||||||
galera_shutdown_nonprim : MDEV-21493 galera.galera_shutdown_nonprim
|
galera_shutdown_nonprim : MDEV-21493 galera.galera_shutdown_nonprim
|
||||||
|
@ -29,11 +29,11 @@ COUNT(DISTINCT f1)
|
|||||||
30000
|
30000
|
||||||
connection node_2;
|
connection node_2;
|
||||||
disconnect node_1a;
|
disconnect node_1a;
|
||||||
SELECT COUNT(*) FROM t1;
|
SELECT COUNT(*) AS EXPECT_30000 FROM t1;
|
||||||
COUNT(*)
|
EXPECT_30000
|
||||||
30000
|
30000
|
||||||
SELECT COUNT(DISTINCT f1) FROM t1;
|
SELECT COUNT(DISTINCT f1) AS EXPECT_30000 FROM t1;
|
||||||
COUNT(DISTINCT f1)
|
EXPECT_30000
|
||||||
30000
|
30000
|
||||||
connection default;
|
connection default;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
@ -53,10 +53,12 @@ SELECT COUNT(DISTINCT f1) FROM t1;
|
|||||||
--connection node_2
|
--connection node_2
|
||||||
--reap
|
--reap
|
||||||
--disconnect node_1a
|
--disconnect node_1a
|
||||||
--let $wait_condition = select count(*)=30000 from t1;
|
|
||||||
|
--let $wait_condition = SELECT COUNT(*) = 30000 FROM t1;
|
||||||
--source include/wait_condition.inc
|
--source include/wait_condition.inc
|
||||||
SELECT COUNT(*) FROM t1;
|
|
||||||
SELECT COUNT(DISTINCT f1) FROM t1;
|
SELECT COUNT(*) AS EXPECT_30000 FROM t1;
|
||||||
|
SELECT COUNT(DISTINCT f1) AS EXPECT_30000 FROM t1;
|
||||||
|
|
||||||
--disable_query_log
|
--disable_query_log
|
||||||
--eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;
|
--eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;
|
||||||
|
@ -80,7 +80,7 @@ a b c
|
|||||||
explain select * from t1 where b in (select c from t3);
|
explain select * from t1 where b in (select c from t3);
|
||||||
id select_type table type possible_keys key key_len ref rows Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 PRIMARY t1 ALL NULL NULL NULL NULL 5 Using where
|
1 PRIMARY t1 ALL NULL NULL NULL NULL 5 Using where
|
||||||
1 PRIMARY t3 ref c c 5 test.t1.b 1 Using index
|
1 PRIMARY t3 eq_ref c c 5 test.t1.b 1 Using index
|
||||||
# select_type=PRIMARY, type=range,ref
|
# select_type=PRIMARY, type=range,ref
|
||||||
select * from t1 where c in (select c from t3 where c between -2 and -1);
|
select * from t1 where c in (select c from t3 where c between -2 and -1);
|
||||||
a b c
|
a b c
|
||||||
|
@ -80,7 +80,7 @@ a b c
|
|||||||
explain select * from t1 where b in (select c from t3);
|
explain select * from t1 where b in (select c from t3);
|
||||||
id select_type table type possible_keys key key_len ref rows Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 PRIMARY t1 ALL NULL NULL NULL NULL 5 Using where
|
1 PRIMARY t1 ALL NULL NULL NULL NULL 5 Using where
|
||||||
1 PRIMARY t3 ref c c 5 test.t1.b 1 Using index
|
1 PRIMARY t3 eq_ref c c 5 test.t1.b 1 Using index
|
||||||
# select_type=PRIMARY, type=range,ref
|
# select_type=PRIMARY, type=range,ref
|
||||||
select * from t1 where c in (select c from t3 where c between -2 and -1);
|
select * from t1 where c in (select c from t3 where c between -2 and -1);
|
||||||
a b c
|
a b c
|
||||||
@ -1110,7 +1110,7 @@ id select_type table type possible_keys key key_len ref rows Extra
|
|||||||
EXPLAIN SELECT * FROM t1 AS t2 STRAIGHT_JOIN t1 FORCE INDEX(b) WHERE t1.b=t2.b;
|
EXPLAIN SELECT * FROM t1 AS t2 STRAIGHT_JOIN t1 FORCE INDEX(b) WHERE t1.b=t2.b;
|
||||||
id select_type table type possible_keys key key_len ref rows Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t2 ALL b NULL NULL NULL 2 Using where
|
1 SIMPLE t2 ALL b NULL NULL NULL 2 Using where
|
||||||
1 SIMPLE t1 ref b b 5 test.t2.b 1
|
1 SIMPLE t1 eq_ref b b 5 test.t2.b 1
|
||||||
EXPLAIN SELECT b FROM t1 FORCE INDEX(b);
|
EXPLAIN SELECT b FROM t1 FORCE INDEX(b);
|
||||||
id select_type table type possible_keys key key_len ref rows Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 SIMPLE t1 index NULL b 5 NULL 2 Using index
|
1 SIMPLE t1 index NULL b 5 NULL 2 Using index
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- alter_algorithm.result
|
--- alter_algorithm.result 2020-04-30 21:39:48.923115511 +0530
|
||||||
+++ alter_algorithm.reject
|
+++ alter_algorithm.reject 2020-04-30 21:45:04.131642093 +0530
|
||||||
@@ -7,40 +7,40 @@
|
@@ -7,43 +7,43 @@
|
||||||
INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1);
|
INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1);
|
||||||
SELECT @@alter_algorithm;
|
SELECT @@alter_algorithm;
|
||||||
@@alter_algorithm
|
@@alter_algorithm
|
||||||
@ -54,11 +54,16 @@
|
|||||||
-affected rows: 1
|
-affected rows: 1
|
||||||
-info: Records: 1 Duplicates: 0 Warnings: 0
|
-info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
+affected rows: 0
|
+affected rows: 0
|
||||||
|
+info: Records: 0 Duplicates: 0 Warnings: 0
|
||||||
|
ALTER TABLE t1 FORCE, ALGORITHM=DEFAULT;
|
||||||
|
-affected rows: 1
|
||||||
|
-info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
|
+affected rows: 0
|
||||||
+info: Records: 0 Duplicates: 0 Warnings: 0
|
+info: Records: 0 Duplicates: 0 Warnings: 0
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
affected rows: 0
|
affected rows: 0
|
||||||
CREATE TABLE t1(f1 INT PRIMARY KEY, f2 INT NOT NULL,
|
CREATE TABLE t1(f1 INT PRIMARY KEY, f2 INT NOT NULL,
|
||||||
@@ -53,22 +53,22 @@
|
@@ -56,22 +56,22 @@
|
||||||
FOREIGN KEY fidx(f1) REFERENCES t1(f1))ENGINE=INNODB;
|
FOREIGN KEY fidx(f1) REFERENCES t1(f1))ENGINE=INNODB;
|
||||||
INSERT INTO t1(f1, f2, f4, f5) VALUES(1, 2, 3, 4);
|
INSERT INTO t1(f1, f2, f4, f5) VALUES(1, 2, 3, 4);
|
||||||
ALTER TABLE t1 ADD INDEX idx1(f4), page_compressed=1;
|
ALTER TABLE t1 ADD INDEX idx1(f4), page_compressed=1;
|
||||||
@ -91,7 +96,7 @@
|
|||||||
DROP TABLE t2, t1;
|
DROP TABLE t2, t1;
|
||||||
affected rows: 0
|
affected rows: 0
|
||||||
CREATE TABLE t1(f1 INT NOT NULL,
|
CREATE TABLE t1(f1 INT NOT NULL,
|
||||||
@@ -81,27 +81,27 @@
|
@@ -84,28 +84,27 @@
|
||||||
INSERT INTO t1(f1, f2) VALUES(1, 1);
|
INSERT INTO t1(f1, f2) VALUES(1, 1);
|
||||||
# Add column at the end of the table
|
# Add column at the end of the table
|
||||||
ALTER TABLE t1 ADD COLUMN f4 char(100) default 'BIG WALL';
|
ALTER TABLE t1 ADD COLUMN f4 char(100) default 'BIG WALL';
|
||||||
@ -119,7 +124,9 @@
|
|||||||
+info: Records: 0 Duplicates: 0 Warnings: 0
|
+info: Records: 0 Duplicates: 0 Warnings: 0
|
||||||
# Rename table
|
# Rename table
|
||||||
ALTER TABLE t1 RENAME t3;
|
ALTER TABLE t1 RENAME t3;
|
||||||
affected rows: 0
|
-affected rows: 1
|
||||||
|
-info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
|
+affected rows: 0
|
||||||
# Drop Virtual Column
|
# Drop Virtual Column
|
||||||
ALTER TABLE t3 DROP COLUMN vcol;
|
ALTER TABLE t3 DROP COLUMN vcol;
|
||||||
-affected rows: 1
|
-affected rows: 1
|
||||||
@ -129,7 +136,7 @@
|
|||||||
# Column length varies
|
# Column length varies
|
||||||
ALTER TABLE t2 CHANGE f3 f3 VARCHAR(20);
|
ALTER TABLE t2 CHANGE f3 f3 VARCHAR(20);
|
||||||
affected rows: 0
|
affected rows: 0
|
||||||
@@ -109,12 +109,12 @@
|
@@ -113,12 +112,12 @@
|
||||||
SET foreign_key_checks = 0;
|
SET foreign_key_checks = 0;
|
||||||
affected rows: 0
|
affected rows: 0
|
||||||
ALTER TABLE t3 ADD FOREIGN KEY fidx(f2) REFERENCES t2(f1);
|
ALTER TABLE t3 ADD FOREIGN KEY fidx(f2) REFERENCES t2(f1);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- alter_algorithm.result
|
--- alter_algorithm.result 2020-04-30 21:39:48.923115511 +0530
|
||||||
+++ alter_algorithm.reject
|
+++ alter_algorithm.reject 2020-04-30 21:47:08.245465018 +0530
|
||||||
@@ -7,40 +7,32 @@
|
@@ -7,43 +7,35 @@
|
||||||
INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1);
|
INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1);
|
||||||
SELECT @@alter_algorithm;
|
SELECT @@alter_algorithm;
|
||||||
@@alter_algorithm
|
@@alter_algorithm
|
||||||
@ -47,10 +47,15 @@
|
|||||||
-affected rows: 1
|
-affected rows: 1
|
||||||
-info: Records: 1 Duplicates: 0 Warnings: 0
|
-info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
+Got one of the listed errors
|
+Got one of the listed errors
|
||||||
|
ALTER TABLE t1 FORCE, ALGORITHM=DEFAULT;
|
||||||
|
-affected rows: 1
|
||||||
|
-info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
|
+affected rows: 0
|
||||||
|
+info: Records: 0 Duplicates: 0 Warnings: 0
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
affected rows: 0
|
affected rows: 0
|
||||||
CREATE TABLE t1(f1 INT PRIMARY KEY, f2 INT NOT NULL,
|
CREATE TABLE t1(f1 INT PRIMARY KEY, f2 INT NOT NULL,
|
||||||
@@ -53,22 +45,17 @@
|
@@ -56,22 +48,17 @@
|
||||||
FOREIGN KEY fidx(f1) REFERENCES t1(f1))ENGINE=INNODB;
|
FOREIGN KEY fidx(f1) REFERENCES t1(f1))ENGINE=INNODB;
|
||||||
INSERT INTO t1(f1, f2, f4, f5) VALUES(1, 2, 3, 4);
|
INSERT INTO t1(f1, f2, f4, f5) VALUES(1, 2, 3, 4);
|
||||||
ALTER TABLE t1 ADD INDEX idx1(f4), page_compressed=1;
|
ALTER TABLE t1 ADD INDEX idx1(f4), page_compressed=1;
|
||||||
@ -78,7 +83,7 @@
|
|||||||
DROP TABLE t2, t1;
|
DROP TABLE t2, t1;
|
||||||
affected rows: 0
|
affected rows: 0
|
||||||
CREATE TABLE t1(f1 INT NOT NULL,
|
CREATE TABLE t1(f1 INT NOT NULL,
|
||||||
@@ -81,27 +68,27 @@
|
@@ -84,28 +71,27 @@
|
||||||
INSERT INTO t1(f1, f2) VALUES(1, 1);
|
INSERT INTO t1(f1, f2) VALUES(1, 1);
|
||||||
# Add column at the end of the table
|
# Add column at the end of the table
|
||||||
ALTER TABLE t1 ADD COLUMN f4 char(100) default 'BIG WALL';
|
ALTER TABLE t1 ADD COLUMN f4 char(100) default 'BIG WALL';
|
||||||
@ -106,7 +111,9 @@
|
|||||||
+info: Records: 0 Duplicates: 0 Warnings: 0
|
+info: Records: 0 Duplicates: 0 Warnings: 0
|
||||||
# Rename table
|
# Rename table
|
||||||
ALTER TABLE t1 RENAME t3;
|
ALTER TABLE t1 RENAME t3;
|
||||||
affected rows: 0
|
-affected rows: 1
|
||||||
|
-info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
|
+affected rows: 0
|
||||||
# Drop Virtual Column
|
# Drop Virtual Column
|
||||||
ALTER TABLE t3 DROP COLUMN vcol;
|
ALTER TABLE t3 DROP COLUMN vcol;
|
||||||
-affected rows: 1
|
-affected rows: 1
|
||||||
@ -116,7 +123,7 @@
|
|||||||
# Column length varies
|
# Column length varies
|
||||||
ALTER TABLE t2 CHANGE f3 f3 VARCHAR(20);
|
ALTER TABLE t2 CHANGE f3 f3 VARCHAR(20);
|
||||||
affected rows: 0
|
affected rows: 0
|
||||||
@@ -109,12 +96,12 @@
|
@@ -113,12 +99,12 @@
|
||||||
SET foreign_key_checks = 0;
|
SET foreign_key_checks = 0;
|
||||||
affected rows: 0
|
affected rows: 0
|
||||||
ALTER TABLE t3 ADD FOREIGN KEY fidx(f2) REFERENCES t2(f1);
|
ALTER TABLE t3 ADD FOREIGN KEY fidx(f2) REFERENCES t2(f1);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- alter_algorithm.result
|
--- alter_algorithm.result 2020-04-30 21:39:48.923115511 +0530
|
||||||
+++ alter_algorithm.reject
|
+++ alter_algorithm.reject 2020-04-30 21:52:10.785967739 +0530
|
||||||
@@ -7,40 +7,32 @@
|
@@ -7,43 +7,35 @@
|
||||||
INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1);
|
INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1);
|
||||||
SELECT @@alter_algorithm;
|
SELECT @@alter_algorithm;
|
||||||
@@alter_algorithm
|
@@alter_algorithm
|
||||||
@ -47,10 +47,15 @@
|
|||||||
-affected rows: 1
|
-affected rows: 1
|
||||||
-info: Records: 1 Duplicates: 0 Warnings: 0
|
-info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
+Got one of the listed errors
|
+Got one of the listed errors
|
||||||
|
ALTER TABLE t1 FORCE, ALGORITHM=DEFAULT;
|
||||||
|
-affected rows: 1
|
||||||
|
-info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
|
+affected rows: 0
|
||||||
|
+info: Records: 0 Duplicates: 0 Warnings: 0
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
affected rows: 0
|
affected rows: 0
|
||||||
CREATE TABLE t1(f1 INT PRIMARY KEY, f2 INT NOT NULL,
|
CREATE TABLE t1(f1 INT PRIMARY KEY, f2 INT NOT NULL,
|
||||||
@@ -53,22 +45,22 @@
|
@@ -56,22 +48,22 @@
|
||||||
FOREIGN KEY fidx(f1) REFERENCES t1(f1))ENGINE=INNODB;
|
FOREIGN KEY fidx(f1) REFERENCES t1(f1))ENGINE=INNODB;
|
||||||
INSERT INTO t1(f1, f2, f4, f5) VALUES(1, 2, 3, 4);
|
INSERT INTO t1(f1, f2, f4, f5) VALUES(1, 2, 3, 4);
|
||||||
ALTER TABLE t1 ADD INDEX idx1(f4), page_compressed=1;
|
ALTER TABLE t1 ADD INDEX idx1(f4), page_compressed=1;
|
||||||
@ -83,7 +88,7 @@
|
|||||||
DROP TABLE t2, t1;
|
DROP TABLE t2, t1;
|
||||||
affected rows: 0
|
affected rows: 0
|
||||||
CREATE TABLE t1(f1 INT NOT NULL,
|
CREATE TABLE t1(f1 INT NOT NULL,
|
||||||
@@ -81,27 +73,27 @@
|
@@ -84,28 +76,27 @@
|
||||||
INSERT INTO t1(f1, f2) VALUES(1, 1);
|
INSERT INTO t1(f1, f2) VALUES(1, 1);
|
||||||
# Add column at the end of the table
|
# Add column at the end of the table
|
||||||
ALTER TABLE t1 ADD COLUMN f4 char(100) default 'BIG WALL';
|
ALTER TABLE t1 ADD COLUMN f4 char(100) default 'BIG WALL';
|
||||||
@ -111,7 +116,9 @@
|
|||||||
+info: Records: 0 Duplicates: 0 Warnings: 0
|
+info: Records: 0 Duplicates: 0 Warnings: 0
|
||||||
# Rename table
|
# Rename table
|
||||||
ALTER TABLE t1 RENAME t3;
|
ALTER TABLE t1 RENAME t3;
|
||||||
affected rows: 0
|
-affected rows: 1
|
||||||
|
-info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
|
+affected rows: 0
|
||||||
# Drop Virtual Column
|
# Drop Virtual Column
|
||||||
ALTER TABLE t3 DROP COLUMN vcol;
|
ALTER TABLE t3 DROP COLUMN vcol;
|
||||||
-affected rows: 1
|
-affected rows: 1
|
||||||
@ -121,7 +128,7 @@
|
|||||||
# Column length varies
|
# Column length varies
|
||||||
ALTER TABLE t2 CHANGE f3 f3 VARCHAR(20);
|
ALTER TABLE t2 CHANGE f3 f3 VARCHAR(20);
|
||||||
affected rows: 0
|
affected rows: 0
|
||||||
@@ -109,12 +101,12 @@
|
@@ -113,12 +104,12 @@
|
||||||
SET foreign_key_checks = 0;
|
SET foreign_key_checks = 0;
|
||||||
affected rows: 0
|
affected rows: 0
|
||||||
ALTER TABLE t3 ADD FOREIGN KEY fidx(f2) REFERENCES t2(f1);
|
ALTER TABLE t3 ADD FOREIGN KEY fidx(f2) REFERENCES t2(f1);
|
||||||
|
@ -41,6 +41,9 @@ info: Records: 1 Duplicates: 0 Warnings: 0
|
|||||||
ALTER TABLE t1 ENGINE=INNODB;
|
ALTER TABLE t1 ENGINE=INNODB;
|
||||||
affected rows: 1
|
affected rows: 1
|
||||||
info: Records: 1 Duplicates: 0 Warnings: 0
|
info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
|
ALTER TABLE t1 FORCE, ALGORITHM=DEFAULT;
|
||||||
|
affected rows: 1
|
||||||
|
info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
affected rows: 0
|
affected rows: 0
|
||||||
CREATE TABLE t1(f1 INT PRIMARY KEY, f2 INT NOT NULL,
|
CREATE TABLE t1(f1 INT PRIMARY KEY, f2 INT NOT NULL,
|
||||||
@ -97,7 +100,8 @@ affected rows: 1
|
|||||||
info: Records: 1 Duplicates: 0 Warnings: 0
|
info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
# Rename table
|
# Rename table
|
||||||
ALTER TABLE t1 RENAME t3;
|
ALTER TABLE t1 RENAME t3;
|
||||||
affected rows: 0
|
affected rows: 1
|
||||||
|
info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
# Drop Virtual Column
|
# Drop Virtual Column
|
||||||
ALTER TABLE t3 DROP COLUMN vcol;
|
ALTER TABLE t3 DROP COLUMN vcol;
|
||||||
affected rows: 1
|
affected rows: 1
|
||||||
|
81
mysql-test/suite/innodb/r/alter_algorithm2.result
Normal file
81
mysql-test/suite/innodb/r/alter_algorithm2.result
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
CREATE TABLE t1 (a INT)ENGINE=InnoDB;
|
||||||
|
INSERT INTO t1 VALUES(1);
|
||||||
|
SET alter_algorithm='INPLACE';
|
||||||
|
affected rows: 0
|
||||||
|
PREPARE stmt FROM 'ALTER TABLE t1 ADD KEY idx(a)';
|
||||||
|
affected rows: 0
|
||||||
|
info: Statement prepared
|
||||||
|
PREPARE stmt1 FROM 'ALTER TABLE t1 DROP KEY idx';
|
||||||
|
affected rows: 0
|
||||||
|
info: Statement prepared
|
||||||
|
CREATE OR REPLACE PROCEDURE p1()
|
||||||
|
BEGIN
|
||||||
|
ALTER TABLE t1 ADD KEY idx2(a);
|
||||||
|
END|
|
||||||
|
affected rows: 0
|
||||||
|
CREATE OR REPLACE PROCEDURE p2()
|
||||||
|
BEGIN
|
||||||
|
ALTER TABLE t1 DROP KEY idx2;
|
||||||
|
END|
|
||||||
|
affected rows: 0
|
||||||
|
SET alter_algorithm='COPY';
|
||||||
|
affected rows: 0
|
||||||
|
EXECUTE stmt;
|
||||||
|
affected rows: 1
|
||||||
|
info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
|
EXECUTE stmt1;
|
||||||
|
affected rows: 1
|
||||||
|
info: Records: 1 Duplicates: 0 Warnings: 0
|
||||||
|
call p1();
|
||||||
|
affected rows: 1
|
||||||
|
call p2();
|
||||||
|
affected rows: 1
|
||||||
|
SET alter_algorithm='NOCOPY';
|
||||||
|
affected rows: 0
|
||||||
|
EXECUTE stmt;
|
||||||
|
affected rows: 0
|
||||||
|
info: Records: 0 Duplicates: 0 Warnings: 0
|
||||||
|
EXECUTE stmt1;
|
||||||
|
affected rows: 0
|
||||||
|
info: Records: 0 Duplicates: 0 Warnings: 0
|
||||||
|
call p1();
|
||||||
|
affected rows: 0
|
||||||
|
call p2();
|
||||||
|
affected rows: 0
|
||||||
|
SET alter_algorithm='INSTANT';
|
||||||
|
affected rows: 0
|
||||||
|
EXECUTE stmt;
|
||||||
|
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: ADD INDEX. Try ALGORITHM=NOCOPY
|
||||||
|
call p1();
|
||||||
|
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: ADD INDEX. Try ALGORITHM=NOCOPY
|
||||||
|
DROP TABLE t1;
|
||||||
|
affected rows: 0
|
||||||
|
DROP PROCEDURE p1;
|
||||||
|
affected rows: 0
|
||||||
|
DROP PROCEDURE p2;
|
||||||
|
affected rows: 0
|
||||||
|
SET @save_allowed= @@GLOBAL.innodb_instant_alter_column_allowed;
|
||||||
|
affected rows: 0
|
||||||
|
SET GLOBAL innodb_instant_alter_column_allowed=never;
|
||||||
|
affected rows: 0
|
||||||
|
CREATE TABLE t1(id INT PRIMARY KEY,
|
||||||
|
col1 INT UNSIGNED NOT NULL UNIQUE)ENGINE=InnoDB;
|
||||||
|
affected rows: 0
|
||||||
|
INSERT INTO t1 VALUES(1,1),(2,2),(3,3);
|
||||||
|
affected rows: 3
|
||||||
|
info: Records: 3 Duplicates: 0 Warnings: 0
|
||||||
|
SET ALTER_ALGORITHM=INSTANT;
|
||||||
|
affected rows: 0
|
||||||
|
ALTER TABLE t1 DROP COLUMN col1;
|
||||||
|
ERROR 0A000: ALGORITHM=INSTANT is not supported. Reason: innodb_instant_alter_column_allowed=never. Try ALGORITHM=INPLACE
|
||||||
|
ALTER TABLE t1 DROP COLUMN col1, ALGORITHM=NOCOPY;
|
||||||
|
ERROR 0A000: ALGORITHM=NOCOPY is not supported. Reason: innodb_instant_alter_column_allowed=never. Try ALGORITHM=INPLACE
|
||||||
|
ALTER TABLE t1 DROP COLUMN col1, ALGORITHM=DEFAULT;
|
||||||
|
affected rows: 0
|
||||||
|
info: Records: 0 Duplicates: 0 Warnings: 0
|
||||||
|
ALTER TABLE t1 DROP PRIMARY KEY, ALGORITHM=DEFAULT;
|
||||||
|
affected rows: 3
|
||||||
|
info: Records: 3 Duplicates: 0 Warnings: 0
|
||||||
|
DROP TABLE t1;
|
||||||
|
affected rows: 0
|
||||||
|
SET GLOBAL innodb_instant_alter_column_allowed=@save_allowed;
|
@ -280,6 +280,16 @@ ALTER TABLE t1 ADD FOREIGN KEY (a) REFERENCES tx(x);
|
|||||||
ALTER TABLE t1 DROP KEY idx;
|
ALTER TABLE t1 DROP KEY idx;
|
||||||
ALTER TABLE t1 CHANGE a c INT;
|
ALTER TABLE t1 CHANGE a c INT;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
CREATE TABLE t1 (f1 INT, f2 INT, f3 INT, KEY idx(f1)) ENGINE=InnoDB;
|
||||||
|
ALTER TABLE t1 ADD FOREIGN KEY (f2) REFERENCES t1 (f1);
|
||||||
|
ALTER TABLE t1 ADD COLUMN f INT;
|
||||||
|
SET FOREIGN_KEY_CHECKS= OFF;
|
||||||
|
ALTER TABLE t1 DROP KEY idx;
|
||||||
|
ALTER TABLE t1 ADD KEY idx (f1);
|
||||||
|
SET FOREIGN_KEY_CHECKS= ON;
|
||||||
|
ALTER TABLE t1 DROP f3;
|
||||||
|
ALTER TABLE t1 CHANGE f f3 INT;
|
||||||
|
DROP TABLE t1;
|
||||||
SET FOREIGN_KEY_CHECKS=1;
|
SET FOREIGN_KEY_CHECKS=1;
|
||||||
# Start of 10.2 tests
|
# Start of 10.2 tests
|
||||||
#
|
#
|
||||||
|
@ -171,6 +171,38 @@ DROP FOREIGN KEY fk1,
|
|||||||
CHANGE b d INT UNSIGNED,
|
CHANGE b d INT UNSIGNED,
|
||||||
ADD c INT;
|
ADD c INT;
|
||||||
DROP TABLE t2, t1;
|
DROP TABLE t2, t1;
|
||||||
|
#
|
||||||
|
# MDEV-22446 InnoDB aborts while adding instant column
|
||||||
|
# for discarded tablespace
|
||||||
|
#
|
||||||
|
CREATE TABLE t1(c1 INT NOT NULL, c2 INT NOT NULL DEFAULT 0)ENGINE=InnoDB;
|
||||||
|
INSERT INTO t1(c1) VALUES(1);
|
||||||
|
ALTER TABLE t1 ADD COLUMN c3 INT DEFAULT 10;
|
||||||
|
FLUSH TABLES t1 FOR EXPORT;
|
||||||
|
backup: t1
|
||||||
|
UNLOCK TABLES;
|
||||||
|
DROP TABLE t1;
|
||||||
|
CREATE TABLE t1(c1 INT NOT NULL)Engine=InnoDB;
|
||||||
|
ALTER TABLE t1 DISCARD TABLESPACE;
|
||||||
|
ALTER TABLE t1 ADD COLUMN c2 INT NOT NULL;
|
||||||
|
Warnings:
|
||||||
|
Warning 1814 Tablespace has been discarded for table `t1`
|
||||||
|
ALTER TABLE t1 ADD COLUMN c3 INT DEFAULT 10;
|
||||||
|
Warnings:
|
||||||
|
Warning 1814 Tablespace has been discarded for table `t1`
|
||||||
|
restore: t1 .ibd and .cfg files
|
||||||
|
ALTER TABLE t1 IMPORT TABLESPACE;
|
||||||
|
SHOW CREATE TABLE t1;
|
||||||
|
Table Create Table
|
||||||
|
t1 CREATE TABLE `t1` (
|
||||||
|
`c1` int(11) NOT NULL,
|
||||||
|
`c2` int(11) NOT NULL,
|
||||||
|
`c3` int(11) DEFAULT 10
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
||||||
|
SELECT * FROM t1;
|
||||||
|
c1 c2 c3
|
||||||
|
1 0 10
|
||||||
|
DROP TABLE t1;
|
||||||
# End of 10.3 tests
|
# End of 10.3 tests
|
||||||
create table t (
|
create table t (
|
||||||
a varchar(9),
|
a varchar(9),
|
||||||
|
@ -12,7 +12,7 @@ FOUND 1 /InnoDB: Tablespace 4294967280 was not found at .*, but there were no mo
|
|||||||
# restart: --debug=d,innodb_log_abort_3,ib_log --innodb-log-files-in-group=1 --innodb-log-file-size=4M
|
# restart: --debug=d,innodb_log_abort_3,ib_log --innodb-log-files-in-group=1 --innodb-log-file-size=4M
|
||||||
SELECT * FROM t1;
|
SELECT * FROM t1;
|
||||||
ERROR 42000: Unknown storage engine 'InnoDB'
|
ERROR 42000: Unknown storage engine 'InnoDB'
|
||||||
FOUND 1 /srv_prepare_to_delete_redo_log_files: ib_log: MLOG_CHECKPOINT.* written/ in mysqld.1.err
|
FOUND 1 /ib_log: MLOG_CHECKPOINT.* written/ in mysqld.1.err
|
||||||
# restart
|
# restart
|
||||||
# restart
|
# restart
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
@ -55,6 +55,10 @@ ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
|
|||||||
--error $error_code
|
--error $error_code
|
||||||
ALTER TABLE t1 ENGINE=INNODB;
|
ALTER TABLE t1 ENGINE=INNODB;
|
||||||
|
|
||||||
|
# Irrespective of alter_algorithm value, the following command
|
||||||
|
# should succeed because of explicitly mentioning ALGORTHM=DEFAULT
|
||||||
|
ALTER TABLE t1 FORCE, ALGORITHM=DEFAULT;
|
||||||
|
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
--disable_info
|
--disable_info
|
||||||
|
|
||||||
|
63
mysql-test/suite/innodb/t/alter_algorithm2.test
Normal file
63
mysql-test/suite/innodb/t/alter_algorithm2.test
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
--source include/have_innodb.inc
|
||||||
|
CREATE TABLE t1 (a INT)ENGINE=InnoDB;
|
||||||
|
INSERT INTO t1 VALUES(1);
|
||||||
|
|
||||||
|
# alter_algorithm variable doesn't affect when ALTER stmt
|
||||||
|
# during PREPARE PHASE or CREATE PROCEDURE
|
||||||
|
# Only when execution/call happens, alter uses the alter_algorithm
|
||||||
|
# variable when user does not mention algorithm explicitly.
|
||||||
|
|
||||||
|
--enable_info
|
||||||
|
SET alter_algorithm='INPLACE';
|
||||||
|
PREPARE stmt FROM 'ALTER TABLE t1 ADD KEY idx(a)';
|
||||||
|
PREPARE stmt1 FROM 'ALTER TABLE t1 DROP KEY idx';
|
||||||
|
DELIMITER |;
|
||||||
|
CREATE OR REPLACE PROCEDURE p1()
|
||||||
|
BEGIN
|
||||||
|
ALTER TABLE t1 ADD KEY idx2(a);
|
||||||
|
END|
|
||||||
|
|
||||||
|
CREATE OR REPLACE PROCEDURE p2()
|
||||||
|
BEGIN
|
||||||
|
ALTER TABLE t1 DROP KEY idx2;
|
||||||
|
END|
|
||||||
|
DELIMITER ;|
|
||||||
|
|
||||||
|
SET alter_algorithm='COPY';
|
||||||
|
EXECUTE stmt;
|
||||||
|
EXECUTE stmt1;
|
||||||
|
call p1();
|
||||||
|
call p2();
|
||||||
|
|
||||||
|
SET alter_algorithm='NOCOPY';
|
||||||
|
EXECUTE stmt;
|
||||||
|
EXECUTE stmt1;
|
||||||
|
call p1();
|
||||||
|
call p2();
|
||||||
|
|
||||||
|
SET alter_algorithm='INSTANT';
|
||||||
|
--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
|
||||||
|
EXECUTE stmt;
|
||||||
|
--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
|
||||||
|
call p1();
|
||||||
|
|
||||||
|
DROP TABLE t1;
|
||||||
|
DROP PROCEDURE p1;
|
||||||
|
DROP PROCEDURE p2;
|
||||||
|
|
||||||
|
SET @save_allowed= @@GLOBAL.innodb_instant_alter_column_allowed;
|
||||||
|
SET GLOBAL innodb_instant_alter_column_allowed=never;
|
||||||
|
|
||||||
|
CREATE TABLE t1(id INT PRIMARY KEY,
|
||||||
|
col1 INT UNSIGNED NOT NULL UNIQUE)ENGINE=InnoDB;
|
||||||
|
INSERT INTO t1 VALUES(1,1),(2,2),(3,3);
|
||||||
|
SET ALTER_ALGORITHM=INSTANT;
|
||||||
|
--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
|
||||||
|
ALTER TABLE t1 DROP COLUMN col1;
|
||||||
|
--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
|
||||||
|
ALTER TABLE t1 DROP COLUMN col1, ALGORITHM=NOCOPY;
|
||||||
|
ALTER TABLE t1 DROP COLUMN col1, ALGORITHM=DEFAULT;
|
||||||
|
ALTER TABLE t1 DROP PRIMARY KEY, ALGORITHM=DEFAULT;
|
||||||
|
DROP TABLE t1;
|
||||||
|
--disable_info
|
||||||
|
SET GLOBAL innodb_instant_alter_column_allowed=@save_allowed;
|
@ -266,6 +266,19 @@ ALTER TABLE t1 DROP KEY idx;
|
|||||||
ALTER TABLE t1 CHANGE a c INT;
|
ALTER TABLE t1 CHANGE a c INT;
|
||||||
# Cleanup
|
# Cleanup
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
CREATE TABLE t1 (f1 INT, f2 INT, f3 INT, KEY idx(f1)) ENGINE=InnoDB;
|
||||||
|
ALTER TABLE t1 ADD FOREIGN KEY (f2) REFERENCES t1 (f1);
|
||||||
|
ALTER TABLE t1 ADD COLUMN f INT;
|
||||||
|
SET FOREIGN_KEY_CHECKS= OFF;
|
||||||
|
ALTER TABLE t1 DROP KEY idx;
|
||||||
|
ALTER TABLE t1 ADD KEY idx (f1);
|
||||||
|
SET FOREIGN_KEY_CHECKS= ON;
|
||||||
|
ALTER TABLE t1 DROP f3;
|
||||||
|
ALTER TABLE t1 CHANGE f f3 INT;
|
||||||
|
# Cleanup
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
SET FOREIGN_KEY_CHECKS=1;
|
SET FOREIGN_KEY_CHECKS=1;
|
||||||
|
|
||||||
--echo # Start of 10.2 tests
|
--echo # Start of 10.2 tests
|
||||||
|
@ -172,6 +172,41 @@ ALTER TABLE t2
|
|||||||
CHANGE b d INT UNSIGNED,
|
CHANGE b d INT UNSIGNED,
|
||||||
ADD c INT;
|
ADD c INT;
|
||||||
DROP TABLE t2, t1;
|
DROP TABLE t2, t1;
|
||||||
|
|
||||||
|
--echo #
|
||||||
|
--echo # MDEV-22446 InnoDB aborts while adding instant column
|
||||||
|
--echo # for discarded tablespace
|
||||||
|
--echo #
|
||||||
|
|
||||||
|
let MYSQLD_DATADIR =`SELECT @@datadir`;
|
||||||
|
CREATE TABLE t1(c1 INT NOT NULL, c2 INT NOT NULL DEFAULT 0)ENGINE=InnoDB;
|
||||||
|
INSERT INTO t1(c1) VALUES(1);
|
||||||
|
|
||||||
|
ALTER TABLE t1 ADD COLUMN c3 INT DEFAULT 10;
|
||||||
|
--replace_regex /, .*\).*t1.cfg/, Bad file descriptor) t1.cfg/
|
||||||
|
FLUSH TABLES t1 FOR EXPORT;
|
||||||
|
|
||||||
|
perl;
|
||||||
|
do "$ENV{MTR_SUITE_DIR}/include/innodb-util.pl";
|
||||||
|
ib_backup_tablespaces("test", "t1");
|
||||||
|
EOF
|
||||||
|
UNLOCK TABLES;
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
# Restore of instant table
|
||||||
|
CREATE TABLE t1(c1 INT NOT NULL)Engine=InnoDB;
|
||||||
|
ALTER TABLE t1 DISCARD TABLESPACE;
|
||||||
|
ALTER TABLE t1 ADD COLUMN c2 INT NOT NULL;
|
||||||
|
ALTER TABLE t1 ADD COLUMN c3 INT DEFAULT 10;
|
||||||
|
# Restore files
|
||||||
|
perl;
|
||||||
|
do "$ENV{MTR_SUITE_DIR}/include/innodb-util.pl";
|
||||||
|
ib_restore_tablespaces("test", "t1");
|
||||||
|
EOF
|
||||||
|
ALTER TABLE t1 IMPORT TABLESPACE;
|
||||||
|
SHOW CREATE TABLE t1;
|
||||||
|
SELECT * FROM t1;
|
||||||
|
DROP TABLE t1;
|
||||||
--echo # End of 10.3 tests
|
--echo # End of 10.3 tests
|
||||||
|
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ SELECT * FROM t1;
|
|||||||
--source include/restart_mysqld.inc
|
--source include/restart_mysqld.inc
|
||||||
--error ER_UNKNOWN_STORAGE_ENGINE
|
--error ER_UNKNOWN_STORAGE_ENGINE
|
||||||
SELECT * FROM t1;
|
SELECT * FROM t1;
|
||||||
--let SEARCH_PATTERN= srv_prepare_to_delete_redo_log_files: ib_log: MLOG_CHECKPOINT.* written
|
--let SEARCH_PATTERN= ib_log: MLOG_CHECKPOINT.* written
|
||||||
--source include/search_pattern_in_file.inc
|
--source include/search_pattern_in_file.inc
|
||||||
|
|
||||||
--let $restart_parameters=
|
--let $restart_parameters=
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
# that with the fix local variable linfo is valid along all
|
# that with the fix local variable linfo is valid along all
|
||||||
# mysql_show_binlog_events function scope.
|
# mysql_show_binlog_events function scope.
|
||||||
#
|
#
|
||||||
|
--source include/have_debug.inc
|
||||||
--source include/have_debug_sync.inc
|
--source include/have_debug_sync.inc
|
||||||
--source include/master-slave.inc
|
--source include/master-slave.inc
|
||||||
|
|
||||||
|
@ -71,5 +71,22 @@ include/diff_tables.inc [master:t1,slave:t1]
|
|||||||
connection master;
|
connection master;
|
||||||
SELECT c1 FROM /*!999999 t1 WHEREN;
|
SELECT c1 FROM /*!999999 t1 WHEREN;
|
||||||
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '/*!999999 t1 WHEREN' at line 1
|
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '/*!999999 t1 WHEREN' at line 1
|
||||||
|
insert t1 values (/*!50505 1 /* foo */ */ + 2);
|
||||||
|
insert t1 values (/*!999999 10 /* foo */ */ + 20);
|
||||||
|
include/show_binlog_events.inc
|
||||||
|
Log_name Pos Event_type Server_id End_log_pos Info
|
||||||
|
master-bin.000001 # Gtid # # BEGIN GTID #-#-#
|
||||||
|
master-bin.000001 # Query # # use `test`; insert t1 values (/*!50505 1 /* foo */ */ + 2)
|
||||||
|
master-bin.000001 # Query # # COMMIT
|
||||||
|
master-bin.000001 # Gtid # # BEGIN GTID #-#-#
|
||||||
|
master-bin.000001 # Query # # use `test`; insert t1 values (/* 999999 10 (* foo *) */ + 20)
|
||||||
|
master-bin.000001 # Query # # COMMIT
|
||||||
|
connection slave;
|
||||||
|
select * from t1;
|
||||||
|
c1
|
||||||
|
62
|
||||||
|
3
|
||||||
|
20
|
||||||
|
connection master;
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
include/rpl_end.inc
|
include/rpl_end.inc
|
||||||
|
19
mysql-test/suite/rpl/r/rpl_fail_register.result
Normal file
19
mysql-test/suite/rpl/r/rpl_fail_register.result
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
include/master-slave.inc
|
||||||
|
[connection master]
|
||||||
|
connection slave;
|
||||||
|
set @old_dbug=@@global.debug_dbug;
|
||||||
|
set global debug_dbug='d,fail_com_register_slave';
|
||||||
|
stop slave;
|
||||||
|
reset slave;
|
||||||
|
include/wait_for_slave_to_stop.inc
|
||||||
|
start slave;
|
||||||
|
stop slave;
|
||||||
|
include/wait_for_slave_to_stop.inc
|
||||||
|
set global debug_dbug=@old_dbug;
|
||||||
|
connection master;
|
||||||
|
kill DUMP_THREAD;
|
||||||
|
show slave hosts;
|
||||||
|
Server_id Host Port Master_id
|
||||||
|
connection slave;
|
||||||
|
start slave;
|
||||||
|
include/rpl_end.inc
|
@ -68,7 +68,17 @@ sync_slave_with_master;
|
|||||||
--echo # comments
|
--echo # comments
|
||||||
--connection master
|
--connection master
|
||||||
--error 1064
|
--error 1064
|
||||||
SELECT c1 FROM /*!999999 t1 WHEREN;
|
SELECT c1 FROM /*!999999 t1 WHEREN; #*/
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug#28388217 - SERVER CAN FAIL WHILE REPLICATING CONDITIONAL COMMENTS
|
||||||
|
#
|
||||||
|
insert t1 values (/*!50505 1 /* foo */ */ + 2);
|
||||||
|
insert t1 values (/*!999999 10 /* foo */ */ + 20);
|
||||||
|
source include/show_binlog_events.inc;
|
||||||
|
sync_slave_with_master;
|
||||||
|
select * from t1;
|
||||||
|
connection master;
|
||||||
|
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
--source include/rpl_end.inc
|
--source include/rpl_end.inc
|
||||||
|
34
mysql-test/suite/rpl/t/rpl_fail_register.test
Normal file
34
mysql-test/suite/rpl/t/rpl_fail_register.test
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
source include/have_debug.inc;
|
||||||
|
source include/have_binlog_format_mixed.inc;
|
||||||
|
source include/master-slave.inc;
|
||||||
|
|
||||||
|
connection slave;
|
||||||
|
|
||||||
|
set @old_dbug=@@global.debug_dbug;
|
||||||
|
set global debug_dbug='d,fail_com_register_slave';
|
||||||
|
|
||||||
|
stop slave;
|
||||||
|
reset slave;
|
||||||
|
source include/wait_for_slave_to_stop.inc;
|
||||||
|
start slave;
|
||||||
|
stop slave;
|
||||||
|
source include/wait_for_slave_to_stop.inc;
|
||||||
|
set global debug_dbug=@old_dbug;
|
||||||
|
|
||||||
|
connection master;
|
||||||
|
|
||||||
|
### Dump thread is hanging despite slave has gracefully exited.
|
||||||
|
let $id=`SELECT id from information_schema.processlist where command='Binlog Dump'`;
|
||||||
|
|
||||||
|
if ($id) {
|
||||||
|
replace_result $id DUMP_THREAD;
|
||||||
|
eval kill $id;
|
||||||
|
let $wait_condition= SELECT count(*)=0 from information_schema.processlist where command='Binlog Dump';
|
||||||
|
source include/wait_condition.inc;
|
||||||
|
}
|
||||||
|
|
||||||
|
show slave hosts;
|
||||||
|
|
||||||
|
connection slave;
|
||||||
|
start slave;
|
||||||
|
source include/rpl_end.inc;
|
@ -64,7 +64,7 @@ a b c
|
|||||||
explain select * from t1 where b in (select c from t3);
|
explain select * from t1 where b in (select c from t3);
|
||||||
id select_type table type possible_keys key key_len ref rows Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 PRIMARY t1 ALL NULL NULL NULL NULL 5 Using where
|
1 PRIMARY t1 ALL NULL NULL NULL NULL 5 Using where
|
||||||
1 PRIMARY t3 ref c c 5 test.t1.b 1 Using index
|
1 PRIMARY t3 eq_ref c c 5 test.t1.b 1 Using index
|
||||||
# select_type=PRIMARY, type=range,ref
|
# select_type=PRIMARY, type=range,ref
|
||||||
select * from t1 where c in (select c from t3 where c between -2 and -1);
|
select * from t1 where c in (select c from t3 where c between -2 and -1);
|
||||||
a b c
|
a b c
|
||||||
|
@ -64,7 +64,7 @@ a b c
|
|||||||
explain select * from t1 where b in (select c from t3);
|
explain select * from t1 where b in (select c from t3);
|
||||||
id select_type table type possible_keys key key_len ref rows Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 PRIMARY t1 ALL NULL NULL NULL NULL 5 Using where
|
1 PRIMARY t1 ALL NULL NULL NULL NULL 5 Using where
|
||||||
1 PRIMARY t3 ref c c 5 test.t1.b 1 Using index
|
1 PRIMARY t3 eq_ref c c 5 test.t1.b 1 Using index
|
||||||
# select_type=PRIMARY, type=range,ref
|
# select_type=PRIMARY, type=range,ref
|
||||||
select * from t1 where c in (select c from t3 where c between -2 and -1);
|
select * from t1 where c in (select c from t3 where c between -2 and -1);
|
||||||
a b c
|
a b c
|
||||||
@ -74,7 +74,7 @@ a b c
|
|||||||
explain select * from t1 where c in (select c from t3 where c between -2 and -1);
|
explain select * from t1 where c in (select c from t3 where c between -2 and -1);
|
||||||
id select_type table type possible_keys key key_len ref rows Extra
|
id select_type table type possible_keys key key_len ref rows Extra
|
||||||
1 PRIMARY t1 range c c 5 NULL 3 Using index condition
|
1 PRIMARY t1 range c c 5 NULL 3 Using index condition
|
||||||
1 PRIMARY t3 ref c c 5 test.t1.c 1 Using index
|
1 PRIMARY t3 eq_ref c c 5 test.t1.c 1 Using index
|
||||||
# select_type=UNION, type=system
|
# select_type=UNION, type=system
|
||||||
# select_type=UNION RESULT, type=<union1,2>
|
# select_type=UNION RESULT, type=<union1,2>
|
||||||
select * from t1 union select * from t2;
|
select * from t1 union select * from t2;
|
||||||
|
169
mysys/queues.c
169
mysys/queues.c
@ -70,10 +70,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
int init_queue(QUEUE *queue, uint max_elements, uint offset_to_key,
|
int init_queue(QUEUE *queue, uint max_elements, uint offset_to_key,
|
||||||
pbool max_at_top, int (*compare) (void *, uchar *, uchar *),
|
my_bool max_at_top, int (*compare) (void *, uchar *, uchar *),
|
||||||
void *first_cmp_arg, uint offset_to_queue_pos,
|
void *first_cmp_arg, uint offset_to_queue_pos,
|
||||||
uint auto_extent)
|
uint auto_extent)
|
||||||
|
|
||||||
{
|
{
|
||||||
DBUG_ENTER("init_queue");
|
DBUG_ENTER("init_queue");
|
||||||
if ((queue->root= (uchar **) my_malloc((max_elements + 1) * sizeof(void*),
|
if ((queue->root= (uchar **) my_malloc((max_elements + 1) * sizeof(void*),
|
||||||
@ -109,7 +108,7 @@ int init_queue(QUEUE *queue, uint max_elements, uint offset_to_key,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
int reinit_queue(QUEUE *queue, uint max_elements, uint offset_to_key,
|
int reinit_queue(QUEUE *queue, uint max_elements, uint offset_to_key,
|
||||||
pbool max_at_top, int (*compare) (void *, uchar *, uchar *),
|
my_bool max_at_top, int (*compare) (void *, uchar *, uchar *),
|
||||||
void *first_cmp_arg, uint offset_to_queue_pos,
|
void *first_cmp_arg, uint offset_to_queue_pos,
|
||||||
uint auto_extent)
|
uint auto_extent)
|
||||||
{
|
{
|
||||||
@ -182,6 +181,28 @@ void delete_queue(QUEUE *queue)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void insert_at(QUEUE *queue, uchar *element, uint idx)
|
||||||
|
{
|
||||||
|
uint next_index, offset_to_key= queue->offset_to_key;
|
||||||
|
uint offset_to_queue_pos= queue->offset_to_queue_pos;
|
||||||
|
/* max_at_top swaps the comparison if we want to order by desc */
|
||||||
|
while ((next_index= idx >> 1) > 0 &&
|
||||||
|
queue->compare(queue->first_cmp_arg,
|
||||||
|
element + offset_to_key,
|
||||||
|
queue->root[next_index] + offset_to_key) *
|
||||||
|
queue->max_at_top < 0)
|
||||||
|
{
|
||||||
|
queue->root[idx]= queue->root[next_index];
|
||||||
|
if (offset_to_queue_pos)
|
||||||
|
(*(uint*) (queue->root[idx] + offset_to_queue_pos-1))= idx;
|
||||||
|
idx= next_index;
|
||||||
|
}
|
||||||
|
queue->root[idx]= element;
|
||||||
|
if (offset_to_queue_pos)
|
||||||
|
(*(uint*) (element + offset_to_queue_pos-1))= idx;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Insert element in queue
|
Insert element in queue
|
||||||
|
|
||||||
@ -191,28 +212,10 @@ void delete_queue(QUEUE *queue)
|
|||||||
element Element to insert
|
element Element to insert
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void queue_insert(register QUEUE *queue, uchar *element)
|
void queue_insert(QUEUE *queue, uchar *element)
|
||||||
{
|
{
|
||||||
reg2 uint idx, next;
|
|
||||||
uint offset_to_queue_pos= queue->offset_to_queue_pos;
|
|
||||||
DBUG_ASSERT(queue->elements < queue->max_elements);
|
DBUG_ASSERT(queue->elements < queue->max_elements);
|
||||||
|
insert_at(queue, element, ++queue->elements);
|
||||||
idx= ++queue->elements;
|
|
||||||
/* max_at_top swaps the comparison if we want to order by desc */
|
|
||||||
while (idx > 1 &&
|
|
||||||
(queue->compare(queue->first_cmp_arg,
|
|
||||||
element + queue->offset_to_key,
|
|
||||||
queue->root[(next= idx >> 1)] +
|
|
||||||
queue->offset_to_key) * queue->max_at_top) < 0)
|
|
||||||
{
|
|
||||||
queue->root[idx]= queue->root[next];
|
|
||||||
if (offset_to_queue_pos)
|
|
||||||
(*(uint*) (queue->root[idx] + offset_to_queue_pos-1))= idx;
|
|
||||||
idx= next;
|
|
||||||
}
|
|
||||||
queue->root[idx]= element;
|
|
||||||
if (offset_to_queue_pos)
|
|
||||||
(*(uint*) (element+ offset_to_queue_pos-1))= idx;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -230,7 +233,7 @@ void queue_insert(register QUEUE *queue, uchar *element)
|
|||||||
2 auto_extend is 0; No insertion done
|
2 auto_extend is 0; No insertion done
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int queue_insert_safe(register QUEUE *queue, uchar *element)
|
int queue_insert_safe(QUEUE *queue, uchar *element)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (queue->elements == queue->max_elements)
|
if (queue->elements == queue->max_elements)
|
||||||
@ -240,7 +243,7 @@ int queue_insert_safe(register QUEUE *queue, uchar *element)
|
|||||||
if (resize_queue(queue, queue->max_elements + queue->auto_extent))
|
if (resize_queue(queue, queue->max_elements + queue->auto_extent))
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
queue_insert(queue, element);
|
queue_insert(queue, element);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -259,81 +262,55 @@ int queue_insert_safe(register QUEUE *queue, uchar *element)
|
|||||||
pointer to removed element
|
pointer to removed element
|
||||||
*/
|
*/
|
||||||
|
|
||||||
uchar *queue_remove(register QUEUE *queue, uint idx)
|
uchar *queue_remove(QUEUE *queue, uint idx)
|
||||||
{
|
{
|
||||||
uchar *element;
|
uchar *element;
|
||||||
DBUG_ASSERT(idx >= 1 && idx <= queue->elements);
|
DBUG_ASSERT(idx >= 1);
|
||||||
|
DBUG_ASSERT(idx <= queue->elements);
|
||||||
element= queue->root[idx];
|
element= queue->root[idx];
|
||||||
_downheap(queue, idx, queue->root[queue->elements--]);
|
queue->root[idx]= queue->root[queue->elements--];
|
||||||
|
queue_replace(queue, idx);
|
||||||
return element;
|
return element;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Add element to fixed position and update heap
|
Restores the heap property from idx down the heap
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
_downheap()
|
_downheap()
|
||||||
queue Queue to use
|
queue Queue to use
|
||||||
idx Index of element to change
|
idx Index of element to change
|
||||||
element Element to store at 'idx'
|
|
||||||
|
|
||||||
NOTE
|
|
||||||
This only works if element is >= all elements <= start_idx
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void _downheap(register QUEUE *queue, uint start_idx, uchar *element)
|
void _downheap(QUEUE *queue, uint idx)
|
||||||
{
|
{
|
||||||
uint elements,half_queue,offset_to_key, next_index, offset_to_queue_pos;
|
uchar *element= queue->root[idx];
|
||||||
register uint idx= start_idx;
|
uint next_index,
|
||||||
my_bool first= TRUE;
|
elements= queue->elements,
|
||||||
|
half_queue= elements >> 1,
|
||||||
offset_to_key=queue->offset_to_key;
|
offset_to_key= queue->offset_to_key,
|
||||||
offset_to_queue_pos= queue->offset_to_queue_pos;
|
offset_to_queue_pos= queue->offset_to_queue_pos;
|
||||||
half_queue= (elements= queue->elements) >> 1;
|
|
||||||
|
|
||||||
while (idx <= half_queue)
|
while (idx <= half_queue)
|
||||||
{
|
{
|
||||||
next_index=idx+idx;
|
next_index= idx+idx;
|
||||||
if (next_index < elements &&
|
if (next_index < elements &&
|
||||||
(queue->compare(queue->first_cmp_arg,
|
(queue->compare(queue->first_cmp_arg,
|
||||||
queue->root[next_index]+offset_to_key,
|
queue->root[next_index]+offset_to_key,
|
||||||
queue->root[next_index+1]+offset_to_key) *
|
queue->root[next_index+1]+offset_to_key) *
|
||||||
queue->max_at_top) > 0)
|
queue->max_at_top) > 0)
|
||||||
next_index++;
|
next_index++;
|
||||||
if (first &&
|
if ((queue->compare(queue->first_cmp_arg,
|
||||||
(((queue->compare(queue->first_cmp_arg,
|
queue->root[next_index]+offset_to_key,
|
||||||
queue->root[next_index]+offset_to_key,
|
element+offset_to_key) * queue->max_at_top) >= 0)
|
||||||
element+offset_to_key) * queue->max_at_top) >= 0)))
|
break;
|
||||||
{
|
|
||||||
queue->root[idx]= element;
|
|
||||||
if (offset_to_queue_pos)
|
|
||||||
(*(uint*) (element + offset_to_queue_pos-1))= idx;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
first= FALSE;
|
|
||||||
queue->root[idx]= queue->root[next_index];
|
|
||||||
if (offset_to_queue_pos)
|
|
||||||
(*(uint*) (queue->root[idx] + offset_to_queue_pos-1))= idx;
|
|
||||||
idx=next_index;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
Insert the element into the right position. This is the same code
|
|
||||||
as we have in queue_insert()
|
|
||||||
*/
|
|
||||||
while ((next_index= (idx >> 1)) > start_idx &&
|
|
||||||
queue->compare(queue->first_cmp_arg,
|
|
||||||
element+offset_to_key,
|
|
||||||
queue->root[next_index]+offset_to_key)*
|
|
||||||
queue->max_at_top < 0)
|
|
||||||
{
|
|
||||||
queue->root[idx]= queue->root[next_index];
|
queue->root[idx]= queue->root[next_index];
|
||||||
if (offset_to_queue_pos)
|
if (offset_to_queue_pos)
|
||||||
(*(uint*) (queue->root[idx] + offset_to_queue_pos-1))= idx;
|
(*(uint*) (queue->root[idx] + offset_to_queue_pos-1))= idx;
|
||||||
idx= next_index;
|
idx= next_index;
|
||||||
}
|
}
|
||||||
queue->root[idx]= element;
|
queue->root[idx]=element;
|
||||||
if (offset_to_queue_pos)
|
if (offset_to_queue_pos)
|
||||||
(*(uint*) (element + offset_to_queue_pos-1))= idx;
|
(*(uint*) (element + offset_to_queue_pos-1))= idx;
|
||||||
}
|
}
|
||||||
@ -351,7 +328,7 @@ void queue_fix(QUEUE *queue)
|
|||||||
{
|
{
|
||||||
uint i;
|
uint i;
|
||||||
for (i= queue->elements >> 1; i > 0; i--)
|
for (i= queue->elements >> 1; i > 0; i--)
|
||||||
_downheap(queue, i, queue_element(queue, i));
|
_downheap(queue, i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -362,13 +339,47 @@ void queue_fix(QUEUE *queue)
|
|||||||
queue_replace()
|
queue_replace()
|
||||||
queue Queue to use
|
queue Queue to use
|
||||||
idx Index of element to change
|
idx Index of element to change
|
||||||
element Element to store at 'idx'
|
|
||||||
|
NOTE
|
||||||
|
optimized for the case when the new position is close to the end of the
|
||||||
|
heap (typical for queue_remove() replacements).
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void queue_replace(QUEUE *queue, uint idx)
|
void queue_replace(QUEUE *queue, uint idx)
|
||||||
{
|
{
|
||||||
uchar *element= queue->root[idx];
|
uchar *element= queue->root[idx];
|
||||||
DBUG_ASSERT(idx >= 1 && idx <= queue->elements);
|
uint next_index,
|
||||||
queue_remove(queue, idx);
|
elements= queue->elements,
|
||||||
queue_insert(queue, element);
|
half_queue= elements>>1,
|
||||||
|
offset_to_key= queue->offset_to_key,
|
||||||
|
offset_to_queue_pos= queue->offset_to_queue_pos;
|
||||||
|
my_bool first= TRUE;
|
||||||
|
|
||||||
|
while (idx <= half_queue)
|
||||||
|
{
|
||||||
|
next_index= idx + idx;
|
||||||
|
if (next_index < elements &&
|
||||||
|
queue->compare(queue->first_cmp_arg,
|
||||||
|
queue->root[next_index]+offset_to_key,
|
||||||
|
queue->root[next_index+1]+offset_to_key) *
|
||||||
|
queue->max_at_top > 0)
|
||||||
|
next_index++;
|
||||||
|
if (first &&
|
||||||
|
queue->compare(queue->first_cmp_arg,
|
||||||
|
queue->root[next_index]+offset_to_key,
|
||||||
|
element+offset_to_key) * queue->max_at_top >= 0)
|
||||||
|
{
|
||||||
|
queue->root[idx]= element;
|
||||||
|
if (offset_to_queue_pos)
|
||||||
|
(*(uint*) (element + offset_to_queue_pos-1))= idx;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
first= FALSE;
|
||||||
|
queue->root[idx]= queue->root[next_index];
|
||||||
|
if (offset_to_queue_pos)
|
||||||
|
(*(uint*) (queue->root[idx] + offset_to_queue_pos-1))= idx;
|
||||||
|
idx=next_index;
|
||||||
|
}
|
||||||
|
|
||||||
|
insert_at(queue, element, idx);
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,7 @@ Email domain: cam.ac.uk
|
|||||||
University of Cambridge Computing Service,
|
University of Cambridge Computing Service,
|
||||||
Cambridge, England.
|
Cambridge, England.
|
||||||
|
|
||||||
Copyright (c) 1997-2019 University of Cambridge
|
Copyright (c) 1997-2020 University of Cambridge
|
||||||
All rights reserved
|
All rights reserved
|
||||||
|
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ Written by: Zoltan Herczeg
|
|||||||
Email local part: hzmester
|
Email local part: hzmester
|
||||||
Emain domain: freemail.hu
|
Emain domain: freemail.hu
|
||||||
|
|
||||||
Copyright(c) 2010-2019 Zoltan Herczeg
|
Copyright(c) 2010-2020 Zoltan Herczeg
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
|
|
||||||
@ -30,7 +30,7 @@ Written by: Zoltan Herczeg
|
|||||||
Email local part: hzmester
|
Email local part: hzmester
|
||||||
Emain domain: freemail.hu
|
Emain domain: freemail.hu
|
||||||
|
|
||||||
Copyright(c) 2009-2019 Zoltan Herczeg
|
Copyright(c) 2009-2020 Zoltan Herczeg
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
|
|
||||||
|
@ -5,6 +5,35 @@ Note that the PCRE 8.xx series (PCRE1) is now in a bugfix-only state. All
|
|||||||
development is happening in the PCRE2 10.xx series.
|
development is happening in the PCRE2 10.xx series.
|
||||||
|
|
||||||
|
|
||||||
|
Version 8.44 12 February-2020
|
||||||
|
-----------------------------
|
||||||
|
|
||||||
|
1. Setting --enable-jit=auto for an out-of-tree build failed because the
|
||||||
|
source directory wasn't in the search path for AC_TRY_COMPILE always. Patch
|
||||||
|
from Ross Burton.
|
||||||
|
|
||||||
|
2. Applied a patch from Michael Shigorin to fix 8.43 build on e2k arch
|
||||||
|
with lcc compiler (EDG frontend based); the problem it fixes is:
|
||||||
|
|
||||||
|
lcc: "pcrecpp.cc", line 74: error: declaration aliased to undefined entity
|
||||||
|
"_ZN7pcrecpp2RE6no_argE" [-Werror]
|
||||||
|
|
||||||
|
3. Change 2 for 8.43 omitted (*LF) from the list of start-of-pattern items. Now
|
||||||
|
added.
|
||||||
|
|
||||||
|
4. Fix ARMv5 JIT improper handling of labels right after a constant pool.
|
||||||
|
|
||||||
|
5. Small patch to pcreposix.c to set the erroroffset field to -1 immediately
|
||||||
|
after a successful compile, instead of at the start of matching to avoid a
|
||||||
|
sanitizer complaint (regexec is supposed to be thread safe).
|
||||||
|
|
||||||
|
6. Check the size of the number after (?C as it is read, in order to avoid
|
||||||
|
integer overflow.
|
||||||
|
|
||||||
|
7. Tidy up left shifts to avoid sanitize warnings; also fix one NULL deference
|
||||||
|
in pcretest.
|
||||||
|
|
||||||
|
|
||||||
Version 8.43 23-February-2019
|
Version 8.43 23-February-2019
|
||||||
-----------------------------
|
-----------------------------
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ Email domain: cam.ac.uk
|
|||||||
University of Cambridge Computing Service,
|
University of Cambridge Computing Service,
|
||||||
Cambridge, England.
|
Cambridge, England.
|
||||||
|
|
||||||
Copyright (c) 1997-2019 University of Cambridge
|
Copyright (c) 1997-2020 University of Cambridge
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
|
|
||||||
@ -36,7 +36,7 @@ Written by: Zoltan Herczeg
|
|||||||
Email local part: hzmester
|
Email local part: hzmester
|
||||||
Email domain: freemail.hu
|
Email domain: freemail.hu
|
||||||
|
|
||||||
Copyright(c) 2010-2019 Zoltan Herczeg
|
Copyright(c) 2010-2020 Zoltan Herczeg
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
|
|
||||||
@ -47,7 +47,7 @@ Written by: Zoltan Herczeg
|
|||||||
Email local part: hzmester
|
Email local part: hzmester
|
||||||
Email domain: freemail.hu
|
Email domain: freemail.hu
|
||||||
|
|
||||||
Copyright(c) 2009-2019 Zoltan Herczeg
|
Copyright(c) 2009-2020 Zoltan Herczeg
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
|
|
||||||
|
@ -5,6 +5,12 @@ Note that this library (now called PCRE1) is now being maintained for bug fixes
|
|||||||
only. New projects are advised to use the new PCRE2 libraries.
|
only. New projects are advised to use the new PCRE2 libraries.
|
||||||
|
|
||||||
|
|
||||||
|
Release 8.44 12-February-2020
|
||||||
|
-----------------------------
|
||||||
|
|
||||||
|
This is a bug-fix release.
|
||||||
|
|
||||||
|
|
||||||
Release 8.43 23-February-2019
|
Release 8.43 23-February-2019
|
||||||
-----------------------------
|
-----------------------------
|
||||||
|
|
||||||
|
@ -13,9 +13,10 @@ libraries.
|
|||||||
The latest release of PCRE1 is always available in three alternative formats
|
The latest release of PCRE1 is always available in three alternative formats
|
||||||
from:
|
from:
|
||||||
|
|
||||||
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-xxx.tar.gz
|
https://ftp.pcre.org/pub/pcre/pcre-x.xx.tar.gz
|
||||||
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-xxx.tar.bz2
|
https://ftp.pcre.org/pub/pcre/pcre-x.xx.tar.bz2
|
||||||
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-xxx.zip
|
https://ftp.pcre.org/pub/pcre/pcre-x.xx.tar.zip
|
||||||
|
|
||||||
|
|
||||||
There is a mailing list for discussion about the development of PCRE at
|
There is a mailing list for discussion about the development of PCRE at
|
||||||
pcre-dev@exim.org. You can access the archives and subscribe or manage your
|
pcre-dev@exim.org. You can access the archives and subscribe or manage your
|
||||||
@ -999,4 +1000,4 @@ pcre_xxx, one with the name pcre16_xx, and a third with the name pcre32_xxx.
|
|||||||
Philip Hazel
|
Philip Hazel
|
||||||
Email local part: ph10
|
Email local part: ph10
|
||||||
Email domain: cam.ac.uk
|
Email domain: cam.ac.uk
|
||||||
Last updated: 10 February 2015
|
Last updated: 12 February 2020
|
||||||
|
@ -9,19 +9,19 @@ dnl The PCRE_PRERELEASE feature is for identifying release candidates. It might
|
|||||||
dnl be defined as -RC2, for example. For real releases, it should be empty.
|
dnl be defined as -RC2, for example. For real releases, it should be empty.
|
||||||
|
|
||||||
m4_define(pcre_major, [8])
|
m4_define(pcre_major, [8])
|
||||||
m4_define(pcre_minor, [43])
|
m4_define(pcre_minor, [44])
|
||||||
m4_define(pcre_prerelease, [])
|
m4_define(pcre_prerelease, [])
|
||||||
m4_define(pcre_date, [2019-02-23])
|
m4_define(pcre_date, [2020-02-12])
|
||||||
|
|
||||||
# NOTE: The CMakeLists.txt file searches for the above variables in the first
|
# NOTE: The CMakeLists.txt file searches for the above variables in the first
|
||||||
# 50 lines of this file. Please update that if the variables above are moved.
|
# 50 lines of this file. Please update that if the variables above are moved.
|
||||||
|
|
||||||
# Libtool shared library interface versions (current:revision:age)
|
# Libtool shared library interface versions (current:revision:age)
|
||||||
m4_define(libpcre_version, [3:11:2])
|
m4_define(libpcre_version, [3:12:2])
|
||||||
m4_define(libpcre16_version, [2:11:2])
|
m4_define(libpcre16_version, [2:12:2])
|
||||||
m4_define(libpcre32_version, [0:11:0])
|
m4_define(libpcre32_version, [0:12:0])
|
||||||
m4_define(libpcreposix_version, [0:6:0])
|
m4_define(libpcreposix_version, [0:7:0])
|
||||||
m4_define(libpcrecpp_version, [0:1:0])
|
m4_define(libpcrecpp_version, [0:2:0])
|
||||||
|
|
||||||
AC_PREREQ(2.57)
|
AC_PREREQ(2.57)
|
||||||
AC_INIT(PCRE, pcre_major.pcre_minor[]pcre_prerelease, , pcre)
|
AC_INIT(PCRE, pcre_major.pcre_minor[]pcre_prerelease, , pcre)
|
||||||
@ -159,12 +159,15 @@ AC_ARG_ENABLE(jit,
|
|||||||
|
|
||||||
if test "$enable_jit" = "auto"; then
|
if test "$enable_jit" = "auto"; then
|
||||||
AC_LANG(C)
|
AC_LANG(C)
|
||||||
|
SAVE_CPPFLAGS=$CPPFLAGS
|
||||||
|
CPPFLAGS=-I$srcdir
|
||||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||||
#define SLJIT_CONFIG_AUTO 1
|
#define SLJIT_CONFIG_AUTO 1
|
||||||
#include "sljit/sljitConfigInternal.h"
|
#include "sljit/sljitConfigInternal.h"
|
||||||
#if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
|
#if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
|
||||||
#error unsupported
|
#error unsupported
|
||||||
#endif]])], enable_jit=yes, enable_jit=no)
|
#endif]])], enable_jit=yes, enable_jit=no)
|
||||||
|
CPPFLAGS=$SAVE_CPPFLAGS
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Handle --disable-pcregrep-jit (enabled by default)
|
# Handle --disable-pcregrep-jit (enabled by default)
|
||||||
|
@ -13,9 +13,10 @@ libraries.
|
|||||||
The latest release of PCRE1 is always available in three alternative formats
|
The latest release of PCRE1 is always available in three alternative formats
|
||||||
from:
|
from:
|
||||||
|
|
||||||
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-xxx.tar.gz
|
https://ftp.pcre.org/pub/pcre/pcre-x.xx.tar.gz
|
||||||
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-xxx.tar.bz2
|
https://ftp.pcre.org/pub/pcre/pcre-x.xx.tar.bz2
|
||||||
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-xxx.zip
|
https://ftp.pcre.org/pub/pcre/pcre-x.xx.tar.zip
|
||||||
|
|
||||||
|
|
||||||
There is a mailing list for discussion about the development of PCRE at
|
There is a mailing list for discussion about the development of PCRE at
|
||||||
pcre-dev@exim.org. You can access the archives and subscribe or manage your
|
pcre-dev@exim.org. You can access the archives and subscribe or manage your
|
||||||
@ -999,4 +1000,4 @@ pcre_xxx, one with the name pcre16_xx, and a third with the name pcre32_xxx.
|
|||||||
Philip Hazel
|
Philip Hazel
|
||||||
Email local part: ph10
|
Email local part: ph10
|
||||||
Email domain: cam.ac.uk
|
Email domain: cam.ac.uk
|
||||||
Last updated: 10 February 2015
|
Last updated: 12 February 2020
|
||||||
|
@ -143,7 +143,7 @@ performance.
|
|||||||
One way of guarding against this possibility is to use the
|
One way of guarding against this possibility is to use the
|
||||||
<b>pcre_fullinfo()</b> function to check the compiled pattern's options for UTF.
|
<b>pcre_fullinfo()</b> function to check the compiled pattern's options for UTF.
|
||||||
Alternatively, from release 8.33, you can set the PCRE_NEVER_UTF option at
|
Alternatively, from release 8.33, you can set the PCRE_NEVER_UTF option at
|
||||||
compile time. This causes an compile time error if a pattern contains a
|
compile time. This causes a compile time error if a pattern contains a
|
||||||
UTF-setting sequence.
|
UTF-setting sequence.
|
||||||
</P>
|
</P>
|
||||||
<P>
|
<P>
|
||||||
|
@ -1246,7 +1246,7 @@ the following negative numbers:
|
|||||||
PCRE_ERROR_BADOPTION the value of <i>what</i> was invalid
|
PCRE_ERROR_BADOPTION the value of <i>what</i> was invalid
|
||||||
PCRE_ERROR_UNSET the requested field is not set
|
PCRE_ERROR_UNSET the requested field is not set
|
||||||
</pre>
|
</pre>
|
||||||
The "magic number" is placed at the start of each compiled pattern as an simple
|
The "magic number" is placed at the start of each compiled pattern as a simple
|
||||||
check against passing an arbitrary memory pointer. The endianness error can
|
check against passing an arbitrary memory pointer. The endianness error can
|
||||||
occur if a compiled pattern is saved and reloaded on a different host. Here is
|
occur if a compiled pattern is saved and reloaded on a different host. Here is
|
||||||
a typical call of <b>pcre_fullinfo()</b>, to obtain the length of the compiled
|
a typical call of <b>pcre_fullinfo()</b>, to obtain the length of the compiled
|
||||||
@ -1318,7 +1318,7 @@ returned. For anchored patterns, -2 is returned.
|
|||||||
</pre>
|
</pre>
|
||||||
Return the value of the first data unit (non-UTF character) of any matched
|
Return the value of the first data unit (non-UTF character) of any matched
|
||||||
string in the situation where PCRE_INFO_FIRSTCHARACTERFLAGS returns 1;
|
string in the situation where PCRE_INFO_FIRSTCHARACTERFLAGS returns 1;
|
||||||
otherwise return 0. The fourth argument should point to an <b>uint_t</b>
|
otherwise return 0. The fourth argument should point to a <b>uint_t</b>
|
||||||
variable.
|
variable.
|
||||||
</P>
|
</P>
|
||||||
<P>
|
<P>
|
||||||
@ -1577,7 +1577,7 @@ returned value 1 (with "z" returned from PCRE_INFO_REQUIREDCHAR), but for
|
|||||||
</pre>
|
</pre>
|
||||||
Return the value of the rightmost literal data unit that must exist in any
|
Return the value of the rightmost literal data unit that must exist in any
|
||||||
matched string, other than at its start, if such a value has been recorded. The
|
matched string, other than at its start, if such a value has been recorded. The
|
||||||
fourth argument should point to an <b>uint32_t</b> variable. If there is no such
|
fourth argument should point to a <b>uint32_t</b> variable. If there is no such
|
||||||
value, 0 is returned.
|
value, 0 is returned.
|
||||||
</P>
|
</P>
|
||||||
<br><a name="SEC16" href="#TOC1">REFERENCE COUNTS</a><br>
|
<br><a name="SEC16" href="#TOC1">REFERENCE COUNTS</a><br>
|
||||||
|
@ -99,23 +99,21 @@ the 16-bit library, or <b>pcre32_xx</b> when using the 32-bit library".
|
|||||||
<br><a name="SEC4" href="#TOC1">COMMAND LINE OPTIONS</a><br>
|
<br><a name="SEC4" href="#TOC1">COMMAND LINE OPTIONS</a><br>
|
||||||
<P>
|
<P>
|
||||||
<b>-8</b>
|
<b>-8</b>
|
||||||
If both the 8-bit library has been built, this option causes the 8-bit library
|
If the 8-bit library has been built, this option causes it to be used (this is
|
||||||
to be used (which is the default); if the 8-bit library has not been built,
|
the default). If the 8-bit library has not been built, this option causes an
|
||||||
this option causes an error.
|
error.
|
||||||
</P>
|
</P>
|
||||||
<P>
|
<P>
|
||||||
<b>-16</b>
|
<b>-16</b>
|
||||||
If both the 8-bit or the 32-bit, and the 16-bit libraries have been built, this
|
If the 16-bit library has been built, this option causes it to be used. If only
|
||||||
option causes the 16-bit library to be used. If only the 16-bit library has been
|
the 16-bit library has been built, this is the default. If the 16-bit library
|
||||||
built, this is the default (so has no effect). If only the 8-bit or the 32-bit
|
has not been built, this option causes an error.
|
||||||
library has been built, this option causes an error.
|
|
||||||
</P>
|
</P>
|
||||||
<P>
|
<P>
|
||||||
<b>-32</b>
|
<b>-32</b>
|
||||||
If both the 8-bit or the 16-bit, and the 32-bit libraries have been built, this
|
If the 32-bit library has been built, this option causes it to be used. If only
|
||||||
option causes the 32-bit library to be used. If only the 32-bit library has been
|
the 32-bit library has been built, this is the default. If the 32-bit library
|
||||||
built, this is the default (so has no effect). If only the 8-bit or the 16-bit
|
has not been built, this option causes an error.
|
||||||
library has been built, this option causes an error.
|
|
||||||
</P>
|
</P>
|
||||||
<P>
|
<P>
|
||||||
<b>-b</b>
|
<b>-b</b>
|
||||||
@ -1154,9 +1152,9 @@ Cambridge CB2 3QH, England.
|
|||||||
</P>
|
</P>
|
||||||
<br><a name="SEC17" href="#TOC1">REVISION</a><br>
|
<br><a name="SEC17" href="#TOC1">REVISION</a><br>
|
||||||
<P>
|
<P>
|
||||||
Last updated: 23 February 2017
|
Last updated: 10 February 2020
|
||||||
<br>
|
<br>
|
||||||
Copyright © 1997-2017 University of Cambridge.
|
Copyright © 1997-2020 University of Cambridge.
|
||||||
<br>
|
<br>
|
||||||
<p>
|
<p>
|
||||||
Return to the <a href="index.html">PCRE index page</a>.
|
Return to the <a href="index.html">PCRE index page</a>.
|
||||||
|
@ -16,8 +16,8 @@ DESCRIPTION
|
|||||||
|
|
||||||
pcre-config returns the configuration of the installed PCRE libraries
|
pcre-config returns the configuration of the installed PCRE libraries
|
||||||
and the options required to compile a program to use them. Some of the
|
and the options required to compile a program to use them. Some of the
|
||||||
options apply only to the 8-bit, or 16-bit, or 32-bit libraries,
|
options apply only to the 8-bit, or 16-bit, or 32-bit libraries, re-
|
||||||
respectively, and are not available if only one of those libraries has
|
spectively, and are not available if only one of those libraries has
|
||||||
been built. If an unavailable option is encountered, the "usage" infor-
|
been built. If an unavailable option is encountered, the "usage" infor-
|
||||||
mation is output.
|
mation is output.
|
||||||
|
|
||||||
@ -36,37 +36,37 @@ OPTIONS
|
|||||||
--version Writes the version number of the installed PCRE libraries to
|
--version Writes the version number of the installed PCRE libraries to
|
||||||
the standard output.
|
the standard output.
|
||||||
|
|
||||||
--libs Writes to the standard output the command line options
|
--libs Writes to the standard output the command line options re-
|
||||||
required to link with the 8-bit PCRE library (-lpcre on many
|
quired to link with the 8-bit PCRE library (-lpcre on many
|
||||||
systems).
|
systems).
|
||||||
|
|
||||||
--libs16 Writes to the standard output the command line options
|
--libs16 Writes to the standard output the command line options re-
|
||||||
required to link with the 16-bit PCRE library (-lpcre16 on
|
quired to link with the 16-bit PCRE library (-lpcre16 on many
|
||||||
many systems).
|
systems).
|
||||||
|
|
||||||
--libs32 Writes to the standard output the command line options
|
--libs32 Writes to the standard output the command line options re-
|
||||||
required to link with the 32-bit PCRE library (-lpcre32 on
|
quired to link with the 32-bit PCRE library (-lpcre32 on many
|
||||||
many systems).
|
systems).
|
||||||
|
|
||||||
--libs-cpp
|
--libs-cpp
|
||||||
Writes to the standard output the command line options
|
Writes to the standard output the command line options re-
|
||||||
required to link with PCRE's C++ wrapper library (-lpcrecpp
|
quired to link with PCRE's C++ wrapper library (-lpcrecpp
|
||||||
-lpcre on many systems).
|
-lpcre on many systems).
|
||||||
|
|
||||||
--libs-posix
|
--libs-posix
|
||||||
Writes to the standard output the command line options
|
Writes to the standard output the command line options re-
|
||||||
required to link with PCRE's POSIX API wrapper library
|
quired to link with PCRE's POSIX API wrapper library
|
||||||
(-lpcreposix -lpcre on many systems).
|
(-lpcreposix -lpcre on many systems).
|
||||||
|
|
||||||
--cflags Writes to the standard output the command line options
|
--cflags Writes to the standard output the command line options re-
|
||||||
required to compile files that use PCRE (this may include
|
quired to compile files that use PCRE (this may include some
|
||||||
some -I options, but is blank on many systems).
|
-I options, but is blank on many systems).
|
||||||
|
|
||||||
--cflags-posix
|
--cflags-posix
|
||||||
Writes to the standard output the command line options
|
Writes to the standard output the command line options re-
|
||||||
required to compile files that use PCRE's POSIX API wrapper
|
quired to compile files that use PCRE's POSIX API wrapper li-
|
||||||
library (this may include some -I options, but is blank on
|
brary (this may include some -I options, but is blank on many
|
||||||
many systems).
|
systems).
|
||||||
|
|
||||||
|
|
||||||
SEE ALSO
|
SEE ALSO
|
||||||
|
@ -146,7 +146,7 @@ performance.
|
|||||||
One way of guarding against this possibility is to use the
|
One way of guarding against this possibility is to use the
|
||||||
\fBpcre_fullinfo()\fP function to check the compiled pattern's options for UTF.
|
\fBpcre_fullinfo()\fP function to check the compiled pattern's options for UTF.
|
||||||
Alternatively, from release 8.33, you can set the PCRE_NEVER_UTF option at
|
Alternatively, from release 8.33, you can set the PCRE_NEVER_UTF option at
|
||||||
compile time. This causes an compile time error if a pattern contains a
|
compile time. This causes a compile time error if a pattern contains a
|
||||||
UTF-setting sequence.
|
UTF-setting sequence.
|
||||||
.P
|
.P
|
||||||
If your application is one that supports UTF, be aware that validity checking
|
If your application is one that supports UTF, be aware that validity checking
|
||||||
|
3893
pcre/doc/pcre.txt
3893
pcre/doc/pcre.txt
File diff suppressed because it is too large
Load Diff
@ -1227,7 +1227,7 @@ the following negative numbers:
|
|||||||
PCRE_ERROR_BADOPTION the value of \fIwhat\fP was invalid
|
PCRE_ERROR_BADOPTION the value of \fIwhat\fP was invalid
|
||||||
PCRE_ERROR_UNSET the requested field is not set
|
PCRE_ERROR_UNSET the requested field is not set
|
||||||
.sp
|
.sp
|
||||||
The "magic number" is placed at the start of each compiled pattern as an simple
|
The "magic number" is placed at the start of each compiled pattern as a simple
|
||||||
check against passing an arbitrary memory pointer. The endianness error can
|
check against passing an arbitrary memory pointer. The endianness error can
|
||||||
occur if a compiled pattern is saved and reloaded on a different host. Here is
|
occur if a compiled pattern is saved and reloaded on a different host. Here is
|
||||||
a typical call of \fBpcre_fullinfo()\fP, to obtain the length of the compiled
|
a typical call of \fBpcre_fullinfo()\fP, to obtain the length of the compiled
|
||||||
@ -1294,7 +1294,7 @@ returned. For anchored patterns, -2 is returned.
|
|||||||
.sp
|
.sp
|
||||||
Return the value of the first data unit (non-UTF character) of any matched
|
Return the value of the first data unit (non-UTF character) of any matched
|
||||||
string in the situation where PCRE_INFO_FIRSTCHARACTERFLAGS returns 1;
|
string in the situation where PCRE_INFO_FIRSTCHARACTERFLAGS returns 1;
|
||||||
otherwise return 0. The fourth argument should point to an \fBuint_t\fP
|
otherwise return 0. The fourth argument should point to a \fBuint_t\fP
|
||||||
variable.
|
variable.
|
||||||
.P
|
.P
|
||||||
In the 8-bit library, the value is always less than 256. In the 16-bit library
|
In the 8-bit library, the value is always less than 256. In the 16-bit library
|
||||||
@ -1560,7 +1560,7 @@ returned value 1 (with "z" returned from PCRE_INFO_REQUIREDCHAR), but for
|
|||||||
.sp
|
.sp
|
||||||
Return the value of the rightmost literal data unit that must exist in any
|
Return the value of the rightmost literal data unit that must exist in any
|
||||||
matched string, other than at its start, if such a value has been recorded. The
|
matched string, other than at its start, if such a value has been recorded. The
|
||||||
fourth argument should point to an \fBuint32_t\fP variable. If there is no such
|
fourth argument should point to a \fBuint32_t\fP variable. If there is no such
|
||||||
value, 0 is returned.
|
value, 0 is returned.
|
||||||
.
|
.
|
||||||
.
|
.
|
||||||
|
@ -26,8 +26,8 @@ DESCRIPTION
|
|||||||
If you attempt to use delimiters (for example, by surrounding a pattern
|
If you attempt to use delimiters (for example, by surrounding a pattern
|
||||||
with slashes, as is common in Perl scripts), they are interpreted as
|
with slashes, as is common in Perl scripts), they are interpreted as
|
||||||
part of the pattern. Quotes can of course be used to delimit patterns
|
part of the pattern. Quotes can of course be used to delimit patterns
|
||||||
on the command line because they are interpreted by the shell, and
|
on the command line because they are interpreted by the shell, and in-
|
||||||
indeed quotes are required if a pattern contains white space or shell
|
deed quotes are required if a pattern contains white space or shell
|
||||||
metacharacters.
|
metacharacters.
|
||||||
|
|
||||||
The first argument that follows any option settings is treated as the
|
The first argument that follows any option settings is treated as the
|
||||||
@ -37,8 +37,8 @@ DESCRIPTION
|
|||||||
or an argument pattern must be provided.
|
or an argument pattern must be provided.
|
||||||
|
|
||||||
If no files are specified, pcregrep reads the standard input. The stan-
|
If no files are specified, pcregrep reads the standard input. The stan-
|
||||||
dard input can also be referenced by a name consisting of a single
|
dard input can also be referenced by a name consisting of a single hy-
|
||||||
hyphen. For example:
|
phen. For example:
|
||||||
|
|
||||||
pcregrep some-pattern /file1 - /file3
|
pcregrep some-pattern /file1 - /file3
|
||||||
|
|
||||||
@ -47,8 +47,8 @@ DESCRIPTION
|
|||||||
the start of each line, followed by a colon. However, there are options
|
the start of each line, followed by a colon. However, there are options
|
||||||
that can change how pcregrep behaves. In particular, the -M option
|
that can change how pcregrep behaves. In particular, the -M option
|
||||||
makes it possible to search for patterns that span line boundaries.
|
makes it possible to search for patterns that span line boundaries.
|
||||||
What defines a line boundary is controlled by the -N (--newline)
|
What defines a line boundary is controlled by the -N (--newline) op-
|
||||||
option.
|
tion.
|
||||||
|
|
||||||
The amount of memory used for buffering files that are being scanned is
|
The amount of memory used for buffering files that are being scanned is
|
||||||
controlled by a parameter that can be set by the --buffer-size option.
|
controlled by a parameter that can be set by the --buffer-size option.
|
||||||
@ -66,12 +66,12 @@ DESCRIPTION
|
|||||||
By default, as soon as one pattern matches a line, no further patterns
|
By default, as soon as one pattern matches a line, no further patterns
|
||||||
are considered. However, if --colour (or --color) is used to colour the
|
are considered. However, if --colour (or --color) is used to colour the
|
||||||
matching substrings, or if --only-matching, --file-offsets, or --line-
|
matching substrings, or if --only-matching, --file-offsets, or --line-
|
||||||
offsets is used to output only the part of the line that matched
|
offsets is used to output only the part of the line that matched (ei-
|
||||||
(either shown literally, or as an offset), scanning resumes immediately
|
ther shown literally, or as an offset), scanning resumes immediately
|
||||||
following the match, so that further matches on the same line can be
|
following the match, so that further matches on the same line can be
|
||||||
found. If there are multiple patterns, they are all tried on the
|
found. If there are multiple patterns, they are all tried on the re-
|
||||||
remainder of the line, but patterns that follow the one that matched
|
mainder of the line, but patterns that follow the one that matched are
|
||||||
are not tried on the earlier part of the line.
|
not tried on the earlier part of the line.
|
||||||
|
|
||||||
This behaviour means that the order in which multiple patterns are
|
This behaviour means that the order in which multiple patterns are
|
||||||
specified can affect the output when one of the above options is used.
|
specified can affect the output when one of the above options is used.
|
||||||
@ -80,11 +80,11 @@ DESCRIPTION
|
|||||||
overlap).
|
overlap).
|
||||||
|
|
||||||
Patterns that can match an empty string are accepted, but empty string
|
Patterns that can match an empty string are accepted, but empty string
|
||||||
matches are never recognized. An example is the pattern
|
matches are never recognized. An example is the pattern "(su-
|
||||||
"(super)?(man)?", in which all components are optional. This pattern
|
per)?(man)?", in which all components are optional. This pattern finds
|
||||||
finds all occurrences of both "super" and "man"; the output differs
|
all occurrences of both "super" and "man"; the output differs from
|
||||||
from matching with "super|man" when only the matching substrings are
|
matching with "super|man" when only the matching substrings are being
|
||||||
being shown.
|
shown.
|
||||||
|
|
||||||
If the LC_ALL or LC_CTYPE environment variable is set, pcregrep uses
|
If the LC_ALL or LC_CTYPE environment variable is set, pcregrep uses
|
||||||
the value to set a locale when calling the PCRE library. The --locale
|
the value to set a locale when calling the PCRE library. The --locale
|
||||||
@ -105,9 +105,9 @@ BINARY FILES
|
|||||||
|
|
||||||
By default, a file that contains a binary zero byte within the first
|
By default, a file that contains a binary zero byte within the first
|
||||||
1024 bytes is identified as a binary file, and is processed specially.
|
1024 bytes is identified as a binary file, and is processed specially.
|
||||||
(GNU grep also identifies binary files in this manner.) See the
|
(GNU grep also identifies binary files in this manner.) See the --bi-
|
||||||
--binary-files option for a means of changing the way binary files are
|
nary-files option for a means of changing the way binary files are han-
|
||||||
handled.
|
dled.
|
||||||
|
|
||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
@ -151,16 +151,16 @@ OPTIONS
|
|||||||
|
|
||||||
--binary-files=word
|
--binary-files=word
|
||||||
Specify how binary files are to be processed. If the word is
|
Specify how binary files are to be processed. If the word is
|
||||||
"binary" (the default), pattern matching is performed on
|
"binary" (the default), pattern matching is performed on bi-
|
||||||
binary files, but the only output is "Binary file <name>
|
nary files, but the only output is "Binary file <name>
|
||||||
matches" when a match succeeds. If the word is "text", which
|
matches" when a match succeeds. If the word is "text", which
|
||||||
is equivalent to the -a or --text option, binary files are
|
is equivalent to the -a or --text option, binary files are
|
||||||
processed in the same way as any other file. In this case,
|
processed in the same way as any other file. In this case,
|
||||||
when a match succeeds, the output may be binary garbage,
|
when a match succeeds, the output may be binary garbage,
|
||||||
which can have nasty effects if sent to a terminal. If the
|
which can have nasty effects if sent to a terminal. If the
|
||||||
word is "without-match", which is equivalent to the -I
|
word is "without-match", which is equivalent to the -I op-
|
||||||
option, binary files are not processed at all; they are
|
tion, binary files are not processed at all; they are assumed
|
||||||
assumed not to be of interest.
|
not to be of interest.
|
||||||
|
|
||||||
--buffer-size=number
|
--buffer-size=number
|
||||||
Set the parameter that controls how much memory is used for
|
Set the parameter that controls how much memory is used for
|
||||||
@ -201,15 +201,15 @@ OPTIONS
|
|||||||
ronment variable PCREGREP_COLOUR or PCREGREP_COLOR. The value
|
ronment variable PCREGREP_COLOUR or PCREGREP_COLOR. The value
|
||||||
of this variable should be a string of two numbers, separated
|
of this variable should be a string of two numbers, separated
|
||||||
by a semicolon. They are copied directly into the control
|
by a semicolon. They are copied directly into the control
|
||||||
string for setting colour on a terminal, so it is your
|
string for setting colour on a terminal, so it is your re-
|
||||||
responsibility to ensure that they make sense. If neither of
|
sponsibility to ensure that they make sense. If neither of
|
||||||
the environment variables is set, the default is "1;31",
|
the environment variables is set, the default is "1;31",
|
||||||
which gives red.
|
which gives red.
|
||||||
|
|
||||||
-D action, --devices=action
|
-D action, --devices=action
|
||||||
If an input path is not a regular file or a directory,
|
If an input path is not a regular file or a directory, "ac-
|
||||||
"action" specifies how it is to be processed. Valid values
|
tion" specifies how it is to be processed. Valid values are
|
||||||
are "read" (the default) or "skip" (silently skip the path).
|
"read" (the default) or "skip" (silently skip the path).
|
||||||
|
|
||||||
-d action, --directories=action
|
-d action, --directories=action
|
||||||
If an input path is a directory, "action" specifies how it is
|
If an input path is a directory, "action" specifies how it is
|
||||||
@ -218,8 +218,8 @@ OPTIONS
|
|||||||
"recurse" (equivalent to the -r option), or "skip" (silently
|
"recurse" (equivalent to the -r option), or "skip" (silently
|
||||||
skip the path, the default in Windows environments). In the
|
skip the path, the default in Windows environments). In the
|
||||||
"read" case, directories are read as if they were ordinary
|
"read" case, directories are read as if they were ordinary
|
||||||
files. In some operating systems the effect of reading a
|
files. In some operating systems the effect of reading a di-
|
||||||
directory like this is an immediate end-of-file; in others it
|
rectory like this is an immediate end-of-file; in others it
|
||||||
may provoke an error.
|
may provoke an error.
|
||||||
|
|
||||||
-e pattern, --regex=pattern, --regexp=pattern
|
-e pattern, --regex=pattern, --regexp=pattern
|
||||||
@ -249,8 +249,8 @@ OPTIONS
|
|||||||
whether listed on the command line, obtained from --file-
|
whether listed on the command line, obtained from --file-
|
||||||
list, or by scanning a directory. The pattern is a PCRE regu-
|
list, or by scanning a directory. The pattern is a PCRE regu-
|
||||||
lar expression, and is matched against the final component of
|
lar expression, and is matched against the final component of
|
||||||
the file name, not the entire path. The -F, -w, and -x
|
the file name, not the entire path. The -F, -w, and -x op-
|
||||||
options do not apply to this pattern. The option may be given
|
tions do not apply to this pattern. The option may be given
|
||||||
any number of times in order to specify multiple patterns. If
|
any number of times in order to specify multiple patterns. If
|
||||||
a file name matches both an --include and an --exclude pat-
|
a file name matches both an --include and an --exclude pat-
|
||||||
tern, it is excluded. There is no short form for this option.
|
tern, it is excluded. There is no short form for this option.
|
||||||
@ -264,29 +264,29 @@ OPTIONS
|
|||||||
|
|
||||||
--exclude-dir=pattern
|
--exclude-dir=pattern
|
||||||
Directories whose names match the pattern are skipped without
|
Directories whose names match the pattern are skipped without
|
||||||
being processed, whatever the setting of the --recursive
|
being processed, whatever the setting of the --recursive op-
|
||||||
option. This applies to all directories, whether listed on
|
tion. This applies to all directories, whether listed on the
|
||||||
the command line, obtained from --file-list, or by scanning a
|
command line, obtained from --file-list, or by scanning a
|
||||||
parent directory. The pattern is a PCRE regular expression,
|
parent directory. The pattern is a PCRE regular expression,
|
||||||
and is matched against the final component of the directory
|
and is matched against the final component of the directory
|
||||||
name, not the entire path. The -F, -w, and -x options do not
|
name, not the entire path. The -F, -w, and -x options do not
|
||||||
apply to this pattern. The option may be given any number of
|
apply to this pattern. The option may be given any number of
|
||||||
times in order to specify more than one pattern. If a direc-
|
times in order to specify more than one pattern. If a direc-
|
||||||
tory matches both --include-dir and --exclude-dir, it is
|
tory matches both --include-dir and --exclude-dir, it is ex-
|
||||||
excluded. There is no short form for this option.
|
cluded. There is no short form for this option.
|
||||||
|
|
||||||
-F, --fixed-strings
|
-F, --fixed-strings
|
||||||
Interpret each data-matching pattern as a list of fixed
|
Interpret each data-matching pattern as a list of fixed
|
||||||
strings, separated by newlines, instead of as a regular
|
strings, separated by newlines, instead of as a regular ex-
|
||||||
expression. What constitutes a newline for this purpose is
|
pression. What constitutes a newline for this purpose is con-
|
||||||
controlled by the --newline option. The -w (match as a word)
|
trolled by the --newline option. The -w (match as a word) and
|
||||||
and -x (match whole line) options can be used with -F. They
|
-x (match whole line) options can be used with -F. They ap-
|
||||||
apply to each of the fixed strings. A line is selected if any
|
ply to each of the fixed strings. A line is selected if any
|
||||||
of the fixed strings are found in it (subject to -w or -x, if
|
of the fixed strings are found in it (subject to -w or -x, if
|
||||||
present). This option applies only to the patterns that are
|
present). This option applies only to the patterns that are
|
||||||
matched against the contents of files; it does not apply to
|
matched against the contents of files; it does not apply to
|
||||||
patterns specified by any of the --include or --exclude
|
patterns specified by any of the --include or --exclude op-
|
||||||
options.
|
tions.
|
||||||
|
|
||||||
-f filename, --file=filename
|
-f filename, --file=filename
|
||||||
Read patterns from the file, one per line, and match them
|
Read patterns from the file, one per line, and match them
|
||||||
@ -358,16 +358,16 @@ OPTIONS
|
|||||||
--include=pattern
|
--include=pattern
|
||||||
If any --include patterns are specified, the only files that
|
If any --include patterns are specified, the only files that
|
||||||
are processed are those that match one of the patterns (and
|
are processed are those that match one of the patterns (and
|
||||||
do not match an --exclude pattern). This option does not
|
do not match an --exclude pattern). This option does not af-
|
||||||
affect directories, but it applies to all files, whether
|
fect directories, but it applies to all files, whether listed
|
||||||
listed on the command line, obtained from --file-list, or by
|
on the command line, obtained from --file-list, or by scan-
|
||||||
scanning a directory. The pattern is a PCRE regular expres-
|
ning a directory. The pattern is a PCRE regular expression,
|
||||||
sion, and is matched against the final component of the file
|
and is matched against the final component of the file name,
|
||||||
name, not the entire path. The -F, -w, and -x options do not
|
not the entire path. The -F, -w, and -x options do not apply
|
||||||
apply to this pattern. The option may be given any number of
|
to this pattern. The option may be given any number of times.
|
||||||
times. If a file name matches both an --include and an
|
If a file name matches both an --include and an --exclude
|
||||||
--exclude pattern, it is excluded. There is no short form
|
pattern, it is excluded. There is no short form for this op-
|
||||||
for this option.
|
tion.
|
||||||
|
|
||||||
--include-from=filename
|
--include-from=filename
|
||||||
Treat each non-empty line of the file as the data for an
|
Treat each non-empty line of the file as the data for an
|
||||||
@ -381,8 +381,8 @@ OPTIONS
|
|||||||
tories that are processed are those that match one of the
|
tories that are processed are those that match one of the
|
||||||
patterns (and do not match an --exclude-dir pattern). This
|
patterns (and do not match an --exclude-dir pattern). This
|
||||||
applies to all directories, whether listed on the command
|
applies to all directories, whether listed on the command
|
||||||
line, obtained from --file-list, or by scanning a parent
|
line, obtained from --file-list, or by scanning a parent di-
|
||||||
directory. The pattern is a PCRE regular expression, and is
|
rectory. The pattern is a PCRE regular expression, and is
|
||||||
matched against the final component of the directory name,
|
matched against the final component of the directory name,
|
||||||
not the entire path. The -F, -w, and -x options do not apply
|
not the entire path. The -F, -w, and -x options do not apply
|
||||||
to this pattern. The option may be given any number of times.
|
to this pattern. The option may be given any number of times.
|
||||||
@ -413,9 +413,9 @@ OPTIONS
|
|||||||
|
|
||||||
--line-buffered
|
--line-buffered
|
||||||
When this option is given, input is read and processed line
|
When this option is given, input is read and processed line
|
||||||
by line, and the output is flushed after each write. By
|
by line, and the output is flushed after each write. By de-
|
||||||
default, input is read in large chunks, unless pcregrep can
|
fault, input is read in large chunks, unless pcregrep can de-
|
||||||
determine that it is reading from a terminal (which is cur-
|
termine that it is reading from a terminal (which is cur-
|
||||||
rently possible only in Unix-like environments). Output to
|
rently possible only in Unix-like environments). Output to
|
||||||
terminal is normally automatically flushed by the operating
|
terminal is normally automatically flushed by the operating
|
||||||
system. This option can be useful when the input or output is
|
system. This option can be useful when the input or output is
|
||||||
@ -437,9 +437,9 @@ OPTIONS
|
|||||||
--locale=locale-name
|
--locale=locale-name
|
||||||
This option specifies a locale to be used for pattern match-
|
This option specifies a locale to be used for pattern match-
|
||||||
ing. It overrides the value in the LC_ALL or LC_CTYPE envi-
|
ing. It overrides the value in the LC_ALL or LC_CTYPE envi-
|
||||||
ronment variables. If no locale is specified, the PCRE
|
ronment variables. If no locale is specified, the PCRE li-
|
||||||
library's default (usually the "C" locale) is used. There is
|
brary's default (usually the "C" locale) is used. There is no
|
||||||
no short form for this option.
|
short form for this option.
|
||||||
|
|
||||||
--match-limit=number
|
--match-limit=number
|
||||||
Processing some regular expression patterns can require a
|
Processing some regular expression patterns can require a
|
||||||
@ -447,26 +447,26 @@ OPTIONS
|
|||||||
gram crash if not enough is available. Other patterns may
|
gram crash if not enough is available. Other patterns may
|
||||||
take a very long time to search for all possible matching
|
take a very long time to search for all possible matching
|
||||||
strings. The pcre_exec() function that is called by pcregrep
|
strings. The pcre_exec() function that is called by pcregrep
|
||||||
to do the matching has two parameters that can limit the
|
to do the matching has two parameters that can limit the re-
|
||||||
resources that it uses.
|
sources that it uses.
|
||||||
|
|
||||||
The --match-limit option provides a means of limiting
|
The --match-limit option provides a means of limiting re-
|
||||||
resource usage when processing patterns that are not going to
|
source usage when processing patterns that are not going to
|
||||||
match, but which have a very large number of possibilities in
|
match, but which have a very large number of possibilities in
|
||||||
their search trees. The classic example is a pattern that
|
their search trees. The classic example is a pattern that
|
||||||
uses nested unlimited repeats. Internally, PCRE uses a func-
|
uses nested unlimited repeats. Internally, PCRE uses a func-
|
||||||
tion called match() which it calls repeatedly (sometimes
|
tion called match() which it calls repeatedly (sometimes re-
|
||||||
recursively). The limit set by --match-limit is imposed on
|
cursively). The limit set by --match-limit is imposed on the
|
||||||
the number of times this function is called during a match,
|
number of times this function is called during a match, which
|
||||||
which has the effect of limiting the amount of backtracking
|
has the effect of limiting the amount of backtracking that
|
||||||
that can take place.
|
can take place.
|
||||||
|
|
||||||
The --recursion-limit option is similar to --match-limit, but
|
The --recursion-limit option is similar to --match-limit, but
|
||||||
instead of limiting the total number of times that match() is
|
instead of limiting the total number of times that match() is
|
||||||
called, it limits the depth of recursive calls, which in turn
|
called, it limits the depth of recursive calls, which in turn
|
||||||
limits the amount of memory that can be used. The recursion
|
limits the amount of memory that can be used. The recursion
|
||||||
depth is a smaller number than the total number of calls,
|
depth is a smaller number than the total number of calls, be-
|
||||||
because not all calls to match() are recursive. This limit is
|
cause not all calls to match() are recursive. This limit is
|
||||||
of use only if it is set smaller than --match-limit.
|
of use only if it is set smaller than --match-limit.
|
||||||
|
|
||||||
There are no short forms for these options. The default set-
|
There are no short forms for these options. The default set-
|
||||||
@ -494,30 +494,30 @@ OPTIONS
|
|||||||
is read line by line (see --line-buffered.)
|
is read line by line (see --line-buffered.)
|
||||||
|
|
||||||
-N newline-type, --newline=newline-type
|
-N newline-type, --newline=newline-type
|
||||||
The PCRE library supports five different conventions for
|
The PCRE library supports five different conventions for in-
|
||||||
indicating the ends of lines. They are the single-character
|
dicating the ends of lines. They are the single-character se-
|
||||||
sequences CR (carriage return) and LF (linefeed), the two-
|
quences CR (carriage return) and LF (linefeed), the two-char-
|
||||||
character sequence CRLF, an "anycrlf" convention, which rec-
|
acter sequence CRLF, an "anycrlf" convention, which recog-
|
||||||
ognizes any of the preceding three types, and an "any" con-
|
nizes any of the preceding three types, and an "any" conven-
|
||||||
vention, in which any Unicode line ending sequence is assumed
|
tion, in which any Unicode line ending sequence is assumed to
|
||||||
to end a line. The Unicode sequences are the three just men-
|
end a line. The Unicode sequences are the three just men-
|
||||||
tioned, plus VT (vertical tab, U+000B), FF (form feed,
|
tioned, plus VT (vertical tab, U+000B), FF (form feed,
|
||||||
U+000C), NEL (next line, U+0085), LS (line separator,
|
U+000C), NEL (next line, U+0085), LS (line separator,
|
||||||
U+2028), and PS (paragraph separator, U+2029).
|
U+2028), and PS (paragraph separator, U+2029).
|
||||||
|
|
||||||
When the PCRE library is built, a default line-ending
|
When the PCRE library is built, a default line-ending se-
|
||||||
sequence is specified. This is normally the standard
|
quence is specified. This is normally the standard sequence
|
||||||
sequence for the operating system. Unless otherwise specified
|
for the operating system. Unless otherwise specified by this
|
||||||
by this option, pcregrep uses the library's default. The
|
option, pcregrep uses the library's default. The possible
|
||||||
possible values for this option are CR, LF, CRLF, ANYCRLF, or
|
values for this option are CR, LF, CRLF, ANYCRLF, or ANY.
|
||||||
ANY. This makes it possible to use pcregrep to scan files
|
This makes it possible to use pcregrep to scan files that
|
||||||
that have come from other environments without having to mod-
|
have come from other environments without having to modify
|
||||||
ify their line endings. If the data that is being scanned
|
their line endings. If the data that is being scanned does
|
||||||
does not agree with the convention set by this option, pcre-
|
not agree with the convention set by this option, pcregrep
|
||||||
grep may behave in strange ways. Note that this option does
|
may behave in strange ways. Note that this option does not
|
||||||
not apply to files specified by the -f, --exclude-from, or
|
apply to files specified by the -f, --exclude-from, or --in-
|
||||||
--include-from options, which are expected to use the operat-
|
clude-from options, which are expected to use the operating
|
||||||
ing system's standard newline sequence.
|
system's standard newline sequence.
|
||||||
|
|
||||||
-n, --line-number
|
-n, --line-number
|
||||||
Precede each output line by its line number in the file, fol-
|
Precede each output line by its line number in the file, fol-
|
||||||
@ -538,12 +538,12 @@ OPTIONS
|
|||||||
is, the -A, -B, and -C options are ignored. If there is more
|
is, the -A, -B, and -C options are ignored. If there is more
|
||||||
than one match in a line, each of them is shown separately.
|
than one match in a line, each of them is shown separately.
|
||||||
If -o is combined with -v (invert the sense of the match to
|
If -o is combined with -v (invert the sense of the match to
|
||||||
find non-matching lines), no output is generated, but the
|
find non-matching lines), no output is generated, but the re-
|
||||||
return code is set appropriately. If the matched portion of
|
turn code is set appropriately. If the matched portion of the
|
||||||
the line is empty, nothing is output unless the file name or
|
line is empty, nothing is output unless the file name or line
|
||||||
line number are being printed, in which case they are shown
|
number are being printed, in which case they are shown on an
|
||||||
on an otherwise empty line. This option is mutually exclusive
|
otherwise empty line. This option is mutually exclusive with
|
||||||
with --file-offsets and --line-offsets.
|
--file-offsets and --line-offsets.
|
||||||
|
|
||||||
-onumber, --only-matching=number
|
-onumber, --only-matching=number
|
||||||
Show only the part of the line that matched the capturing
|
Show only the part of the line that matched the capturing
|
||||||
@ -579,8 +579,8 @@ OPTIONS
|
|||||||
it contains, taking note of any --include and --exclude set-
|
it contains, taking note of any --include and --exclude set-
|
||||||
tings. By default, a directory is read as a normal file; in
|
tings. By default, a directory is read as a normal file; in
|
||||||
some operating systems this gives an immediate end-of-file.
|
some operating systems this gives an immediate end-of-file.
|
||||||
This option is a shorthand for setting the -d option to
|
This option is a shorthand for setting the -d option to "re-
|
||||||
"recurse".
|
curse".
|
||||||
|
|
||||||
--recursion-limit=number
|
--recursion-limit=number
|
||||||
See --match-limit above.
|
See --match-limit above.
|
||||||
@ -626,10 +626,10 @@ OPTIONS
|
|||||||
|
|
||||||
ENVIRONMENT VARIABLES
|
ENVIRONMENT VARIABLES
|
||||||
|
|
||||||
The environment variables LC_ALL and LC_CTYPE are examined, in that
|
The environment variables LC_ALL and LC_CTYPE are examined, in that or-
|
||||||
order, for a locale. The first one that is set is used. This can be
|
der, for a locale. The first one that is set is used. This can be over-
|
||||||
overridden by the --locale option. If no locale is set, the PCRE
|
ridden by the --locale option. If no locale is set, the PCRE library's
|
||||||
library's default (usually the "C" locale) is used.
|
default (usually the "C" locale) is used.
|
||||||
|
|
||||||
|
|
||||||
NEWLINES
|
NEWLINES
|
||||||
@ -640,8 +640,8 @@ NEWLINES
|
|||||||
ever newline sequences they have in the input. However, the setting of
|
ever newline sequences they have in the input. However, the setting of
|
||||||
this option does not affect the interpretation of files specified by
|
this option does not affect the interpretation of files specified by
|
||||||
the -f, --exclude-from, or --include-from options, which are assumed to
|
the -f, --exclude-from, or --include-from options, which are assumed to
|
||||||
use the operating system's standard newline sequence, nor does it
|
use the operating system's standard newline sequence, nor does it af-
|
||||||
affect the way in which pcregrep writes informational messages to the
|
fect the way in which pcregrep writes informational messages to the
|
||||||
standard error and output streams. For these it uses the string "\n" to
|
standard error and output streams. For these it uses the string "\n" to
|
||||||
indicate newlines, relying on the C I/O library to convert this to an
|
indicate newlines, relying on the C I/O library to convert this to an
|
||||||
appropriate sequence.
|
appropriate sequence.
|
||||||
@ -687,13 +687,13 @@ OPTIONS WITH DATA
|
|||||||
--file /some/file
|
--file /some/file
|
||||||
|
|
||||||
Note, however, that if you want to supply a file name beginning with ~
|
Note, however, that if you want to supply a file name beginning with ~
|
||||||
as data in a shell command, and have the shell expand ~ to a home
|
as data in a shell command, and have the shell expand ~ to a home di-
|
||||||
directory, you must separate the file name from the option, because the
|
rectory, you must separate the file name from the option, because the
|
||||||
shell does not treat ~ specially unless it is at the start of an item.
|
shell does not treat ~ specially unless it is at the start of an item.
|
||||||
|
|
||||||
The exceptions to the above are the --colour (or --color) and --only-
|
The exceptions to the above are the --colour (or --color) and --only-
|
||||||
matching options, for which the data is optional. If one of these
|
matching options, for which the data is optional. If one of these op-
|
||||||
options does have data, it must be given in the first form, using an
|
tions does have data, it must be given in the first form, using an
|
||||||
equals character. Otherwise pcregrep will assume that it has no data.
|
equals character. Otherwise pcregrep will assume that it has no data.
|
||||||
|
|
||||||
|
|
||||||
@ -702,14 +702,14 @@ MATCHING ERRORS
|
|||||||
It is possible to supply a regular expression that takes a very long
|
It is possible to supply a regular expression that takes a very long
|
||||||
time to fail to match certain lines. Such patterns normally involve
|
time to fail to match certain lines. Such patterns normally involve
|
||||||
nested indefinite repeats, for example: (a+)*\d when matched against a
|
nested indefinite repeats, for example: (a+)*\d when matched against a
|
||||||
line of a's with no final digit. The PCRE matching function has a
|
line of a's with no final digit. The PCRE matching function has a re-
|
||||||
resource limit that causes it to abort in these circumstances. If this
|
source limit that causes it to abort in these circumstances. If this
|
||||||
happens, pcregrep outputs an error message and the line that caused the
|
happens, pcregrep outputs an error message and the line that caused the
|
||||||
problem to the standard error stream. If there are more than 20 such
|
problem to the standard error stream. If there are more than 20 such
|
||||||
errors, pcregrep gives up.
|
errors, pcregrep gives up.
|
||||||
|
|
||||||
The --match-limit option of pcregrep can be used to set the overall
|
The --match-limit option of pcregrep can be used to set the overall re-
|
||||||
resource limit; there is a second option called --recursion-limit that
|
source limit; there is a second option called --recursion-limit that
|
||||||
sets a limit on the amount of memory (usually stack) that is used (see
|
sets a limit on the amount of memory (usually stack) that is used (see
|
||||||
the discussion of these options above).
|
the discussion of these options above).
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
.TH PCRETEST 1 "23 February 2017" "PCRE 8.41"
|
.TH PCRETEST 1 "10 February 2020" "PCRE 8.44"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
pcretest - a program for testing Perl-compatible regular expressions.
|
pcretest - a program for testing Perl-compatible regular expressions.
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
@ -78,21 +78,19 @@ the 16-bit library, or \fBpcre32_xx\fP when using the 32-bit library".
|
|||||||
.rs
|
.rs
|
||||||
.TP 10
|
.TP 10
|
||||||
\fB-8\fP
|
\fB-8\fP
|
||||||
If both the 8-bit library has been built, this option causes the 8-bit library
|
If the 8-bit library has been built, this option causes it to be used (this is
|
||||||
to be used (which is the default); if the 8-bit library has not been built,
|
the default). If the 8-bit library has not been built, this option causes an
|
||||||
this option causes an error.
|
error.
|
||||||
.TP 10
|
.TP 10
|
||||||
\fB-16\fP
|
\fB-16\fP
|
||||||
If both the 8-bit or the 32-bit, and the 16-bit libraries have been built, this
|
If the 16-bit library has been built, this option causes it to be used. If only
|
||||||
option causes the 16-bit library to be used. If only the 16-bit library has been
|
the 16-bit library has been built, this is the default. If the 16-bit library
|
||||||
built, this is the default (so has no effect). If only the 8-bit or the 32-bit
|
has not been built, this option causes an error.
|
||||||
library has been built, this option causes an error.
|
|
||||||
.TP 10
|
.TP 10
|
||||||
\fB-32\fP
|
\fB-32\fP
|
||||||
If both the 8-bit or the 16-bit, and the 32-bit libraries have been built, this
|
If the 32-bit library has been built, this option causes it to be used. If only
|
||||||
option causes the 32-bit library to be used. If only the 32-bit library has been
|
the 32-bit library has been built, this is the default. If the 32-bit library
|
||||||
built, this is the default (so has no effect). If only the 8-bit or the 16-bit
|
has not been built, this option causes an error.
|
||||||
library has been built, this option causes an error.
|
|
||||||
.TP 10
|
.TP 10
|
||||||
\fB-b\fP
|
\fB-b\fP
|
||||||
Behave as if each pattern has the \fB/B\fP (show byte code) modifier; the
|
Behave as if each pattern has the \fB/B\fP (show byte code) modifier; the
|
||||||
@ -1155,6 +1153,6 @@ Cambridge CB2 3QH, England.
|
|||||||
.rs
|
.rs
|
||||||
.sp
|
.sp
|
||||||
.nf
|
.nf
|
||||||
Last updated: 23 February 2017
|
Last updated: 10 February 2020
|
||||||
Copyright (c) 1997-2017 University of Cambridge.
|
Copyright (c) 1997-2020 University of Cambridge.
|
||||||
.fi
|
.fi
|
||||||
|
@ -47,15 +47,15 @@ INPUT DATA FORMAT
|
|||||||
PCRE's 8-BIT, 16-BIT AND 32-BIT LIBRARIES
|
PCRE's 8-BIT, 16-BIT AND 32-BIT LIBRARIES
|
||||||
|
|
||||||
From release 8.30, two separate PCRE libraries can be built. The origi-
|
From release 8.30, two separate PCRE libraries can be built. The origi-
|
||||||
nal one supports 8-bit character strings, whereas the newer 16-bit
|
nal one supports 8-bit character strings, whereas the newer 16-bit li-
|
||||||
library supports character strings encoded in 16-bit units. From
|
brary supports character strings encoded in 16-bit units. From release
|
||||||
release 8.32, a third library can be built, supporting character
|
8.32, a third library can be built, supporting character strings en-
|
||||||
strings encoded in 32-bit units. The pcretest program can be used to
|
coded in 32-bit units. The pcretest program can be used to test all
|
||||||
test all three libraries. However, it is itself still an 8-bit program,
|
three libraries. However, it is itself still an 8-bit program, reading
|
||||||
reading 8-bit input and writing 8-bit output. When testing the 16-bit
|
8-bit input and writing 8-bit output. When testing the 16-bit or
|
||||||
or 32-bit library, the patterns and data strings are converted to 16-
|
32-bit library, the patterns and data strings are converted to 16- or
|
||||||
or 32-bit format before being passed to the PCRE library functions.
|
32-bit format before being passed to the PCRE library functions. Re-
|
||||||
Results are converted to 8-bit for output.
|
sults are converted to 8-bit for output.
|
||||||
|
|
||||||
References to functions and structures of the form pcre[16|32]_xx below
|
References to functions and structures of the form pcre[16|32]_xx below
|
||||||
mean "pcre_xx when using the 8-bit library, pcre16_xx when using the
|
mean "pcre_xx when using the 8-bit library, pcre16_xx when using the
|
||||||
@ -64,34 +64,31 @@ PCRE's 8-BIT, 16-BIT AND 32-BIT LIBRARIES
|
|||||||
|
|
||||||
COMMAND LINE OPTIONS
|
COMMAND LINE OPTIONS
|
||||||
|
|
||||||
-8 If both the 8-bit library has been built, this option causes
|
-8 If the 8-bit library has been built, this option causes it to
|
||||||
the 8-bit library to be used (which is the default); if the
|
be used (this is the default). If the 8-bit library has not
|
||||||
8-bit library has not been built, this option causes an
|
been built, this option causes an error.
|
||||||
error.
|
|
||||||
|
|
||||||
-16 If both the 8-bit or the 32-bit, and the 16-bit libraries
|
-16 If the 16-bit library has been built, this option causes it
|
||||||
have been built, this option causes the 16-bit library to be
|
to be used. If only the 16-bit library has been built, this
|
||||||
used. If only the 16-bit library has been built, this is the
|
is the default. If the 16-bit library has not been built,
|
||||||
default (so has no effect). If only the 8-bit or the 32-bit
|
this option causes an error.
|
||||||
library has been built, this option causes an error.
|
|
||||||
|
|
||||||
-32 If both the 8-bit or the 16-bit, and the 32-bit libraries
|
-32 If the 32-bit library has been built, this option causes it
|
||||||
have been built, this option causes the 32-bit library to be
|
to be used. If only the 32-bit library has been built, this
|
||||||
used. If only the 32-bit library has been built, this is the
|
is the default. If the 32-bit library has not been built,
|
||||||
default (so has no effect). If only the 8-bit or the 16-bit
|
this option causes an error.
|
||||||
library has been built, this option causes an error.
|
|
||||||
|
|
||||||
-b Behave as if each pattern has the /B (show byte code) modi-
|
-b Behave as if each pattern has the /B (show byte code) modi-
|
||||||
fier; the internal form is output after compilation.
|
fier; the internal form is output after compilation.
|
||||||
|
|
||||||
-C Output the version number of the PCRE library, and all avail-
|
-C Output the version number of the PCRE library, and all avail-
|
||||||
able information about the optional features that are
|
able information about the optional features that are in-
|
||||||
included, and then exit with zero exit code. All other
|
cluded, and then exit with zero exit code. All other options
|
||||||
options are ignored.
|
are ignored.
|
||||||
|
|
||||||
-C option Output information about a specific build-time option, then
|
-C option Output information about a specific build-time option, then
|
||||||
exit. This functionality is intended for use in scripts such
|
exit. This functionality is intended for use in scripts such
|
||||||
as RunTest. The following options output the value and set
|
as RunTest. The following options output the value and set
|
||||||
the exit code as indicated:
|
the exit code as indicated:
|
||||||
|
|
||||||
ebcdic-nl the code for LF (= NL) in an EBCDIC environment:
|
ebcdic-nl the code for LF (= NL) in an EBCDIC environment:
|
||||||
@ -107,7 +104,7 @@ COMMAND LINE OPTIONS
|
|||||||
ANYCRLF or ANY
|
ANYCRLF or ANY
|
||||||
exit code is always 0
|
exit code is always 0
|
||||||
|
|
||||||
The following options output 1 for true or 0 for false, and
|
The following options output 1 for true or 0 for false, and
|
||||||
set the exit code to the same value:
|
set the exit code to the same value:
|
||||||
|
|
||||||
ebcdic compiled for an EBCDIC environment
|
ebcdic compiled for an EBCDIC environment
|
||||||
@ -119,61 +116,61 @@ COMMAND LINE OPTIONS
|
|||||||
utf UTF-8 and/or UTF-16 and/or UTF-32 support
|
utf UTF-8 and/or UTF-16 and/or UTF-32 support
|
||||||
is available
|
is available
|
||||||
|
|
||||||
If an unknown option is given, an error message is output;
|
If an unknown option is given, an error message is output;
|
||||||
the exit code is 0.
|
the exit code is 0.
|
||||||
|
|
||||||
-d Behave as if each pattern has the /D (debug) modifier; the
|
-d Behave as if each pattern has the /D (debug) modifier; the
|
||||||
internal form and information about the compiled pattern is
|
internal form and information about the compiled pattern is
|
||||||
output after compilation; -d is equivalent to -b -i.
|
output after compilation; -d is equivalent to -b -i.
|
||||||
|
|
||||||
-dfa Behave as if each data line contains the \D escape sequence;
|
-dfa Behave as if each data line contains the \D escape sequence;
|
||||||
this causes the alternative matching function,
|
this causes the alternative matching function,
|
||||||
pcre[16|32]_dfa_exec(), to be used instead of the standard
|
pcre[16|32]_dfa_exec(), to be used instead of the standard
|
||||||
pcre[16|32]_exec() function (more detail is given below).
|
pcre[16|32]_exec() function (more detail is given below).
|
||||||
|
|
||||||
-help Output a brief summary these options and then exit.
|
-help Output a brief summary these options and then exit.
|
||||||
|
|
||||||
-i Behave as if each pattern has the /I modifier; information
|
-i Behave as if each pattern has the /I modifier; information
|
||||||
about the compiled pattern is given after compilation.
|
about the compiled pattern is given after compilation.
|
||||||
|
|
||||||
-M Behave as if each data line contains the \M escape sequence;
|
-M Behave as if each data line contains the \M escape sequence;
|
||||||
this causes PCRE to discover the minimum MATCH_LIMIT and
|
this causes PCRE to discover the minimum MATCH_LIMIT and
|
||||||
MATCH_LIMIT_RECURSION settings by calling pcre[16|32]_exec()
|
MATCH_LIMIT_RECURSION settings by calling pcre[16|32]_exec()
|
||||||
repeatedly with different limits.
|
repeatedly with different limits.
|
||||||
|
|
||||||
-m Output the size of each compiled pattern after it has been
|
-m Output the size of each compiled pattern after it has been
|
||||||
compiled. This is equivalent to adding /M to each regular
|
compiled. This is equivalent to adding /M to each regular ex-
|
||||||
expression. The size is given in bytes for both libraries.
|
pression. The size is given in bytes for both libraries.
|
||||||
|
|
||||||
-O Behave as if each pattern has the /O modifier, that is dis-
|
-O Behave as if each pattern has the /O modifier, that is dis-
|
||||||
able auto-possessification for all patterns.
|
able auto-possessification for all patterns.
|
||||||
|
|
||||||
-o osize Set the number of elements in the output vector that is used
|
-o osize Set the number of elements in the output vector that is used
|
||||||
when calling pcre[16|32]_exec() or pcre[16|32]_dfa_exec() to
|
when calling pcre[16|32]_exec() or pcre[16|32]_dfa_exec() to
|
||||||
be osize. The default value is 45, which is enough for 14
|
be osize. The default value is 45, which is enough for 14
|
||||||
capturing subexpressions for pcre[16|32]_exec() or 22 differ-
|
capturing subexpressions for pcre[16|32]_exec() or 22 differ-
|
||||||
ent matches for pcre[16|32]_dfa_exec(). The vector size can
|
ent matches for pcre[16|32]_dfa_exec(). The vector size can
|
||||||
be changed for individual matching calls by including \O in
|
be changed for individual matching calls by including \O in
|
||||||
the data line (see below).
|
the data line (see below).
|
||||||
|
|
||||||
-p Behave as if each pattern has the /P modifier; the POSIX
|
-p Behave as if each pattern has the /P modifier; the POSIX
|
||||||
wrapper API is used to call PCRE. None of the other options
|
wrapper API is used to call PCRE. None of the other options
|
||||||
has any effect when -p is set. This option can be used only
|
has any effect when -p is set. This option can be used only
|
||||||
with the 8-bit library.
|
with the 8-bit library.
|
||||||
|
|
||||||
-q Do not output the version number of pcretest at the start of
|
-q Do not output the version number of pcretest at the start of
|
||||||
execution.
|
execution.
|
||||||
|
|
||||||
-S size On Unix-like systems, set the size of the run-time stack to
|
-S size On Unix-like systems, set the size of the run-time stack to
|
||||||
size megabytes.
|
size megabytes.
|
||||||
|
|
||||||
-s or -s+ Behave as if each pattern has the /S modifier; in other
|
-s or -s+ Behave as if each pattern has the /S modifier; in other
|
||||||
words, force each pattern to be studied. If -s+ is used, all
|
words, force each pattern to be studied. If -s+ is used, all
|
||||||
the JIT compile options are passed to pcre[16|32]_study(),
|
the JIT compile options are passed to pcre[16|32]_study(),
|
||||||
causing just-in-time optimization to be set up if it is
|
causing just-in-time optimization to be set up if it is
|
||||||
available, for both full and partial matching. Specific JIT
|
available, for both full and partial matching. Specific JIT
|
||||||
compile options can be selected by following -s+ with a digit
|
compile options can be selected by following -s+ with a digit
|
||||||
in the range 1 to 7, which selects the JIT compile modes as
|
in the range 1 to 7, which selects the JIT compile modes as
|
||||||
follows:
|
follows:
|
||||||
|
|
||||||
1 normal match only
|
1 normal match only
|
||||||
@ -183,119 +180,119 @@ COMMAND LINE OPTIONS
|
|||||||
6 soft and hard partial match
|
6 soft and hard partial match
|
||||||
7 all three modes (default)
|
7 all three modes (default)
|
||||||
|
|
||||||
If -s++ is used instead of -s+ (with or without a following
|
If -s++ is used instead of -s+ (with or without a following
|
||||||
digit), the text "(JIT)" is added to the first output line
|
digit), the text "(JIT)" is added to the first output line
|
||||||
after a match or no match when JIT-compiled code was actually
|
after a match or no match when JIT-compiled code was actually
|
||||||
used.
|
used.
|
||||||
|
|
||||||
Note that there are pattern options that can override -s,
|
Note that there are pattern options that can override -s, ei-
|
||||||
either specifying no studying at all, or suppressing JIT com-
|
ther specifying no studying at all, or suppressing JIT compi-
|
||||||
pilation.
|
lation.
|
||||||
|
|
||||||
If the /I or /D option is present on a pattern (requesting
|
If the /I or /D option is present on a pattern (requesting
|
||||||
output about the compiled pattern), information about the
|
output about the compiled pattern), information about the re-
|
||||||
result of studying is not included when studying is caused
|
sult of studying is not included when studying is caused only
|
||||||
only by -s and neither -i nor -d is present on the command
|
by -s and neither -i nor -d is present on the command line.
|
||||||
line. This behaviour means that the output from tests that
|
This behaviour means that the output from tests that are run
|
||||||
are run with and without -s should be identical, except when
|
with and without -s should be identical, except when options
|
||||||
options that output information about the actual running of a
|
that output information about the actual running of a match
|
||||||
match are set.
|
are set.
|
||||||
|
|
||||||
The -M, -t, and -tm options, which give information about
|
The -M, -t, and -tm options, which give information about re-
|
||||||
resources used, are likely to produce different output with
|
sources used, are likely to produce different output with and
|
||||||
and without -s. Output may also differ if the /C option is
|
without -s. Output may also differ if the /C option is
|
||||||
present on an individual pattern. This uses callouts to trace
|
present on an individual pattern. This uses callouts to trace
|
||||||
the the matching process, and this may be different between
|
the the matching process, and this may be different between
|
||||||
studied and non-studied patterns. If the pattern contains
|
studied and non-studied patterns. If the pattern contains
|
||||||
(*MARK) items there may also be differences, for the same
|
(*MARK) items there may also be differences, for the same
|
||||||
reason. The -s command line option can be overridden for spe-
|
reason. The -s command line option can be overridden for spe-
|
||||||
cific patterns that should never be studied (see the /S pat-
|
cific patterns that should never be studied (see the /S pat-
|
||||||
tern modifier below).
|
tern modifier below).
|
||||||
|
|
||||||
-t Run each compile, study, and match many times with a timer,
|
-t Run each compile, study, and match many times with a timer,
|
||||||
and output the resulting times per compile, study, or match
|
and output the resulting times per compile, study, or match
|
||||||
(in milliseconds). Do not set -m with -t, because you will
|
(in milliseconds). Do not set -m with -t, because you will
|
||||||
then get the size output a zillion times, and the timing will
|
then get the size output a zillion times, and the timing will
|
||||||
be distorted. You can control the number of iterations that
|
be distorted. You can control the number of iterations that
|
||||||
are used for timing by following -t with a number (as a sepa-
|
are used for timing by following -t with a number (as a sepa-
|
||||||
rate item on the command line). For example, "-t 1000" iter-
|
rate item on the command line). For example, "-t 1000" iter-
|
||||||
ates 1000 times. The default is to iterate 500000 times.
|
ates 1000 times. The default is to iterate 500000 times.
|
||||||
|
|
||||||
-tm This is like -t except that it times only the matching phase,
|
-tm This is like -t except that it times only the matching phase,
|
||||||
not the compile or study phases.
|
not the compile or study phases.
|
||||||
|
|
||||||
-T -TM These behave like -t and -tm, but in addition, at the end of
|
-T -TM These behave like -t and -tm, but in addition, at the end of
|
||||||
a run, the total times for all compiles, studies, and matches
|
a run, the total times for all compiles, studies, and matches
|
||||||
are output.
|
are output.
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
|
|
||||||
If pcretest is given two filename arguments, it reads from the first
|
If pcretest is given two filename arguments, it reads from the first
|
||||||
and writes to the second. If it is given only one filename argument, it
|
and writes to the second. If it is given only one filename argument, it
|
||||||
reads from that file and writes to stdout. Otherwise, it reads from
|
reads from that file and writes to stdout. Otherwise, it reads from
|
||||||
stdin and writes to stdout, and prompts for each line of input, using
|
stdin and writes to stdout, and prompts for each line of input, using
|
||||||
"re>" to prompt for regular expressions, and "data>" to prompt for data
|
"re>" to prompt for regular expressions, and "data>" to prompt for data
|
||||||
lines.
|
lines.
|
||||||
|
|
||||||
When pcretest is built, a configuration option can specify that it
|
When pcretest is built, a configuration option can specify that it
|
||||||
should be linked with the libreadline library. When this is done, if
|
should be linked with the libreadline library. When this is done, if
|
||||||
the input is from a terminal, it is read using the readline() function.
|
the input is from a terminal, it is read using the readline() function.
|
||||||
This provides line-editing and history facilities. The output from the
|
This provides line-editing and history facilities. The output from the
|
||||||
-help option states whether or not readline() will be used.
|
-help option states whether or not readline() will be used.
|
||||||
|
|
||||||
The program handles any number of sets of input on a single input file.
|
The program handles any number of sets of input on a single input file.
|
||||||
Each set starts with a regular expression, and continues with any num-
|
Each set starts with a regular expression, and continues with any num-
|
||||||
ber of data lines to be matched against that pattern.
|
ber of data lines to be matched against that pattern.
|
||||||
|
|
||||||
Each data line is matched separately and independently. If you want to
|
Each data line is matched separately and independently. If you want to
|
||||||
do multi-line matches, you have to use the \n escape sequence (or \r or
|
do multi-line matches, you have to use the \n escape sequence (or \r or
|
||||||
\r\n, etc., depending on the newline setting) in a single line of input
|
\r\n, etc., depending on the newline setting) in a single line of input
|
||||||
to encode the newline sequences. There is no limit on the length of
|
to encode the newline sequences. There is no limit on the length of
|
||||||
data lines; the input buffer is automatically extended if it is too
|
data lines; the input buffer is automatically extended if it is too
|
||||||
small.
|
small.
|
||||||
|
|
||||||
An empty line signals the end of the data lines, at which point a new
|
An empty line signals the end of the data lines, at which point a new
|
||||||
regular expression is read. The regular expressions are given enclosed
|
regular expression is read. The regular expressions are given enclosed
|
||||||
in any non-alphanumeric delimiters other than backslash, for example:
|
in any non-alphanumeric delimiters other than backslash, for example:
|
||||||
|
|
||||||
/(a|bc)x+yz/
|
/(a|bc)x+yz/
|
||||||
|
|
||||||
White space before the initial delimiter is ignored. A regular expres-
|
White space before the initial delimiter is ignored. A regular expres-
|
||||||
sion may be continued over several input lines, in which case the new-
|
sion may be continued over several input lines, in which case the new-
|
||||||
line characters are included within it. It is possible to include the
|
line characters are included within it. It is possible to include the
|
||||||
delimiter within the pattern by escaping it, for example
|
delimiter within the pattern by escaping it, for example
|
||||||
|
|
||||||
/abc\/def/
|
/abc\/def/
|
||||||
|
|
||||||
If you do so, the escape and the delimiter form part of the pattern,
|
If you do so, the escape and the delimiter form part of the pattern,
|
||||||
but since delimiters are always non-alphanumeric, this does not affect
|
but since delimiters are always non-alphanumeric, this does not affect
|
||||||
its interpretation. If the terminating delimiter is immediately fol-
|
its interpretation. If the terminating delimiter is immediately fol-
|
||||||
lowed by a backslash, for example,
|
lowed by a backslash, for example,
|
||||||
|
|
||||||
/abc/\
|
/abc/\
|
||||||
|
|
||||||
then a backslash is added to the end of the pattern. This is done to
|
then a backslash is added to the end of the pattern. This is done to
|
||||||
provide a way of testing the error condition that arises if a pattern
|
provide a way of testing the error condition that arises if a pattern
|
||||||
finishes with a backslash, because
|
finishes with a backslash, because
|
||||||
|
|
||||||
/abc\/
|
/abc\/
|
||||||
|
|
||||||
is interpreted as the first line of a pattern that starts with "abc/",
|
is interpreted as the first line of a pattern that starts with "abc/",
|
||||||
causing pcretest to read the next line as a continuation of the regular
|
causing pcretest to read the next line as a continuation of the regular
|
||||||
expression.
|
expression.
|
||||||
|
|
||||||
|
|
||||||
PATTERN MODIFIERS
|
PATTERN MODIFIERS
|
||||||
|
|
||||||
A pattern may be followed by any number of modifiers, which are mostly
|
A pattern may be followed by any number of modifiers, which are mostly
|
||||||
single characters, though some of these can be qualified by further
|
single characters, though some of these can be qualified by further
|
||||||
characters. Following Perl usage, these are referred to below as, for
|
characters. Following Perl usage, these are referred to below as, for
|
||||||
example, "the /i modifier", even though the delimiter of the pattern
|
example, "the /i modifier", even though the delimiter of the pattern
|
||||||
need not always be a slash, and no slash is used when writing modi-
|
need not always be a slash, and no slash is used when writing modi-
|
||||||
fiers. White space may appear between the final pattern delimiter and
|
fiers. White space may appear between the final pattern delimiter and
|
||||||
the first modifier, and between the modifiers themselves. For refer-
|
the first modifier, and between the modifiers themselves. For refer-
|
||||||
ence, here is a complete list of modifiers. They fall into several
|
ence, here is a complete list of modifiers. They fall into several
|
||||||
groups that are described in detail in the following sections.
|
groups that are described in detail in the following sections.
|
||||||
|
|
||||||
/8 set UTF mode
|
/8 set UTF mode
|
||||||
@ -347,8 +344,8 @@ PATTERN MODIFIERS
|
|||||||
Perl-compatible modifiers
|
Perl-compatible modifiers
|
||||||
|
|
||||||
The /i, /m, /s, and /x modifiers set the PCRE_CASELESS, PCRE_MULTILINE,
|
The /i, /m, /s, and /x modifiers set the PCRE_CASELESS, PCRE_MULTILINE,
|
||||||
PCRE_DOTALL, or PCRE_EXTENDED options, respectively, when
|
PCRE_DOTALL, or PCRE_EXTENDED options, respectively, when
|
||||||
pcre[16|32]_compile() is called. These four modifier letters have the
|
pcre[16|32]_compile() is called. These four modifier letters have the
|
||||||
same effect as they do in Perl. For example:
|
same effect as they do in Perl. For example:
|
||||||
|
|
||||||
/caseless/i
|
/caseless/i
|
||||||
@ -356,7 +353,7 @@ PATTERN MODIFIERS
|
|||||||
|
|
||||||
Modifiers for other PCRE options
|
Modifiers for other PCRE options
|
||||||
|
|
||||||
The following table shows additional modifiers for setting PCRE com-
|
The following table shows additional modifiers for setting PCRE com-
|
||||||
pile-time options that do not correspond to anything in Perl:
|
pile-time options that do not correspond to anything in Perl:
|
||||||
|
|
||||||
/8 PCRE_UTF8 ) when using the 8-bit
|
/8 PCRE_UTF8 ) when using the 8-bit
|
||||||
@ -389,145 +386,145 @@ PATTERN MODIFIERS
|
|||||||
/<bsr_unicode> PCRE_BSR_UNICODE
|
/<bsr_unicode> PCRE_BSR_UNICODE
|
||||||
/<JS> PCRE_JAVASCRIPT_COMPAT
|
/<JS> PCRE_JAVASCRIPT_COMPAT
|
||||||
|
|
||||||
The modifiers that are enclosed in angle brackets are literal strings
|
The modifiers that are enclosed in angle brackets are literal strings
|
||||||
as shown, including the angle brackets, but the letters within can be
|
as shown, including the angle brackets, but the letters within can be
|
||||||
in either case. This example sets multiline matching with CRLF as the
|
in either case. This example sets multiline matching with CRLF as the
|
||||||
line ending sequence:
|
line ending sequence:
|
||||||
|
|
||||||
/^abc/m<CRLF>
|
/^abc/m<CRLF>
|
||||||
|
|
||||||
As well as turning on the PCRE_UTF8/16/32 option, the /8 modifier
|
As well as turning on the PCRE_UTF8/16/32 option, the /8 modifier
|
||||||
causes all non-printing characters in output strings to be printed
|
causes all non-printing characters in output strings to be printed us-
|
||||||
using the \x{hh...} notation. Otherwise, those less than 0x100 are out-
|
ing the \x{hh...} notation. Otherwise, those less than 0x100 are output
|
||||||
put in hex without the curly brackets.
|
in hex without the curly brackets.
|
||||||
|
|
||||||
Full details of the PCRE options are given in the pcreapi documenta-
|
Full details of the PCRE options are given in the pcreapi documenta-
|
||||||
tion.
|
tion.
|
||||||
|
|
||||||
Finding all matches in a string
|
Finding all matches in a string
|
||||||
|
|
||||||
Searching for all possible matches within each subject string can be
|
Searching for all possible matches within each subject string can be
|
||||||
requested by the /g or /G modifier. After finding a match, PCRE is
|
requested by the /g or /G modifier. After finding a match, PCRE is
|
||||||
called again to search the remainder of the subject string. The differ-
|
called again to search the remainder of the subject string. The differ-
|
||||||
ence between /g and /G is that the former uses the startoffset argument
|
ence between /g and /G is that the former uses the startoffset argument
|
||||||
to pcre[16|32]_exec() to start searching at a new point within the
|
to pcre[16|32]_exec() to start searching at a new point within the en-
|
||||||
entire string (which is in effect what Perl does), whereas the latter
|
tire string (which is in effect what Perl does), whereas the latter
|
||||||
passes over a shortened substring. This makes a difference to the
|
passes over a shortened substring. This makes a difference to the
|
||||||
matching process if the pattern begins with a lookbehind assertion
|
matching process if the pattern begins with a lookbehind assertion (in-
|
||||||
(including \b or \B).
|
cluding \b or \B).
|
||||||
|
|
||||||
If any call to pcre[16|32]_exec() in a /g or /G sequence matches an
|
If any call to pcre[16|32]_exec() in a /g or /G sequence matches an
|
||||||
empty string, the next call is done with the PCRE_NOTEMPTY_ATSTART and
|
empty string, the next call is done with the PCRE_NOTEMPTY_ATSTART and
|
||||||
PCRE_ANCHORED flags set in order to search for another, non-empty,
|
PCRE_ANCHORED flags set in order to search for another, non-empty,
|
||||||
match at the same point. If this second match fails, the start offset
|
match at the same point. If this second match fails, the start offset
|
||||||
is advanced, and the normal match is retried. This imitates the way
|
is advanced, and the normal match is retried. This imitates the way
|
||||||
Perl handles such cases when using the /g modifier or the split() func-
|
Perl handles such cases when using the /g modifier or the split() func-
|
||||||
tion. Normally, the start offset is advanced by one character, but if
|
tion. Normally, the start offset is advanced by one character, but if
|
||||||
the newline convention recognizes CRLF as a newline, and the current
|
the newline convention recognizes CRLF as a newline, and the current
|
||||||
character is CR followed by LF, an advance of two is used.
|
character is CR followed by LF, an advance of two is used.
|
||||||
|
|
||||||
Other modifiers
|
Other modifiers
|
||||||
|
|
||||||
There are yet more modifiers for controlling the way pcretest operates.
|
There are yet more modifiers for controlling the way pcretest operates.
|
||||||
|
|
||||||
The /+ modifier requests that as well as outputting the substring that
|
The /+ modifier requests that as well as outputting the substring that
|
||||||
matched the entire pattern, pcretest should in addition output the
|
matched the entire pattern, pcretest should in addition output the re-
|
||||||
remainder of the subject string. This is useful for tests where the
|
mainder of the subject string. This is useful for tests where the sub-
|
||||||
subject contains multiple copies of the same substring. If the + modi-
|
ject contains multiple copies of the same substring. If the + modifier
|
||||||
fier appears twice, the same action is taken for captured substrings.
|
appears twice, the same action is taken for captured substrings. In
|
||||||
In each case the remainder is output on the following line with a plus
|
each case the remainder is output on the following line with a plus
|
||||||
character following the capture number. Note that this modifier must
|
character following the capture number. Note that this modifier must
|
||||||
not immediately follow the /S modifier because /S+ and /S++ have other
|
not immediately follow the /S modifier because /S+ and /S++ have other
|
||||||
meanings.
|
meanings.
|
||||||
|
|
||||||
The /= modifier requests that the values of all potential captured
|
The /= modifier requests that the values of all potential captured
|
||||||
parentheses be output after a match. By default, only those up to the
|
parentheses be output after a match. By default, only those up to the
|
||||||
highest one actually used in the match are output (corresponding to the
|
highest one actually used in the match are output (corresponding to the
|
||||||
return code from pcre[16|32]_exec()). Values in the offsets vector cor-
|
return code from pcre[16|32]_exec()). Values in the offsets vector cor-
|
||||||
responding to higher numbers should be set to -1, and these are output
|
responding to higher numbers should be set to -1, and these are output
|
||||||
as "<unset>". This modifier gives a way of checking that this is hap-
|
as "<unset>". This modifier gives a way of checking that this is hap-
|
||||||
pening.
|
pening.
|
||||||
|
|
||||||
The /B modifier is a debugging feature. It requests that pcretest out-
|
The /B modifier is a debugging feature. It requests that pcretest out-
|
||||||
put a representation of the compiled code after compilation. Normally
|
put a representation of the compiled code after compilation. Normally
|
||||||
this information contains length and offset values; however, if /Z is
|
this information contains length and offset values; however, if /Z is
|
||||||
also present, this data is replaced by spaces. This is a special fea-
|
also present, this data is replaced by spaces. This is a special fea-
|
||||||
ture for use in the automatic test scripts; it ensures that the same
|
ture for use in the automatic test scripts; it ensures that the same
|
||||||
output is generated for different internal link sizes.
|
output is generated for different internal link sizes.
|
||||||
|
|
||||||
The /D modifier is a PCRE debugging feature, and is equivalent to /BI,
|
The /D modifier is a PCRE debugging feature, and is equivalent to /BI,
|
||||||
that is, both the /B and the /I modifiers.
|
that is, both the /B and the /I modifiers.
|
||||||
|
|
||||||
The /F modifier causes pcretest to flip the byte order of the 2-byte
|
The /F modifier causes pcretest to flip the byte order of the 2-byte
|
||||||
and 4-byte fields in the compiled pattern. This facility is for testing
|
and 4-byte fields in the compiled pattern. This facility is for testing
|
||||||
the feature in PCRE that allows it to execute patterns that were com-
|
the feature in PCRE that allows it to execute patterns that were com-
|
||||||
piled on a host with a different endianness. This feature is not avail-
|
piled on a host with a different endianness. This feature is not avail-
|
||||||
able when the POSIX interface to PCRE is being used, that is, when the
|
able when the POSIX interface to PCRE is being used, that is, when the
|
||||||
/P pattern modifier is specified. See also the section about saving and
|
/P pattern modifier is specified. See also the section about saving and
|
||||||
reloading compiled patterns below.
|
reloading compiled patterns below.
|
||||||
|
|
||||||
The /I modifier requests that pcretest output information about the
|
The /I modifier requests that pcretest output information about the
|
||||||
compiled pattern (whether it is anchored, has a fixed first character,
|
compiled pattern (whether it is anchored, has a fixed first character,
|
||||||
and so on). It does this by calling pcre[16|32]_fullinfo() after com-
|
and so on). It does this by calling pcre[16|32]_fullinfo() after com-
|
||||||
piling a pattern. If the pattern is studied, the results of that are
|
piling a pattern. If the pattern is studied, the results of that are
|
||||||
also output. In this output, the word "char" means a non-UTF character,
|
also output. In this output, the word "char" means a non-UTF character,
|
||||||
that is, the value of a single data item (8-bit, 16-bit, or 32-bit,
|
that is, the value of a single data item (8-bit, 16-bit, or 32-bit, de-
|
||||||
depending on the library that is being tested).
|
pending on the library that is being tested).
|
||||||
|
|
||||||
The /K modifier requests pcretest to show names from backtracking con-
|
The /K modifier requests pcretest to show names from backtracking con-
|
||||||
trol verbs that are returned from calls to pcre[16|32]_exec(). It
|
trol verbs that are returned from calls to pcre[16|32]_exec(). It
|
||||||
causes pcretest to create a pcre[16|32]_extra block if one has not
|
causes pcretest to create a pcre[16|32]_extra block if one has not al-
|
||||||
already been created by a call to pcre[16|32]_study(), and to set the
|
ready been created by a call to pcre[16|32]_study(), and to set the
|
||||||
PCRE_EXTRA_MARK flag and the mark field within it, every time that
|
PCRE_EXTRA_MARK flag and the mark field within it, every time that
|
||||||
pcre[16|32]_exec() is called. If the variable that the mark field
|
pcre[16|32]_exec() is called. If the variable that the mark field
|
||||||
points to is non-NULL for a match, non-match, or partial match,
|
points to is non-NULL for a match, non-match, or partial match,
|
||||||
pcretest prints the string to which it points. For a match, this is
|
pcretest prints the string to which it points. For a match, this is
|
||||||
shown on a line by itself, tagged with "MK:". For a non-match it is
|
shown on a line by itself, tagged with "MK:". For a non-match it is
|
||||||
added to the message.
|
added to the message.
|
||||||
|
|
||||||
The /L modifier must be followed directly by the name of a locale, for
|
The /L modifier must be followed directly by the name of a locale, for
|
||||||
example,
|
example,
|
||||||
|
|
||||||
/pattern/Lfr_FR
|
/pattern/Lfr_FR
|
||||||
|
|
||||||
For this reason, it must be the last modifier. The given locale is set,
|
For this reason, it must be the last modifier. The given locale is set,
|
||||||
pcre[16|32]_maketables() is called to build a set of character tables
|
pcre[16|32]_maketables() is called to build a set of character tables
|
||||||
for the locale, and this is then passed to pcre[16|32]_compile() when
|
for the locale, and this is then passed to pcre[16|32]_compile() when
|
||||||
compiling the regular expression. Without an /L (or /T) modifier, NULL
|
compiling the regular expression. Without an /L (or /T) modifier, NULL
|
||||||
is passed as the tables pointer; that is, /L applies only to the
|
is passed as the tables pointer; that is, /L applies only to the ex-
|
||||||
expression on which it appears.
|
pression on which it appears.
|
||||||
|
|
||||||
The /M modifier causes the size in bytes of the memory block used to
|
The /M modifier causes the size in bytes of the memory block used to
|
||||||
hold the compiled pattern to be output. This does not include the size
|
hold the compiled pattern to be output. This does not include the size
|
||||||
of the pcre[16|32] block; it is just the actual compiled data. If the
|
of the pcre[16|32] block; it is just the actual compiled data. If the
|
||||||
pattern is successfully studied with the PCRE_STUDY_JIT_COMPILE option,
|
pattern is successfully studied with the PCRE_STUDY_JIT_COMPILE option,
|
||||||
the size of the JIT compiled code is also output.
|
the size of the JIT compiled code is also output.
|
||||||
|
|
||||||
The /Q modifier is used to test the use of pcre_stack_guard. It must be
|
The /Q modifier is used to test the use of pcre_stack_guard. It must be
|
||||||
followed by '0' or '1', specifying the return code to be given from an
|
followed by '0' or '1', specifying the return code to be given from an
|
||||||
external function that is passed to PCRE and used for stack checking
|
external function that is passed to PCRE and used for stack checking
|
||||||
during compilation (see the pcreapi documentation for details).
|
during compilation (see the pcreapi documentation for details).
|
||||||
|
|
||||||
The /S modifier causes pcre[16|32]_study() to be called after the
|
The /S modifier causes pcre[16|32]_study() to be called after the ex-
|
||||||
expression has been compiled, and the results used when the expression
|
pression has been compiled, and the results used when the expression is
|
||||||
is matched. There are a number of qualifying characters that may follow
|
matched. There are a number of qualifying characters that may follow
|
||||||
/S. They may appear in any order.
|
/S. They may appear in any order.
|
||||||
|
|
||||||
If /S is followed by an exclamation mark, pcre[16|32]_study() is called
|
If /S is followed by an exclamation mark, pcre[16|32]_study() is called
|
||||||
with the PCRE_STUDY_EXTRA_NEEDED option, causing it always to return a
|
with the PCRE_STUDY_EXTRA_NEEDED option, causing it always to return a
|
||||||
pcre_extra block, even when studying discovers no useful information.
|
pcre_extra block, even when studying discovers no useful information.
|
||||||
|
|
||||||
If /S is followed by a second S character, it suppresses studying, even
|
If /S is followed by a second S character, it suppresses studying, even
|
||||||
if it was requested externally by the -s command line option. This
|
if it was requested externally by the -s command line option. This
|
||||||
makes it possible to specify that certain patterns are always studied,
|
makes it possible to specify that certain patterns are always studied,
|
||||||
and others are never studied, independently of -s. This feature is used
|
and others are never studied, independently of -s. This feature is used
|
||||||
in the test files in a few cases where the output is different when the
|
in the test files in a few cases where the output is different when the
|
||||||
pattern is studied.
|
pattern is studied.
|
||||||
|
|
||||||
If the /S modifier is followed by a + character, the call to
|
If the /S modifier is followed by a + character, the call to
|
||||||
pcre[16|32]_study() is made with all the JIT study options, requesting
|
pcre[16|32]_study() is made with all the JIT study options, requesting
|
||||||
just-in-time optimization support if it is available, for both normal
|
just-in-time optimization support if it is available, for both normal
|
||||||
and partial matching. If you want to restrict the JIT compiling modes,
|
and partial matching. If you want to restrict the JIT compiling modes,
|
||||||
you can follow /S+ with a digit in the range 1 to 7:
|
you can follow /S+ with a digit in the range 1 to 7:
|
||||||
|
|
||||||
1 normal match only
|
1 normal match only
|
||||||
@ -538,40 +535,40 @@ PATTERN MODIFIERS
|
|||||||
7 all three modes (default)
|
7 all three modes (default)
|
||||||
|
|
||||||
If /S++ is used instead of /S+ (with or without a following digit), the
|
If /S++ is used instead of /S+ (with or without a following digit), the
|
||||||
text "(JIT)" is added to the first output line after a match or no
|
text "(JIT)" is added to the first output line after a match or no
|
||||||
match when JIT-compiled code was actually used.
|
match when JIT-compiled code was actually used.
|
||||||
|
|
||||||
Note that there is also an independent /+ modifier; it must not be
|
Note that there is also an independent /+ modifier; it must not be
|
||||||
given immediately after /S or /S+ because this will be misinterpreted.
|
given immediately after /S or /S+ because this will be misinterpreted.
|
||||||
|
|
||||||
If JIT studying is successful, the compiled JIT code will automatically
|
If JIT studying is successful, the compiled JIT code will automatically
|
||||||
be used when pcre[16|32]_exec() is run, except when incompatible run-
|
be used when pcre[16|32]_exec() is run, except when incompatible run-
|
||||||
time options are specified. For more details, see the pcrejit documen-
|
time options are specified. For more details, see the pcrejit documen-
|
||||||
tation. See also the \J escape sequence below for a way of setting the
|
tation. See also the \J escape sequence below for a way of setting the
|
||||||
size of the JIT stack.
|
size of the JIT stack.
|
||||||
|
|
||||||
Finally, if /S is followed by a minus character, JIT compilation is
|
Finally, if /S is followed by a minus character, JIT compilation is
|
||||||
suppressed, even if it was requested externally by the -s command line
|
suppressed, even if it was requested externally by the -s command line
|
||||||
option. This makes it possible to specify that JIT is never to be used
|
option. This makes it possible to specify that JIT is never to be used
|
||||||
for certain patterns.
|
for certain patterns.
|
||||||
|
|
||||||
The /T modifier must be followed by a single digit. It causes a spe-
|
The /T modifier must be followed by a single digit. It causes a spe-
|
||||||
cific set of built-in character tables to be passed to pcre[16|32]_com-
|
cific set of built-in character tables to be passed to pcre[16|32]_com-
|
||||||
pile(). It is used in the standard PCRE tests to check behaviour with
|
pile(). It is used in the standard PCRE tests to check behaviour with
|
||||||
different character tables. The digit specifies the tables as follows:
|
different character tables. The digit specifies the tables as follows:
|
||||||
|
|
||||||
0 the default ASCII tables, as distributed in
|
0 the default ASCII tables, as distributed in
|
||||||
pcre_chartables.c.dist
|
pcre_chartables.c.dist
|
||||||
1 a set of tables defining ISO 8859 characters
|
1 a set of tables defining ISO 8859 characters
|
||||||
|
|
||||||
In table 1, some characters whose codes are greater than 128 are iden-
|
In table 1, some characters whose codes are greater than 128 are iden-
|
||||||
tified as letters, digits, spaces, etc.
|
tified as letters, digits, spaces, etc.
|
||||||
|
|
||||||
Using the POSIX wrapper API
|
Using the POSIX wrapper API
|
||||||
|
|
||||||
The /P modifier causes pcretest to call PCRE via the POSIX wrapper API
|
The /P modifier causes pcretest to call PCRE via the POSIX wrapper API
|
||||||
rather than its native API. This supports only the 8-bit library. When
|
rather than its native API. This supports only the 8-bit library. When
|
||||||
/P is set, the following modifiers set options for the regcomp() func-
|
/P is set, the following modifiers set options for the regcomp() func-
|
||||||
tion:
|
tion:
|
||||||
|
|
||||||
/i REG_ICASE
|
/i REG_ICASE
|
||||||
@ -582,48 +579,48 @@ PATTERN MODIFIERS
|
|||||||
/W REG_UCP ) the POSIX standard
|
/W REG_UCP ) the POSIX standard
|
||||||
/8 REG_UTF8 )
|
/8 REG_UTF8 )
|
||||||
|
|
||||||
The /+ modifier works as described above. All other modifiers are
|
The /+ modifier works as described above. All other modifiers are ig-
|
||||||
ignored.
|
nored.
|
||||||
|
|
||||||
Locking out certain modifiers
|
Locking out certain modifiers
|
||||||
|
|
||||||
PCRE can be compiled with or without support for certain features such
|
PCRE can be compiled with or without support for certain features such
|
||||||
as UTF-8/16/32 or Unicode properties. Accordingly, the standard tests
|
as UTF-8/16/32 or Unicode properties. Accordingly, the standard tests
|
||||||
are split up into a number of different files that are selected for
|
are split up into a number of different files that are selected for
|
||||||
running depending on which features are available. When updating the
|
running depending on which features are available. When updating the
|
||||||
tests, it is all too easy to put a new test into the wrong file by mis-
|
tests, it is all too easy to put a new test into the wrong file by mis-
|
||||||
take; for example, to put a test that requires UTF support into a file
|
take; for example, to put a test that requires UTF support into a file
|
||||||
that is used when it is not available. To help detect such mistakes as
|
that is used when it is not available. To help detect such mistakes as
|
||||||
early as possible, there is a facility for locking out specific modi-
|
early as possible, there is a facility for locking out specific modi-
|
||||||
fiers. If an input line for pcretest starts with the string "< forbid "
|
fiers. If an input line for pcretest starts with the string "< forbid "
|
||||||
the following sequence of characters is taken as a list of forbidden
|
the following sequence of characters is taken as a list of forbidden
|
||||||
modifiers. For example, in the test files that must not use UTF or Uni-
|
modifiers. For example, in the test files that must not use UTF or Uni-
|
||||||
code property support, this line appears:
|
code property support, this line appears:
|
||||||
|
|
||||||
< forbid 8W
|
< forbid 8W
|
||||||
|
|
||||||
This locks out the /8 and /W modifiers. An immediate error is given if
|
This locks out the /8 and /W modifiers. An immediate error is given if
|
||||||
they are subsequently encountered. If the character string contains <
|
they are subsequently encountered. If the character string contains <
|
||||||
but not >, all the multi-character modifiers that begin with < are
|
but not >, all the multi-character modifiers that begin with < are
|
||||||
locked out. Otherwise, such modifiers must be explicitly listed, for
|
locked out. Otherwise, such modifiers must be explicitly listed, for
|
||||||
example:
|
example:
|
||||||
|
|
||||||
< forbid <JS><cr>
|
< forbid <JS><cr>
|
||||||
|
|
||||||
There must be a single space between < and "forbid" for this feature to
|
There must be a single space between < and "forbid" for this feature to
|
||||||
be recognised. If there is not, the line is interpreted either as a
|
be recognised. If there is not, the line is interpreted either as a re-
|
||||||
request to re-load a pre-compiled pattern (see "SAVING AND RELOADING
|
quest to re-load a pre-compiled pattern (see "SAVING AND RELOADING COM-
|
||||||
COMPILED PATTERNS" below) or, if there is a another < character, as a
|
PILED PATTERNS" below) or, if there is a another < character, as a pat-
|
||||||
pattern that uses < as its delimiter.
|
tern that uses < as its delimiter.
|
||||||
|
|
||||||
|
|
||||||
DATA LINES
|
DATA LINES
|
||||||
|
|
||||||
Before each data line is passed to pcre[16|32]_exec(), leading and
|
Before each data line is passed to pcre[16|32]_exec(), leading and
|
||||||
trailing white space is removed, and it is then scanned for \ escapes.
|
trailing white space is removed, and it is then scanned for \ escapes.
|
||||||
Some of these are pretty esoteric features, intended for checking out
|
Some of these are pretty esoteric features, intended for checking out
|
||||||
some of the more complicated features of PCRE. If you are just testing
|
some of the more complicated features of PCRE. If you are just testing
|
||||||
"ordinary" regular expressions, you probably don't need any of these.
|
"ordinary" regular expressions, you probably don't need any of these.
|
||||||
The following escapes are recognized:
|
The following escapes are recognized:
|
||||||
|
|
||||||
\a alarm (BEL, \x07)
|
\a alarm (BEL, \x07)
|
||||||
@ -684,7 +681,7 @@ DATA LINES
|
|||||||
(any number of digits)
|
(any number of digits)
|
||||||
\R pass the PCRE_DFA_RESTART option to pcre[16|32]_dfa_exec()
|
\R pass the PCRE_DFA_RESTART option to pcre[16|32]_dfa_exec()
|
||||||
\S output details of memory get/free calls during matching
|
\S output details of memory get/free calls during matching
|
||||||
\Y pass the PCRE_NO_START_OPTIMIZE option to
|
\Y pass the PCRE_NO_START_OPTIMIZE option to
|
||||||
pcre[16|32]_exec()
|
pcre[16|32]_exec()
|
||||||
or pcre[16|32]_dfa_exec()
|
or pcre[16|32]_dfa_exec()
|
||||||
\Z pass the PCRE_NOTEOL option to pcre[16|32]_exec()
|
\Z pass the PCRE_NOTEOL option to pcre[16|32]_exec()
|
||||||
@ -693,7 +690,7 @@ DATA LINES
|
|||||||
pcre[16|32]_exec() or pcre[16|32]_dfa_exec()
|
pcre[16|32]_exec() or pcre[16|32]_dfa_exec()
|
||||||
\>dd start the match at offset dd (optional "-"; then
|
\>dd start the match at offset dd (optional "-"; then
|
||||||
any number of digits); this sets the startoffset
|
any number of digits); this sets the startoffset
|
||||||
argument for pcre[16|32]_exec() or
|
argument for pcre[16|32]_exec() or
|
||||||
pcre[16|32]_dfa_exec()
|
pcre[16|32]_dfa_exec()
|
||||||
\<cr> pass the PCRE_NEWLINE_CR option to pcre[16|32]_exec()
|
\<cr> pass the PCRE_NEWLINE_CR option to pcre[16|32]_exec()
|
||||||
or pcre[16|32]_dfa_exec()
|
or pcre[16|32]_dfa_exec()
|
||||||
@ -706,103 +703,102 @@ DATA LINES
|
|||||||
\<any> pass the PCRE_NEWLINE_ANY option to pcre[16|32]_exec()
|
\<any> pass the PCRE_NEWLINE_ANY option to pcre[16|32]_exec()
|
||||||
or pcre[16|32]_dfa_exec()
|
or pcre[16|32]_dfa_exec()
|
||||||
|
|
||||||
The use of \x{hh...} is not dependent on the use of the /8 modifier on
|
The use of \x{hh...} is not dependent on the use of the /8 modifier on
|
||||||
the pattern. It is recognized always. There may be any number of hexa-
|
the pattern. It is recognized always. There may be any number of hexa-
|
||||||
decimal digits inside the braces; invalid values provoke error mes-
|
decimal digits inside the braces; invalid values provoke error mes-
|
||||||
sages.
|
sages.
|
||||||
|
|
||||||
Note that \xhh specifies one byte rather than one character in UTF-8
|
Note that \xhh specifies one byte rather than one character in UTF-8
|
||||||
mode; this makes it possible to construct invalid UTF-8 sequences for
|
mode; this makes it possible to construct invalid UTF-8 sequences for
|
||||||
testing purposes. On the other hand, \x{hh} is interpreted as a UTF-8
|
testing purposes. On the other hand, \x{hh} is interpreted as a UTF-8
|
||||||
character in UTF-8 mode, generating more than one byte if the value is
|
character in UTF-8 mode, generating more than one byte if the value is
|
||||||
greater than 127. When testing the 8-bit library not in UTF-8 mode,
|
greater than 127. When testing the 8-bit library not in UTF-8 mode,
|
||||||
\x{hh} generates one byte for values less than 256, and causes an error
|
\x{hh} generates one byte for values less than 256, and causes an error
|
||||||
for greater values.
|
for greater values.
|
||||||
|
|
||||||
In UTF-16 mode, all 4-digit \x{hhhh} values are accepted. This makes it
|
In UTF-16 mode, all 4-digit \x{hhhh} values are accepted. This makes it
|
||||||
possible to construct invalid UTF-16 sequences for testing purposes.
|
possible to construct invalid UTF-16 sequences for testing purposes.
|
||||||
|
|
||||||
In UTF-32 mode, all 4- to 8-digit \x{...} values are accepted. This
|
In UTF-32 mode, all 4- to 8-digit \x{...} values are accepted. This
|
||||||
makes it possible to construct invalid UTF-32 sequences for testing
|
makes it possible to construct invalid UTF-32 sequences for testing
|
||||||
purposes.
|
purposes.
|
||||||
|
|
||||||
The escapes that specify line ending sequences are literal strings,
|
The escapes that specify line ending sequences are literal strings, ex-
|
||||||
exactly as shown. No more than one newline setting should be present in
|
actly as shown. No more than one newline setting should be present in
|
||||||
any data line.
|
any data line.
|
||||||
|
|
||||||
A backslash followed by anything else just escapes the anything else.
|
A backslash followed by anything else just escapes the anything else.
|
||||||
If the very last character is a backslash, it is ignored. This gives a
|
If the very last character is a backslash, it is ignored. This gives a
|
||||||
way of passing an empty line as data, since a real empty line termi-
|
way of passing an empty line as data, since a real empty line termi-
|
||||||
nates the data input.
|
nates the data input.
|
||||||
|
|
||||||
The \J escape provides a way of setting the maximum stack size that is
|
The \J escape provides a way of setting the maximum stack size that is
|
||||||
used by the just-in-time optimization code. It is ignored if JIT opti-
|
used by the just-in-time optimization code. It is ignored if JIT opti-
|
||||||
mization is not being used. Providing a stack that is larger than the
|
mization is not being used. Providing a stack that is larger than the
|
||||||
default 32K is necessary only for very complicated patterns.
|
default 32K is necessary only for very complicated patterns.
|
||||||
|
|
||||||
If \M is present, pcretest calls pcre[16|32]_exec() several times, with
|
If \M is present, pcretest calls pcre[16|32]_exec() several times, with
|
||||||
different values in the match_limit and match_limit_recursion fields of
|
different values in the match_limit and match_limit_recursion fields of
|
||||||
the pcre[16|32]_extra data structure, until it finds the minimum num-
|
the pcre[16|32]_extra data structure, until it finds the minimum num-
|
||||||
bers for each parameter that allow pcre[16|32]_exec() to complete with-
|
bers for each parameter that allow pcre[16|32]_exec() to complete with-
|
||||||
out error. Because this is testing a specific feature of the normal
|
out error. Because this is testing a specific feature of the normal in-
|
||||||
interpretive pcre[16|32]_exec() execution, the use of any JIT optimiza-
|
terpretive pcre[16|32]_exec() execution, the use of any JIT optimiza-
|
||||||
tion that might have been set up by the /S+ qualifier of -s+ option is
|
tion that might have been set up by the /S+ qualifier of -s+ option is
|
||||||
disabled.
|
disabled.
|
||||||
|
|
||||||
The match_limit number is a measure of the amount of backtracking that
|
The match_limit number is a measure of the amount of backtracking that
|
||||||
takes place, and checking it out can be instructive. For most simple
|
takes place, and checking it out can be instructive. For most simple
|
||||||
matches, the number is quite small, but for patterns with very large
|
matches, the number is quite small, but for patterns with very large
|
||||||
numbers of matching possibilities, it can become large very quickly
|
numbers of matching possibilities, it can become large very quickly
|
||||||
with increasing length of subject string. The match_limit_recursion
|
with increasing length of subject string. The match_limit_recursion
|
||||||
number is a measure of how much stack (or, if PCRE is compiled with
|
number is a measure of how much stack (or, if PCRE is compiled with
|
||||||
NO_RECURSE, how much heap) memory is needed to complete the match
|
NO_RECURSE, how much heap) memory is needed to complete the match at-
|
||||||
attempt.
|
tempt.
|
||||||
|
|
||||||
When \O is used, the value specified may be higher or lower than the
|
When \O is used, the value specified may be higher or lower than the
|
||||||
size set by the -O command line option (or defaulted to 45); \O applies
|
size set by the -O command line option (or defaulted to 45); \O applies
|
||||||
only to the call of pcre[16|32]_exec() for the line in which it
|
only to the call of pcre[16|32]_exec() for the line in which it ap-
|
||||||
appears.
|
pears.
|
||||||
|
|
||||||
If the /P modifier was present on the pattern, causing the POSIX wrap-
|
If the /P modifier was present on the pattern, causing the POSIX wrap-
|
||||||
per API to be used, the only option-setting sequences that have any
|
per API to be used, the only option-setting sequences that have any ef-
|
||||||
effect are \B, \N, and \Z, causing REG_NOTBOL, REG_NOTEMPTY, and
|
fect are \B, \N, and \Z, causing REG_NOTBOL, REG_NOTEMPTY, and REG_NO-
|
||||||
REG_NOTEOL, respectively, to be passed to regexec().
|
TEOL, respectively, to be passed to regexec().
|
||||||
|
|
||||||
|
|
||||||
THE ALTERNATIVE MATCHING FUNCTION
|
THE ALTERNATIVE MATCHING FUNCTION
|
||||||
|
|
||||||
By default, pcretest uses the standard PCRE matching function,
|
By default, pcretest uses the standard PCRE matching function,
|
||||||
pcre[16|32]_exec() to match each data line. PCRE also supports an
|
pcre[16|32]_exec() to match each data line. PCRE also supports an al-
|
||||||
alternative matching function, pcre[16|32]_dfa_test(), which operates
|
ternative matching function, pcre[16|32]_dfa_test(), which operates in
|
||||||
in a different way, and has some restrictions. The differences between
|
a different way, and has some restrictions. The differences between the
|
||||||
the two functions are described in the pcrematching documentation.
|
two functions are described in the pcrematching documentation.
|
||||||
|
|
||||||
If a data line contains the \D escape sequence, or if the command line
|
If a data line contains the \D escape sequence, or if the command line
|
||||||
contains the -dfa option, the alternative matching function is used.
|
contains the -dfa option, the alternative matching function is used.
|
||||||
This function finds all possible matches at a given point. If, however,
|
This function finds all possible matches at a given point. If, however,
|
||||||
the \F escape sequence is present in the data line, it stops after the
|
the \F escape sequence is present in the data line, it stops after the
|
||||||
first match is found. This is always the shortest possible match.
|
first match is found. This is always the shortest possible match.
|
||||||
|
|
||||||
|
|
||||||
DEFAULT OUTPUT FROM PCRETEST
|
DEFAULT OUTPUT FROM PCRETEST
|
||||||
|
|
||||||
This section describes the output when the normal matching function,
|
This section describes the output when the normal matching function,
|
||||||
pcre[16|32]_exec(), is being used.
|
pcre[16|32]_exec(), is being used.
|
||||||
|
|
||||||
When a match succeeds, pcretest outputs the list of captured substrings
|
When a match succeeds, pcretest outputs the list of captured substrings
|
||||||
that pcre[16|32]_exec() returns, starting with number 0 for the string
|
that pcre[16|32]_exec() returns, starting with number 0 for the string
|
||||||
that matched the whole pattern. Otherwise, it outputs "No match" when
|
that matched the whole pattern. Otherwise, it outputs "No match" when
|
||||||
the return is PCRE_ERROR_NOMATCH, and "Partial match:" followed by the
|
the return is PCRE_ERROR_NOMATCH, and "Partial match:" followed by the
|
||||||
partially matching substring when pcre[16|32]_exec() returns
|
partially matching substring when pcre[16|32]_exec() returns PCRE_ER-
|
||||||
PCRE_ERROR_PARTIAL. (Note that this is the entire substring that was
|
ROR_PARTIAL. (Note that this is the entire substring that was inspected
|
||||||
inspected during the partial match; it may include characters before
|
during the partial match; it may include characters before the actual
|
||||||
the actual match start if a lookbehind assertion, \K, \b, or \B was
|
match start if a lookbehind assertion, \K, \b, or \B was involved.) For
|
||||||
involved.) For any other return, pcretest outputs the PCRE negative
|
any other return, pcretest outputs the PCRE negative error number and a
|
||||||
error number and a short descriptive phrase. If the error is a failed
|
short descriptive phrase. If the error is a failed UTF string check,
|
||||||
UTF string check, the offset of the start of the failing character and
|
the offset of the start of the failing character and the reason code
|
||||||
the reason code are also output, provided that the size of the output
|
are also output, provided that the size of the output vector is at
|
||||||
vector is at least two. Here is an example of an interactive pcretest
|
least two. Here is an example of an interactive pcretest run.
|
||||||
run.
|
|
||||||
|
|
||||||
$ pcretest
|
$ pcretest
|
||||||
PCRE version 8.13 2011-04-30
|
PCRE version 8.13 2011-04-30
|
||||||
@ -892,9 +888,9 @@ OUTPUT FROM THE ALTERNATIVE MATCHING FUNCTION
|
|||||||
(Using the normal matching function on this data finds only "tang".)
|
(Using the normal matching function on this data finds only "tang".)
|
||||||
The longest matching string is always given first (and numbered zero).
|
The longest matching string is always given first (and numbered zero).
|
||||||
After a PCRE_ERROR_PARTIAL return, the output is "Partial match:", fol-
|
After a PCRE_ERROR_PARTIAL return, the output is "Partial match:", fol-
|
||||||
lowed by the partially matching substring. (Note that this is the
|
lowed by the partially matching substring. (Note that this is the en-
|
||||||
entire substring that was inspected during the partial match; it may
|
tire substring that was inspected during the partial match; it may in-
|
||||||
include characters before the actual match start if a lookbehind asser-
|
clude characters before the actual match start if a lookbehind asser-
|
||||||
tion, \K, \b, or \B was involved.)
|
tion, \K, \b, or \B was involved.)
|
||||||
|
|
||||||
If /g is present on the pattern, the search for further matches resumes
|
If /g is present on the pattern, the search for further matches resumes
|
||||||
@ -909,9 +905,9 @@ OUTPUT FROM THE ALTERNATIVE MATCHING FUNCTION
|
|||||||
1: tan
|
1: tan
|
||||||
0: tan
|
0: tan
|
||||||
|
|
||||||
Since the matching function does not support substring capture, the
|
Since the matching function does not support substring capture, the es-
|
||||||
escape sequences that are concerned with captured substrings are not
|
cape sequences that are concerned with captured substrings are not rel-
|
||||||
relevant.
|
evant.
|
||||||
|
|
||||||
|
|
||||||
RESTARTING AFTER A PARTIAL MATCH
|
RESTARTING AFTER A PARTIAL MATCH
|
||||||
@ -942,9 +938,9 @@ CALLOUTS
|
|||||||
--->pqrabcdef
|
--->pqrabcdef
|
||||||
0 ^ ^ \d
|
0 ^ ^ \d
|
||||||
|
|
||||||
This output indicates that callout number 0 occurred for a match
|
This output indicates that callout number 0 occurred for a match at-
|
||||||
attempt starting at the fourth character of the subject string, when
|
tempt starting at the fourth character of the subject string, when the
|
||||||
the pointer was at the seventh character of the data, and when the next
|
pointer was at the seventh character of the data, and when the next
|
||||||
pattern item was \d. Just one circumflex is output if the start and
|
pattern item was \d. Just one circumflex is output if the start and
|
||||||
current positions are the same.
|
current positions are the same.
|
||||||
|
|
||||||
@ -963,8 +959,8 @@ CALLOUTS
|
|||||||
0: E*
|
0: E*
|
||||||
|
|
||||||
If a pattern contains (*MARK) items, an additional line is output when-
|
If a pattern contains (*MARK) items, an additional line is output when-
|
||||||
ever a change of latest mark is passed to the callout function. For
|
ever a change of latest mark is passed to the callout function. For ex-
|
||||||
example:
|
ample:
|
||||||
|
|
||||||
re> /a(*MARK:X)bc/C
|
re> /a(*MARK:X)bc/C
|
||||||
data> abc
|
data> abc
|
||||||
@ -999,8 +995,8 @@ NON-PRINTING CHARACTERS
|
|||||||
|
|
||||||
When pcretest is outputting text that is a matched part of a subject
|
When pcretest is outputting text that is a matched part of a subject
|
||||||
string, it behaves in the same way, unless a different locale has been
|
string, it behaves in the same way, unless a different locale has been
|
||||||
set for the pattern (using the /L modifier). In this case, the
|
set for the pattern (using the /L modifier). In this case, the is-
|
||||||
isprint() function to distinguish printing and non-printing characters.
|
print() function to distinguish printing and non-printing characters.
|
||||||
|
|
||||||
|
|
||||||
SAVING AND RELOADING COMPILED PATTERNS
|
SAVING AND RELOADING COMPILED PATTERNS
|
||||||
@ -1020,14 +1016,14 @@ SAVING AND RELOADING COMPILED PATTERNS
|
|||||||
studied with JIT optimization, the JIT data cannot be saved.
|
studied with JIT optimization, the JIT data cannot be saved.
|
||||||
|
|
||||||
The data that is written is binary. The first eight bytes are the
|
The data that is written is binary. The first eight bytes are the
|
||||||
length of the compiled pattern data followed by the length of the
|
length of the compiled pattern data followed by the length of the op-
|
||||||
optional study data, each written as four bytes in big-endian order
|
tional study data, each written as four bytes in big-endian order (most
|
||||||
(most significant byte first). If there is no study data (either the
|
significant byte first). If there is no study data (either the pattern
|
||||||
pattern was not studied, or studying did not return any data), the sec-
|
was not studied, or studying did not return any data), the second
|
||||||
ond length is zero. The lengths are followed by an exact copy of the
|
length is zero. The lengths are followed by an exact copy of the com-
|
||||||
compiled pattern. If there is additional study data, this (excluding
|
piled pattern. If there is additional study data, this (excluding any
|
||||||
any JIT data) follows immediately after the compiled pattern. After
|
JIT data) follows immediately after the compiled pattern. After writing
|
||||||
writing the file, pcretest expects to read a new pattern.
|
the file, pcretest expects to read a new pattern.
|
||||||
|
|
||||||
A saved pattern can be reloaded into pcretest by specifying < and a
|
A saved pattern can be reloaded into pcretest by specifying < and a
|
||||||
file name instead of a pattern. There must be no space between < and
|
file name instead of a pattern. There must be no space between < and
|
||||||
@ -1066,10 +1062,10 @@ SAVING AND RELOADING COMPILED PATTERNS
|
|||||||
ing and experimentation. It is not intended for production use because
|
ing and experimentation. It is not intended for production use because
|
||||||
only a single pattern can be written to a file. Furthermore, there is
|
only a single pattern can be written to a file. Furthermore, there is
|
||||||
no facility for supplying custom character tables for use with a
|
no facility for supplying custom character tables for use with a
|
||||||
reloaded pattern. If the original pattern was compiled with custom
|
reloaded pattern. If the original pattern was compiled with custom ta-
|
||||||
tables, an attempt to match a subject string using a reloaded pattern
|
bles, an attempt to match a subject string using a reloaded pattern is
|
||||||
is likely to cause pcretest to crash. Finally, if you attempt to load
|
likely to cause pcretest to crash. Finally, if you attempt to load a
|
||||||
a file that is not in the correct format, the result is undefined.
|
file that is not in the correct format, the result is undefined.
|
||||||
|
|
||||||
|
|
||||||
SEE ALSO
|
SEE ALSO
|
||||||
@ -1087,5 +1083,5 @@ AUTHOR
|
|||||||
|
|
||||||
REVISION
|
REVISION
|
||||||
|
|
||||||
Last updated: 23 February 2017
|
Last updated: 10 February 2020
|
||||||
Copyright (c) 1997-2017 University of Cambridge.
|
Copyright (c) 1997-2020 University of Cambridge.
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
and semantics are as close as possible to those of the Perl 5 language.
|
and semantics are as close as possible to those of the Perl 5 language.
|
||||||
|
|
||||||
Written by Philip Hazel
|
Written by Philip Hazel
|
||||||
Copyright (c) 1997-2018 University of Cambridge
|
Copyright (c) 1997-2020 University of Cambridge
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
@ -68,7 +68,7 @@ COMPILE_PCREx macro will already be appropriately set. */
|
|||||||
|
|
||||||
/* Macro for setting individual bits in class bitmaps. */
|
/* Macro for setting individual bits in class bitmaps. */
|
||||||
|
|
||||||
#define SETBIT(a,b) a[(b)/8] |= (1 << ((b)&7))
|
#define SETBIT(a,b) a[(b)/8] |= (1U << ((b)&7))
|
||||||
|
|
||||||
/* Maximum length value to check against when making sure that the integer that
|
/* Maximum length value to check against when making sure that the integer that
|
||||||
holds the compiled pattern length does not overflow. We make it a bit less than
|
holds the compiled pattern length does not overflow. We make it a bit less than
|
||||||
@ -129,8 +129,8 @@ overrun before it actually does run off the end of the data block. */
|
|||||||
|
|
||||||
/* Private flags added to firstchar and reqchar. */
|
/* Private flags added to firstchar and reqchar. */
|
||||||
|
|
||||||
#define REQ_CASELESS (1 << 0) /* Indicates caselessness */
|
#define REQ_CASELESS (1U << 0) /* Indicates caselessness */
|
||||||
#define REQ_VARY (1 << 1) /* Reqchar followed non-literal item */
|
#define REQ_VARY (1U << 1) /* Reqchar followed non-literal item */
|
||||||
/* Negative values for the firstchar and reqchar flags */
|
/* Negative values for the firstchar and reqchar flags */
|
||||||
#define REQ_UNSET (-2)
|
#define REQ_UNSET (-2)
|
||||||
#define REQ_NONE (-1)
|
#define REQ_NONE (-1)
|
||||||
@ -3612,7 +3612,7 @@ for(;;)
|
|||||||
if (chr > 255) break;
|
if (chr > 255) break;
|
||||||
class_bitset = (pcre_uint8 *)
|
class_bitset = (pcre_uint8 *)
|
||||||
((list_ptr == list ? code : base_end) - list_ptr[2]);
|
((list_ptr == list ? code : base_end) - list_ptr[2]);
|
||||||
if ((class_bitset[chr >> 3] & (1 << (chr & 7))) != 0) return FALSE;
|
if ((class_bitset[chr >> 3] & (1U << (chr & 7))) != 0) return FALSE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
|
#if defined SUPPORT_UTF || !defined COMPILE_PCRE8
|
||||||
@ -7133,17 +7133,19 @@ for (;; ptr++)
|
|||||||
int n = 0;
|
int n = 0;
|
||||||
ptr++;
|
ptr++;
|
||||||
while(IS_DIGIT(*ptr))
|
while(IS_DIGIT(*ptr))
|
||||||
|
{
|
||||||
n = n * 10 + *ptr++ - CHAR_0;
|
n = n * 10 + *ptr++ - CHAR_0;
|
||||||
|
if (n > 255)
|
||||||
|
{
|
||||||
|
*errorcodeptr = ERR38;
|
||||||
|
goto FAILED;
|
||||||
|
}
|
||||||
|
}
|
||||||
if (*ptr != CHAR_RIGHT_PARENTHESIS)
|
if (*ptr != CHAR_RIGHT_PARENTHESIS)
|
||||||
{
|
{
|
||||||
*errorcodeptr = ERR39;
|
*errorcodeptr = ERR39;
|
||||||
goto FAILED;
|
goto FAILED;
|
||||||
}
|
}
|
||||||
if (n > 255)
|
|
||||||
{
|
|
||||||
*errorcodeptr = ERR38;
|
|
||||||
goto FAILED;
|
|
||||||
}
|
|
||||||
*code++ = n;
|
*code++ = n;
|
||||||
PUT(code, 0, (int)(ptr - cd->start_pattern + 1)); /* Pattern offset */
|
PUT(code, 0, (int)(ptr - cd->start_pattern + 1)); /* Pattern offset */
|
||||||
PUT(code, LINK_SIZE, 0); /* Default length */
|
PUT(code, LINK_SIZE, 0); /* Default length */
|
||||||
@ -7459,7 +7461,7 @@ for (;; ptr++)
|
|||||||
{
|
{
|
||||||
open_capitem *oc;
|
open_capitem *oc;
|
||||||
recno = GET2(slot, 0);
|
recno = GET2(slot, 0);
|
||||||
cd->backref_map |= (recno < 32)? (1 << recno) : 1;
|
cd->backref_map |= (recno < 32)? (1U << recno) : 1;
|
||||||
if (recno > cd->top_backref) cd->top_backref = recno;
|
if (recno > cd->top_backref) cd->top_backref = recno;
|
||||||
|
|
||||||
/* Check to see if this back reference is recursive, that it, it
|
/* Check to see if this back reference is recursive, that it, it
|
||||||
@ -8070,7 +8072,7 @@ for (;; ptr++)
|
|||||||
item_hwm_offset = cd->hwm - cd->start_workspace;
|
item_hwm_offset = cd->hwm - cd->start_workspace;
|
||||||
*code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF;
|
*code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF;
|
||||||
PUT2INC(code, 0, recno);
|
PUT2INC(code, 0, recno);
|
||||||
cd->backref_map |= (recno < 32)? (1 << recno) : 1;
|
cd->backref_map |= (recno < 32)? (1U << recno) : 1;
|
||||||
if (recno > cd->top_backref) cd->top_backref = recno;
|
if (recno > cd->top_backref) cd->top_backref = recno;
|
||||||
|
|
||||||
/* Check to see if this back reference is recursive, that it, it
|
/* Check to see if this back reference is recursive, that it, it
|
||||||
@ -8683,7 +8685,7 @@ do {
|
|||||||
op == OP_SCBRA || op == OP_SCBRAPOS)
|
op == OP_SCBRA || op == OP_SCBRAPOS)
|
||||||
{
|
{
|
||||||
int n = GET2(scode, 1+LINK_SIZE);
|
int n = GET2(scode, 1+LINK_SIZE);
|
||||||
int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
|
int new_map = bracket_map | ((n < 32)? (1U << n) : 1);
|
||||||
if (!is_anchored(scode, new_map, cd, atomcount)) return FALSE;
|
if (!is_anchored(scode, new_map, cd, atomcount)) return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -8811,7 +8813,7 @@ do {
|
|||||||
op == OP_SCBRA || op == OP_SCBRAPOS)
|
op == OP_SCBRA || op == OP_SCBRAPOS)
|
||||||
{
|
{
|
||||||
int n = GET2(scode, 1+LINK_SIZE);
|
int n = GET2(scode, 1+LINK_SIZE);
|
||||||
int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
|
int new_map = bracket_map | ((n < 32)? (1U << n) : 1);
|
||||||
if (!is_startline(scode, new_map, cd, atomcount, inassert)) return FALSE;
|
if (!is_startline(scode, new_map, cd, atomcount, inassert)) return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3938,10 +3938,10 @@ static sljit_s32 character_to_int32(pcre_uchar chr)
|
|||||||
sljit_s32 value = (sljit_s32)chr;
|
sljit_s32 value = (sljit_s32)chr;
|
||||||
#if defined COMPILE_PCRE8
|
#if defined COMPILE_PCRE8
|
||||||
#define SSE2_COMPARE_TYPE_INDEX 0
|
#define SSE2_COMPARE_TYPE_INDEX 0
|
||||||
return (value << 24) | (value << 16) | (value << 8) | value;
|
return ((unsigned int)value << 24) | ((unsigned int)value << 16) | ((unsigned int)value << 8) | (unsigned int)value;
|
||||||
#elif defined COMPILE_PCRE16
|
#elif defined COMPILE_PCRE16
|
||||||
#define SSE2_COMPARE_TYPE_INDEX 1
|
#define SSE2_COMPARE_TYPE_INDEX 1
|
||||||
return (value << 16) | value;
|
return ((unsigned int)value << 16) | value;
|
||||||
#elif defined COMPILE_PCRE32
|
#elif defined COMPILE_PCRE32
|
||||||
#define SSE2_COMPARE_TYPE_INDEX 2
|
#define SSE2_COMPARE_TYPE_INDEX 2
|
||||||
return value;
|
return value;
|
||||||
@ -8507,7 +8507,7 @@ if (opcode == OP_ONCE)
|
|||||||
/* We temporarily encode the needs_control_head in the lowest bit.
|
/* We temporarily encode the needs_control_head in the lowest bit.
|
||||||
Note: on the target architectures of SLJIT the ((x << 1) >> 1) returns
|
Note: on the target architectures of SLJIT the ((x << 1) >> 1) returns
|
||||||
the same value for small signed numbers (including negative numbers). */
|
the same value for small signed numbers (including negative numbers). */
|
||||||
BACKTRACK_AS(bracket_backtrack)->u.framesize = (BACKTRACK_AS(bracket_backtrack)->u.framesize << 1) | (needs_control_head ? 1 : 0);
|
BACKTRACK_AS(bracket_backtrack)->u.framesize = ((unsigned int)BACKTRACK_AS(bracket_backtrack)->u.framesize << 1) | (needs_control_head ? 1 : 0);
|
||||||
}
|
}
|
||||||
return cc + repeat_length;
|
return cc + repeat_length;
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,8 @@ Arg RE::no_arg((void*)NULL);
|
|||||||
// inclusive test if we ever needed it. (Note that not only the
|
// inclusive test if we ever needed it. (Note that not only the
|
||||||
// __attribute__ syntax, but also __USER_LABEL_PREFIX__, are
|
// __attribute__ syntax, but also __USER_LABEL_PREFIX__, are
|
||||||
// gnu-specific.)
|
// gnu-specific.)
|
||||||
#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__) && !defined(__INTEL_COMPILER)
|
#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__) \
|
||||||
|
&& !defined(__INTEL_COMPILER) && !defined(__LCC__)
|
||||||
# define ULP_AS_STRING(x) ULP_AS_STRING_INTERNAL(x)
|
# define ULP_AS_STRING(x) ULP_AS_STRING_INTERNAL(x)
|
||||||
# define ULP_AS_STRING_INTERNAL(x) #x
|
# define ULP_AS_STRING_INTERNAL(x) #x
|
||||||
# define USER_LABEL_PREFIX_STR ULP_AS_STRING(__USER_LABEL_PREFIX__)
|
# define USER_LABEL_PREFIX_STR ULP_AS_STRING(__USER_LABEL_PREFIX__)
|
||||||
@ -91,6 +92,7 @@ static const char *start_options[] = {
|
|||||||
"(*LIMIT_RECURSION=",
|
"(*LIMIT_RECURSION=",
|
||||||
"(*LIMIT_MATCH=",
|
"(*LIMIT_MATCH=",
|
||||||
"(*CRLF)",
|
"(*CRLF)",
|
||||||
|
"(*LF)",
|
||||||
"(*CR)",
|
"(*CR)",
|
||||||
"(*BSR_UNICODE)",
|
"(*BSR_UNICODE)",
|
||||||
"(*BSR_ANYCRLF)",
|
"(*BSR_ANYCRLF)",
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
and semantics are as close as possible to those of the Perl 5 language.
|
and semantics are as close as possible to those of the Perl 5 language.
|
||||||
|
|
||||||
Written by Philip Hazel
|
Written by Philip Hazel
|
||||||
Copyright (c) 1997-2018 University of Cambridge
|
Copyright (c) 1997-2020 University of Cambridge
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
@ -298,6 +298,7 @@ if (preg->re_pcre == NULL)
|
|||||||
(void)pcre_fullinfo((const pcre *)preg->re_pcre, NULL, PCRE_INFO_CAPTURECOUNT,
|
(void)pcre_fullinfo((const pcre *)preg->re_pcre, NULL, PCRE_INFO_CAPTURECOUNT,
|
||||||
&re_nsub);
|
&re_nsub);
|
||||||
preg->re_nsub = (size_t)re_nsub;
|
preg->re_nsub = (size_t)re_nsub;
|
||||||
|
preg->re_erroffset = (size_t)(-1); /* No meaning after successful compile */
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -335,8 +336,6 @@ if ((eflags & REG_NOTBOL) != 0) options |= PCRE_NOTBOL;
|
|||||||
if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;
|
if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;
|
||||||
if ((eflags & REG_NOTEMPTY) != 0) options |= PCRE_NOTEMPTY;
|
if ((eflags & REG_NOTEMPTY) != 0) options |= PCRE_NOTEMPTY;
|
||||||
|
|
||||||
((regex_t *)preg)->re_erroffset = (size_t)(-1); /* Only has meaning after compile */
|
|
||||||
|
|
||||||
/* When no string data is being returned, or no vector has been passed in which
|
/* When no string data is being returned, or no vector has been passed in which
|
||||||
to put it, ensure that nmatch is zero. Otherwise, ensure the vector for holding
|
to put it, ensure that nmatch is zero. Otherwise, ensure the vector for holding
|
||||||
the return data is large enough. */
|
the return data is large enough. */
|
||||||
|
@ -500,7 +500,7 @@ enum {
|
|||||||
#if (defined (SUPPORT_PCRE8) + defined (SUPPORT_PCRE16) + \
|
#if (defined (SUPPORT_PCRE8) + defined (SUPPORT_PCRE16) + \
|
||||||
defined (SUPPORT_PCRE32)) >= 2
|
defined (SUPPORT_PCRE32)) >= 2
|
||||||
|
|
||||||
#define CHAR_SIZE (1 << pcre_mode)
|
#define CHAR_SIZE (1U << pcre_mode)
|
||||||
|
|
||||||
/* There doesn't seem to be an easy way of writing these macros that can cope
|
/* There doesn't seem to be an easy way of writing these macros that can cope
|
||||||
with the 3 pairs of bit sizes plus all three bit sizes. So just handle all the
|
with the 3 pairs of bit sizes plus all three bit sizes. So just handle all the
|
||||||
@ -4444,7 +4444,7 @@ while (!done)
|
|||||||
|
|
||||||
/* If there is study data, write it. */
|
/* If there is study data, write it. */
|
||||||
|
|
||||||
if (extra != NULL)
|
if (extra != NULL && (extra->flags & PCRE_EXTRA_STUDY_DATA) != 0)
|
||||||
{
|
{
|
||||||
if (fwrite(extra->study_data, 1, true_study_size, f) <
|
if (fwrite(extra->study_data, 1, true_study_size, f) <
|
||||||
true_study_size)
|
true_study_size)
|
||||||
@ -4736,7 +4736,7 @@ while (!done)
|
|||||||
if (isdigit(*p)) /* Set copy string */
|
if (isdigit(*p)) /* Set copy string */
|
||||||
{
|
{
|
||||||
while(isdigit(*p)) n = n * 10 + *p++ - '0';
|
while(isdigit(*p)) n = n * 10 + *p++ - '0';
|
||||||
copystrings |= 1 << n;
|
copystrings |= 1U << n;
|
||||||
}
|
}
|
||||||
else if (isalnum(*p))
|
else if (isalnum(*p))
|
||||||
{
|
{
|
||||||
@ -4799,7 +4799,7 @@ while (!done)
|
|||||||
if (isdigit(*p))
|
if (isdigit(*p))
|
||||||
{
|
{
|
||||||
while(isdigit(*p)) n = n * 10 + *p++ - '0';
|
while(isdigit(*p)) n = n * 10 + *p++ - '0';
|
||||||
getstrings |= 1 << n;
|
getstrings |= 1U << n;
|
||||||
}
|
}
|
||||||
else if (isalnum(*p))
|
else if (isalnum(*p))
|
||||||
{
|
{
|
||||||
@ -5336,7 +5336,7 @@ while (!done)
|
|||||||
|
|
||||||
for (i = 0; i < 32; i++)
|
for (i = 0; i < 32; i++)
|
||||||
{
|
{
|
||||||
if ((copystrings & (1 << i)) != 0)
|
if ((copystrings & (1U << i)) != 0)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
char copybuffer[256];
|
char copybuffer[256];
|
||||||
@ -5401,7 +5401,7 @@ while (!done)
|
|||||||
|
|
||||||
for (i = 0; i < 32; i++)
|
for (i = 0; i < 32; i++)
|
||||||
{
|
{
|
||||||
if ((getstrings & (1 << i)) != 0)
|
if ((getstrings & (1U << i)) != 0)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
const char *substring;
|
const char *substring;
|
||||||
|
2
pcre/testdata/testinput2
vendored
2
pcre/testdata/testinput2
vendored
@ -1380,7 +1380,7 @@
|
|||||||
1X
|
1X
|
||||||
123456\P
|
123456\P
|
||||||
|
|
||||||
//KF>testsavedregex
|
//S-KF>testsavedregex
|
||||||
|
|
||||||
/abc/IS>testsavedregex
|
/abc/IS>testsavedregex
|
||||||
<testsavedregex
|
<testsavedregex
|
||||||
|
3
pcre/testdata/testoutput2
vendored
3
pcre/testdata/testoutput2
vendored
@ -5614,9 +5614,8 @@ No match
|
|||||||
123456\P
|
123456\P
|
||||||
No match
|
No match
|
||||||
|
|
||||||
//KF>testsavedregex
|
//S-KF>testsavedregex
|
||||||
Compiled pattern written to testsavedregex
|
Compiled pattern written to testsavedregex
|
||||||
Study data written to testsavedregex
|
|
||||||
|
|
||||||
/abc/IS>testsavedregex
|
/abc/IS>testsavedregex
|
||||||
Capturing subpattern count = 0
|
Capturing subpattern count = 0
|
||||||
|
@ -26,7 +26,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|||||||
POSSIBILITY OF SUCH DAMAGE.
|
POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#if defined(__FreeBSD__) || defined(SOLARIS) || defined(__sun)
|
||||||
|
#include <gssapi/gssapi.h>
|
||||||
|
#else
|
||||||
#include <gssapi.h>
|
#include <gssapi.h>
|
||||||
|
#endif
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
void gssapi_errmsg(OM_uint32 major, OM_uint32 minor, char *buf, size_t size)
|
void gssapi_errmsg(OM_uint32 major, OM_uint32 minor, char *buf, size_t size)
|
||||||
|
@ -2203,6 +2203,7 @@ static void auditing_v8(MYSQL_THD thd, struct mysql_event_general_v8 *ev_v8)
|
|||||||
#endif /*x86_64*/
|
#endif /*x86_64*/
|
||||||
#endif /*DBUG_OFF*/
|
#endif /*DBUG_OFF*/
|
||||||
#endif /* __linux__ */
|
#endif /* __linux__ */
|
||||||
|
|
||||||
struct mysql_event_general event;
|
struct mysql_event_general event;
|
||||||
|
|
||||||
if (ev_v8->event_class != MYSQL_AUDIT_GENERAL_CLASS)
|
if (ev_v8->event_class != MYSQL_AUDIT_GENERAL_CLASS)
|
||||||
@ -2263,6 +2264,7 @@ static void auditing_v13(MYSQL_THD thd, unsigned int *ev_v0)
|
|||||||
|
|
||||||
int get_db_mysql57(MYSQL_THD thd, char **name, size_t *len)
|
int get_db_mysql57(MYSQL_THD thd, char **name, size_t *len)
|
||||||
{
|
{
|
||||||
|
#ifdef __linux__
|
||||||
int db_off;
|
int db_off;
|
||||||
int db_len_off;
|
int db_len_off;
|
||||||
if (debug_server_started)
|
if (debug_server_started)
|
||||||
@ -2286,7 +2288,6 @@ int get_db_mysql57(MYSQL_THD thd, char **name, size_t *len)
|
|||||||
#endif /*x86_64*/
|
#endif /*x86_64*/
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __linux__
|
|
||||||
*name= *(char **) (((char *) thd) + db_off);
|
*name= *(char **) (((char *) thd) + db_off);
|
||||||
*len= *((size_t *) (((char*) thd) + db_len_off));
|
*len= *((size_t *) (((char*) thd) + db_len_off));
|
||||||
if (*name && (*name)[*len] != 0)
|
if (*name && (*name)[*len] != 0)
|
||||||
|
@ -1145,9 +1145,23 @@ unpack_fields(MYSQL *mysql, MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
|
|||||||
{
|
{
|
||||||
if (field >= result + fields)
|
if (field >= result + fields)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
|
/*
|
||||||
|
If any of the row->data[] below is NULL, it can result in a
|
||||||
|
crash. Error out early as it indicates a malformed packet.
|
||||||
|
For data[0], data[1] and data[5], strmake_root will handle
|
||||||
|
NULL values.
|
||||||
|
*/
|
||||||
|
if (!row->data[2] || !row->data[3] || !row->data[4])
|
||||||
|
{
|
||||||
|
free_rows(data);
|
||||||
|
set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
|
||||||
|
DBUG_RETURN(0);
|
||||||
|
}
|
||||||
|
|
||||||
cli_fetch_lengths(&lengths[0], row->data, default_value ? 6 : 5);
|
cli_fetch_lengths(&lengths[0], row->data, default_value ? 6 : 5);
|
||||||
field->org_table= field->table= strdup_root(alloc,(char*) row->data[0]);
|
field->org_table= field->table= strmake_root(alloc,(char*) row->data[0], lengths[0]);
|
||||||
field->name= strdup_root(alloc,(char*) row->data[1]);
|
field->name= strmake_root(alloc,(char*) row->data[1], lengths[1]);
|
||||||
field->length= (uint) uint3korr(row->data[2]);
|
field->length= (uint) uint3korr(row->data[2]);
|
||||||
field->type= (enum enum_field_types) (uchar) row->data[3][0];
|
field->type= (enum enum_field_types) (uchar) row->data[3][0];
|
||||||
|
|
||||||
@ -1172,7 +1186,7 @@ unpack_fields(MYSQL *mysql, MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
|
|||||||
field->flags|= NUM_FLAG;
|
field->flags|= NUM_FLAG;
|
||||||
if (default_value && row->data[5])
|
if (default_value && row->data[5])
|
||||||
{
|
{
|
||||||
field->def=strdup_root(alloc,(char*) row->data[5]);
|
field->def= strmake_root(alloc,(char*) row->data[5], lengths[5]);
|
||||||
field->def_length= lengths[5];
|
field->def_length= lengths[5];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
/* Copyright (c) 2006, 2013, Oracle and/or its affiliates.
|
/* Copyright (c) 2006, 2019, Oracle and/or its affiliates.
|
||||||
|
Copyright (c) 2009, 2020, MariaDB Corporation
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
@ -495,6 +496,7 @@ Event_scheduler::run(THD *thd)
|
|||||||
DBUG_PRINT("info", ("job_data is NULL, the thread was killed"));
|
DBUG_PRINT("info", ("job_data is NULL, the thread was killed"));
|
||||||
}
|
}
|
||||||
DBUG_PRINT("info", ("state=%s", scheduler_states_names[state].str));
|
DBUG_PRINT("info", ("state=%s", scheduler_states_names[state].str));
|
||||||
|
free_root(thd->mem_root, MYF(0));
|
||||||
}
|
}
|
||||||
|
|
||||||
LOCK_DATA();
|
LOCK_DATA();
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
write-output "/* This file was generated using gen_win_tzname_data.ps1 */"
|
write-output "/* This file was generated using gen_win_tzname_data.ps1 */"
|
||||||
$xdoc = new-object System.Xml.XmlDocument
|
$xdoc = new-object System.Xml.XmlDocument
|
||||||
$xdoc.load("https://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml")
|
$xdoc.load("https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/windowsZones.xml")
|
||||||
$nodes = $xdoc.SelectNodes("//mapZone[@territory='001']") # use default territory (001)
|
$nodes = $xdoc.SelectNodes("//mapZone[@territory='001']") # use default territory (001)
|
||||||
foreach ($node in $nodes) {
|
foreach ($node in $nodes) {
|
||||||
write-output ('{L"'+ $node.other + '","'+ $node.type+'"},')
|
write-output ('{L"'+ $node.other + '","'+ $node.type+'"},')
|
||||||
|
@ -356,9 +356,8 @@ QUICK_RANGE_SELECT *get_quick_select(PARAM *param,uint index,
|
|||||||
uint mrr_buf_size, MEM_ROOT *alloc);
|
uint mrr_buf_size, MEM_ROOT *alloc);
|
||||||
static TRP_RANGE *get_key_scans_params(PARAM *param, SEL_TREE *tree,
|
static TRP_RANGE *get_key_scans_params(PARAM *param, SEL_TREE *tree,
|
||||||
bool index_read_must_be_used,
|
bool index_read_must_be_used,
|
||||||
bool update_tbl_stats,
|
bool for_range_access,
|
||||||
double read_time,
|
double read_time);
|
||||||
bool ror_scans_required);
|
|
||||||
static
|
static
|
||||||
TRP_INDEX_INTERSECT *get_best_index_intersect(PARAM *param, SEL_TREE *tree,
|
TRP_INDEX_INTERSECT *get_best_index_intersect(PARAM *param, SEL_TREE *tree,
|
||||||
double read_time);
|
double read_time);
|
||||||
@ -2907,7 +2906,6 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
|
|||||||
It is possible to use a range-based quick select (but it might be
|
It is possible to use a range-based quick select (but it might be
|
||||||
slower than 'all' table scan).
|
slower than 'all' table scan).
|
||||||
*/
|
*/
|
||||||
TRP_RANGE *range_trp;
|
|
||||||
TRP_ROR_INTERSECT *rori_trp;
|
TRP_ROR_INTERSECT *rori_trp;
|
||||||
TRP_INDEX_INTERSECT *intersect_trp;
|
TRP_INDEX_INTERSECT *intersect_trp;
|
||||||
bool can_build_covering= FALSE;
|
bool can_build_covering= FALSE;
|
||||||
@ -2916,9 +2914,9 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
|
|||||||
remove_nonrange_trees(¶m, tree);
|
remove_nonrange_trees(¶m, tree);
|
||||||
|
|
||||||
/* Get best 'range' plan and prepare data for making other plans */
|
/* Get best 'range' plan and prepare data for making other plans */
|
||||||
if ((range_trp= get_key_scans_params(¶m, tree,
|
if (auto range_trp= get_key_scans_params(¶m, tree,
|
||||||
only_single_index_range_scan, TRUE,
|
only_single_index_range_scan,
|
||||||
best_read_time, FALSE)))
|
true, best_read_time))
|
||||||
{
|
{
|
||||||
best_trp= range_trp;
|
best_trp= range_trp;
|
||||||
best_read_time= best_trp->read_cost;
|
best_read_time= best_trp->read_cost;
|
||||||
@ -5083,9 +5081,6 @@ TABLE_READ_PLAN *get_best_disjunct_quick(PARAM *param, SEL_IMERGE *imerge,
|
|||||||
n_child_scans)))
|
n_child_scans)))
|
||||||
DBUG_RETURN(NULL);
|
DBUG_RETURN(NULL);
|
||||||
|
|
||||||
const bool only_ror_scans_required= !optimizer_flag(param->thd,
|
|
||||||
OPTIMIZER_SWITCH_INDEX_MERGE_SORT_UNION);
|
|
||||||
|
|
||||||
Json_writer_object trace_best_disjunct(thd);
|
Json_writer_object trace_best_disjunct(thd);
|
||||||
Json_writer_array to_merge(thd, "indexes_to_merge");
|
Json_writer_array to_merge(thd, "indexes_to_merge");
|
||||||
/*
|
/*
|
||||||
@ -5101,8 +5096,7 @@ TABLE_READ_PLAN *get_best_disjunct_quick(PARAM *param, SEL_IMERGE *imerge,
|
|||||||
"tree in SEL_IMERGE"););
|
"tree in SEL_IMERGE"););
|
||||||
Json_writer_object trace_idx(thd);
|
Json_writer_object trace_idx(thd);
|
||||||
if (!(*cur_child= get_key_scans_params(param, *ptree, TRUE, FALSE,
|
if (!(*cur_child= get_key_scans_params(param, *ptree, TRUE, FALSE,
|
||||||
read_time,
|
read_time)))
|
||||||
only_ror_scans_required)))
|
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
One of index scans in this index_merge is more expensive than entire
|
One of index scans in this index_merge is more expensive than entire
|
||||||
@ -5462,9 +5456,12 @@ TABLE_READ_PLAN *merge_same_index_scans(PARAM *param, SEL_IMERGE *imerge,
|
|||||||
a random order
|
a random order
|
||||||
2. the functions that estimate the cost of a range scan and an
|
2. the functions that estimate the cost of a range scan and an
|
||||||
index merge retrievals are not well calibrated
|
index merge retrievals are not well calibrated
|
||||||
|
|
||||||
|
As the best range access has been already chosen it does not
|
||||||
|
make sense to evaluate the one obtained from a degenerated
|
||||||
|
index merge.
|
||||||
*/
|
*/
|
||||||
trp= get_key_scans_params(param, *imerge->trees, FALSE, TRUE,
|
trp= 0;
|
||||||
read_time, FALSE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DBUG_RETURN(trp);
|
DBUG_RETURN(trp);
|
||||||
@ -7347,9 +7344,9 @@ TRP_ROR_INTERSECT *get_best_covering_ror_intersect(PARAM *param,
|
|||||||
tree make range select for this SEL_TREE
|
tree make range select for this SEL_TREE
|
||||||
index_read_must_be_used if TRUE, assume 'index only' option will be set
|
index_read_must_be_used if TRUE, assume 'index only' option will be set
|
||||||
(except for clustered PK indexes)
|
(except for clustered PK indexes)
|
||||||
|
for_range_access if TRUE the function is called to get the best range
|
||||||
|
plan for range access, not for index merge access
|
||||||
read_time don't create read plans with cost > read_time.
|
read_time don't create read plans with cost > read_time.
|
||||||
only_ror_scans_required set to TRUE when we are only interested
|
|
||||||
in ROR scan
|
|
||||||
RETURN
|
RETURN
|
||||||
Best range read plan
|
Best range read plan
|
||||||
NULL if no plan found or error occurred
|
NULL if no plan found or error occurred
|
||||||
@ -7357,9 +7354,8 @@ TRP_ROR_INTERSECT *get_best_covering_ror_intersect(PARAM *param,
|
|||||||
|
|
||||||
static TRP_RANGE *get_key_scans_params(PARAM *param, SEL_TREE *tree,
|
static TRP_RANGE *get_key_scans_params(PARAM *param, SEL_TREE *tree,
|
||||||
bool index_read_must_be_used,
|
bool index_read_must_be_used,
|
||||||
bool update_tbl_stats,
|
bool for_range_access,
|
||||||
double read_time,
|
double read_time)
|
||||||
bool only_ror_scans_required)
|
|
||||||
{
|
{
|
||||||
uint idx, UNINIT_VAR(best_idx);
|
uint idx, UNINIT_VAR(best_idx);
|
||||||
SEL_ARG *key_to_read= NULL;
|
SEL_ARG *key_to_read= NULL;
|
||||||
@ -7387,7 +7383,8 @@ static TRP_RANGE *get_key_scans_params(PARAM *param, SEL_TREE *tree,
|
|||||||
(INDEX_SCAN_INFO **) alloc_root(param->mem_root,
|
(INDEX_SCAN_INFO **) alloc_root(param->mem_root,
|
||||||
sizeof(INDEX_SCAN_INFO *) * param->keys);
|
sizeof(INDEX_SCAN_INFO *) * param->keys);
|
||||||
}
|
}
|
||||||
tree->index_scans_end= tree->index_scans;
|
tree->index_scans_end= tree->index_scans;
|
||||||
|
|
||||||
for (idx= 0; idx < param->keys; idx++)
|
for (idx= 0; idx < param->keys; idx++)
|
||||||
{
|
{
|
||||||
SEL_ARG *key= tree->keys[idx];
|
SEL_ARG *key= tree->keys[idx];
|
||||||
@ -7411,10 +7408,15 @@ static TRP_RANGE *get_key_scans_params(PARAM *param, SEL_TREE *tree,
|
|||||||
trace_idx.add("index", param->table->key_info[keynr].name);
|
trace_idx.add("index", param->table->key_info[keynr].name);
|
||||||
|
|
||||||
found_records= check_quick_select(param, idx, read_index_only, key,
|
found_records= check_quick_select(param, idx, read_index_only, key,
|
||||||
update_tbl_stats, &mrr_flags,
|
for_range_access, &mrr_flags,
|
||||||
&buf_size, &cost, &is_ror_scan);
|
&buf_size, &cost, &is_ror_scan);
|
||||||
if (only_ror_scans_required && !is_ror_scan)
|
|
||||||
|
if (!for_range_access && !is_ror_scan &&
|
||||||
|
!optimizer_flag(param->thd,OPTIMIZER_SWITCH_INDEX_MERGE_SORT_UNION))
|
||||||
|
{
|
||||||
|
/* The scan is not a ROR-scan, just skip it */
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (found_records != HA_POS_ERROR && tree->index_scans &&
|
if (found_records != HA_POS_ERROR && tree->index_scans &&
|
||||||
(index_scan= (INDEX_SCAN_INFO *)alloc_root(param->mem_root,
|
(index_scan= (INDEX_SCAN_INFO *)alloc_root(param->mem_root,
|
||||||
@ -7443,7 +7445,7 @@ static TRP_RANGE *get_key_scans_params(PARAM *param, SEL_TREE *tree,
|
|||||||
.add("index_only", read_index_only)
|
.add("index_only", read_index_only)
|
||||||
.add("rows", found_records)
|
.add("rows", found_records)
|
||||||
.add("cost", cost.total_cost());
|
.add("cost", cost.total_cost());
|
||||||
}
|
}
|
||||||
if ((found_records != HA_POS_ERROR) && is_ror_scan)
|
if ((found_records != HA_POS_ERROR) && is_ror_scan)
|
||||||
{
|
{
|
||||||
tree->n_ror_scans++;
|
tree->n_ror_scans++;
|
||||||
|
@ -1225,7 +1225,7 @@ void Session_tracker::store(THD *thd, String *buf)
|
|||||||
}
|
}
|
||||||
|
|
||||||
size_t length= buf->length() - start;
|
size_t length= buf->length() - start;
|
||||||
uchar *data= (uchar *)(buf->ptr() + start);
|
uchar *data;
|
||||||
uint size;
|
uint size;
|
||||||
|
|
||||||
if ((size= net_length_size(length)) != 1)
|
if ((size= net_length_size(length)) != 1)
|
||||||
@ -1235,8 +1235,16 @@ void Session_tracker::store(THD *thd, String *buf)
|
|||||||
buf->length(start); // it is safer to have 0-length block in case of error
|
buf->length(start); // it is safer to have 0-length block in case of error
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
The 'buf->reserve()' can change the buf->ptr() so we cannot
|
||||||
|
calculate the 'data' earlier.
|
||||||
|
*/
|
||||||
|
data= (uchar *)(buf->ptr() + start);
|
||||||
memmove(data + (size - 1), data, length);
|
memmove(data + (size - 1), data, length);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
data= (uchar *)(buf->ptr() + start);
|
||||||
|
|
||||||
net_store_length(data - 1, length);
|
net_store_length(data - 1, length);
|
||||||
}
|
}
|
||||||
|
@ -4868,6 +4868,7 @@ connected:
|
|||||||
goto err;
|
goto err;
|
||||||
goto connected;
|
goto connected;
|
||||||
}
|
}
|
||||||
|
DBUG_EXECUTE_IF("fail_com_register_slave", goto err;);
|
||||||
}
|
}
|
||||||
|
|
||||||
DBUG_PRINT("info",("Starting reading binary log from master"));
|
DBUG_PRINT("info",("Starting reading binary log from master"));
|
||||||
|
@ -69,6 +69,10 @@ bool Alter_info::set_requested_algorithm(const LEX_CSTRING *str)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Alter_info::set_requested_algorithm(enum_alter_table_algorithm algo_val)
|
||||||
|
{
|
||||||
|
requested_algorithm= algo_val;
|
||||||
|
}
|
||||||
|
|
||||||
bool Alter_info::set_requested_lock(const LEX_CSTRING *str)
|
bool Alter_info::set_requested_lock(const LEX_CSTRING *str)
|
||||||
{
|
{
|
||||||
@ -86,13 +90,16 @@ bool Alter_info::set_requested_lock(const LEX_CSTRING *str)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* Alter_info::algorithm() const
|
const char* Alter_info::algorithm_clause(THD *thd) const
|
||||||
{
|
{
|
||||||
switch (requested_algorithm) {
|
switch (algorithm(thd)) {
|
||||||
case ALTER_TABLE_ALGORITHM_INPLACE:
|
case ALTER_TABLE_ALGORITHM_INPLACE:
|
||||||
return "ALGORITHM=INPLACE";
|
return "ALGORITHM=INPLACE";
|
||||||
case ALTER_TABLE_ALGORITHM_COPY:
|
case ALTER_TABLE_ALGORITHM_COPY:
|
||||||
return "ALGORITHM=COPY";
|
return "ALGORITHM=COPY";
|
||||||
|
case ALTER_TABLE_ALGORITHM_NONE:
|
||||||
|
DBUG_ASSERT(0);
|
||||||
|
/* Fall through */
|
||||||
case ALTER_TABLE_ALGORITHM_DEFAULT:
|
case ALTER_TABLE_ALGORITHM_DEFAULT:
|
||||||
return "ALGORITHM=DEFAULT";
|
return "ALGORITHM=DEFAULT";
|
||||||
case ALTER_TABLE_ALGORITHM_NOCOPY:
|
case ALTER_TABLE_ALGORITHM_NOCOPY:
|
||||||
@ -123,9 +130,6 @@ const char* Alter_info::lock() const
|
|||||||
bool Alter_info::supports_algorithm(THD *thd, enum_alter_inplace_result result,
|
bool Alter_info::supports_algorithm(THD *thd, enum_alter_inplace_result result,
|
||||||
const Alter_inplace_info *ha_alter_info)
|
const Alter_inplace_info *ha_alter_info)
|
||||||
{
|
{
|
||||||
if (requested_algorithm == Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT)
|
|
||||||
requested_algorithm = (Alter_info::enum_alter_table_algorithm) thd->variables.alter_algorithm;
|
|
||||||
|
|
||||||
switch (result) {
|
switch (result) {
|
||||||
case HA_ALTER_INPLACE_EXCLUSIVE_LOCK:
|
case HA_ALTER_INPLACE_EXCLUSIVE_LOCK:
|
||||||
case HA_ALTER_INPLACE_SHARED_LOCK:
|
case HA_ALTER_INPLACE_SHARED_LOCK:
|
||||||
@ -134,16 +138,16 @@ bool Alter_info::supports_algorithm(THD *thd, enum_alter_inplace_result result,
|
|||||||
return false;
|
return false;
|
||||||
case HA_ALTER_INPLACE_COPY_NO_LOCK:
|
case HA_ALTER_INPLACE_COPY_NO_LOCK:
|
||||||
case HA_ALTER_INPLACE_COPY_LOCK:
|
case HA_ALTER_INPLACE_COPY_LOCK:
|
||||||
if (requested_algorithm >= Alter_info::ALTER_TABLE_ALGORITHM_NOCOPY)
|
if (algorithm(thd) >= Alter_info::ALTER_TABLE_ALGORITHM_NOCOPY)
|
||||||
{
|
{
|
||||||
ha_alter_info->report_unsupported_error(algorithm(),
|
ha_alter_info->report_unsupported_error(algorithm_clause(thd),
|
||||||
"ALGORITHM=INPLACE");
|
"ALGORITHM=INPLACE");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
case HA_ALTER_INPLACE_NOCOPY_NO_LOCK:
|
case HA_ALTER_INPLACE_NOCOPY_NO_LOCK:
|
||||||
case HA_ALTER_INPLACE_NOCOPY_LOCK:
|
case HA_ALTER_INPLACE_NOCOPY_LOCK:
|
||||||
if (requested_algorithm == Alter_info::ALTER_TABLE_ALGORITHM_INSTANT)
|
if (algorithm(thd) == Alter_info::ALTER_TABLE_ALGORITHM_INSTANT)
|
||||||
{
|
{
|
||||||
ha_alter_info->report_unsupported_error("ALGORITHM=INSTANT",
|
ha_alter_info->report_unsupported_error("ALGORITHM=INSTANT",
|
||||||
"ALGORITHM=NOCOPY");
|
"ALGORITHM=NOCOPY");
|
||||||
@ -151,9 +155,9 @@ bool Alter_info::supports_algorithm(THD *thd, enum_alter_inplace_result result,
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
case HA_ALTER_INPLACE_NOT_SUPPORTED:
|
case HA_ALTER_INPLACE_NOT_SUPPORTED:
|
||||||
if (requested_algorithm >= Alter_info::ALTER_TABLE_ALGORITHM_INPLACE)
|
if (algorithm(thd) >= Alter_info::ALTER_TABLE_ALGORITHM_INPLACE)
|
||||||
{
|
{
|
||||||
ha_alter_info->report_unsupported_error(algorithm(),
|
ha_alter_info->report_unsupported_error(algorithm_clause(thd),
|
||||||
"ALGORITHM=COPY");
|
"ALGORITHM=COPY");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -174,7 +178,7 @@ bool Alter_info::supports_lock(THD *thd, enum_alter_inplace_result result,
|
|||||||
case HA_ALTER_INPLACE_EXCLUSIVE_LOCK:
|
case HA_ALTER_INPLACE_EXCLUSIVE_LOCK:
|
||||||
// If SHARED lock and no particular algorithm was requested, use COPY.
|
// If SHARED lock and no particular algorithm was requested, use COPY.
|
||||||
if (requested_lock == Alter_info::ALTER_TABLE_LOCK_SHARED &&
|
if (requested_lock == Alter_info::ALTER_TABLE_LOCK_SHARED &&
|
||||||
requested_algorithm == Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT &&
|
algorithm(thd) == Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT &&
|
||||||
thd->variables.alter_algorithm ==
|
thd->variables.alter_algorithm ==
|
||||||
Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT)
|
Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT)
|
||||||
return false;
|
return false;
|
||||||
@ -237,6 +241,14 @@ bool Alter_info::vers_prohibited(THD *thd) const
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Alter_info::enum_alter_table_algorithm
|
||||||
|
Alter_info::algorithm(const THD *thd) const
|
||||||
|
{
|
||||||
|
if (requested_algorithm == ALTER_TABLE_ALGORITHM_NONE)
|
||||||
|
return (Alter_info::enum_alter_table_algorithm) thd->variables.alter_algorithm;
|
||||||
|
return requested_algorithm;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Alter_table_ctx::Alter_table_ctx()
|
Alter_table_ctx::Alter_table_ctx()
|
||||||
: datetime_field(NULL), error_if_not_empty(false),
|
: datetime_field(NULL), error_if_not_empty(false),
|
||||||
|
@ -57,7 +57,10 @@ public:
|
|||||||
ALTER_TABLE_ALGORITHM_NOCOPY,
|
ALTER_TABLE_ALGORITHM_NOCOPY,
|
||||||
|
|
||||||
// Instant should allow any operation that changes metadata only.
|
// Instant should allow any operation that changes metadata only.
|
||||||
ALTER_TABLE_ALGORITHM_INSTANT
|
ALTER_TABLE_ALGORITHM_INSTANT,
|
||||||
|
|
||||||
|
// When there is no specification of algorithm during alter table.
|
||||||
|
ALTER_TABLE_ALGORITHM_NONE
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@ -104,8 +107,11 @@ public:
|
|||||||
List<const char> partition_names;
|
List<const char> partition_names;
|
||||||
// Number of partitions.
|
// Number of partitions.
|
||||||
uint num_parts;
|
uint num_parts;
|
||||||
|
private:
|
||||||
// Type of ALTER TABLE algorithm.
|
// Type of ALTER TABLE algorithm.
|
||||||
enum_alter_table_algorithm requested_algorithm;
|
enum_alter_table_algorithm requested_algorithm;
|
||||||
|
|
||||||
|
public:
|
||||||
// Type of ALTER TABLE lock.
|
// Type of ALTER TABLE lock.
|
||||||
enum_alter_table_lock requested_lock;
|
enum_alter_table_lock requested_lock;
|
||||||
|
|
||||||
@ -114,7 +120,7 @@ public:
|
|||||||
flags(0), partition_flags(0),
|
flags(0), partition_flags(0),
|
||||||
keys_onoff(LEAVE_AS_IS),
|
keys_onoff(LEAVE_AS_IS),
|
||||||
num_parts(0),
|
num_parts(0),
|
||||||
requested_algorithm(ALTER_TABLE_ALGORITHM_DEFAULT),
|
requested_algorithm(ALTER_TABLE_ALGORITHM_NONE),
|
||||||
requested_lock(ALTER_TABLE_LOCK_DEFAULT)
|
requested_lock(ALTER_TABLE_LOCK_DEFAULT)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
@ -130,7 +136,7 @@ public:
|
|||||||
keys_onoff= LEAVE_AS_IS;
|
keys_onoff= LEAVE_AS_IS;
|
||||||
num_parts= 0;
|
num_parts= 0;
|
||||||
partition_names.empty();
|
partition_names.empty();
|
||||||
requested_algorithm= ALTER_TABLE_ALGORITHM_DEFAULT;
|
requested_algorithm= ALTER_TABLE_ALGORITHM_NONE;
|
||||||
requested_lock= ALTER_TABLE_LOCK_DEFAULT;
|
requested_lock= ALTER_TABLE_LOCK_DEFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -177,10 +183,16 @@ public:
|
|||||||
|
|
||||||
bool set_requested_lock(const LEX_CSTRING *str);
|
bool set_requested_lock(const LEX_CSTRING *str);
|
||||||
|
|
||||||
|
/**
|
||||||
|
Set the requested algorithm to the given algorithm value
|
||||||
|
@param algo_value algorithm to be set
|
||||||
|
*/
|
||||||
|
void set_requested_algorithm(enum_alter_table_algorithm algo_value);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Returns the algorithm value in the format "algorithm=value"
|
Returns the algorithm value in the format "algorithm=value"
|
||||||
*/
|
*/
|
||||||
const char* algorithm() const;
|
const char* algorithm_clause(THD *thd) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Returns the lock value in the format "lock=value"
|
Returns the lock value in the format "lock=value"
|
||||||
@ -216,6 +228,12 @@ public:
|
|||||||
bool supports_lock(THD *thd, enum_alter_inplace_result result,
|
bool supports_lock(THD *thd, enum_alter_inplace_result result,
|
||||||
const Alter_inplace_info *ha_alter_info);
|
const Alter_inplace_info *ha_alter_info);
|
||||||
|
|
||||||
|
/**
|
||||||
|
Return user requested algorithm. If user does not specify
|
||||||
|
algorithm then return alter_algorithm variable value.
|
||||||
|
*/
|
||||||
|
enum_alter_table_algorithm algorithm(const THD *thd) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Alter_info &operator=(const Alter_info &rhs); // not implemented
|
Alter_info &operator=(const Alter_info &rhs); // not implemented
|
||||||
Alter_info(const Alter_info &rhs); // not implemented
|
Alter_info(const Alter_info &rhs); // not implemented
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* Copyright (c) 2000, 2014, Oracle and/or its affiliates.
|
/* Copyright (c) 2000, 2019, Oracle and/or its affiliates.
|
||||||
Copyright (c) 2009, 2019, MariaDB Corporation
|
Copyright (c) 2009, 2020, MariaDB Corporation
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
@ -1263,17 +1263,27 @@ static inline uint int_token(const char *str,uint length)
|
|||||||
*/
|
*/
|
||||||
bool Lex_input_stream::consume_comment(int remaining_recursions_permitted)
|
bool Lex_input_stream::consume_comment(int remaining_recursions_permitted)
|
||||||
{
|
{
|
||||||
|
// only one level of nested comments are allowed
|
||||||
|
DBUG_ASSERT(remaining_recursions_permitted == 0 ||
|
||||||
|
remaining_recursions_permitted == 1);
|
||||||
uchar c;
|
uchar c;
|
||||||
while (!eof())
|
while (!eof())
|
||||||
{
|
{
|
||||||
c= yyGet();
|
c= yyGet();
|
||||||
|
|
||||||
if (remaining_recursions_permitted > 0)
|
if (remaining_recursions_permitted == 1)
|
||||||
{
|
{
|
||||||
if ((c == '/') && (yyPeek() == '*'))
|
if ((c == '/') && (yyPeek() == '*'))
|
||||||
{
|
{
|
||||||
yySkip(); // Eat asterisk
|
yyUnput('('); // Replace nested "/*..." with "(*..."
|
||||||
consume_comment(remaining_recursions_permitted - 1);
|
yySkip(); // and skip "("
|
||||||
|
|
||||||
|
yySkip(); /* Eat asterisk */
|
||||||
|
if (consume_comment(0))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
yyUnput(')'); // Replace "...*/" with "...*)"
|
||||||
|
yySkip(); // and skip ")"
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2105,7 +2105,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
|
|||||||
general_log_print(thd, command, "Log: '%s' Pos: %lu", name, pos);
|
general_log_print(thd, command, "Log: '%s' Pos: %lu", name, pos);
|
||||||
if (nlen < FN_REFLEN)
|
if (nlen < FN_REFLEN)
|
||||||
mysql_binlog_send(thd, thd->strmake(name, nlen), (my_off_t)pos, flags);
|
mysql_binlog_send(thd, thd->strmake(name, nlen), (my_off_t)pos, flags);
|
||||||
thd->unregister_slave();
|
thd->unregister_slave(); // todo: can be extraneous
|
||||||
/* fake COM_QUIT -- if we get here, the thread needs to terminate */
|
/* fake COM_QUIT -- if we get here, the thread needs to terminate */
|
||||||
error = TRUE;
|
error = TRUE;
|
||||||
break;
|
break;
|
||||||
|
@ -6004,7 +6004,7 @@ the generated partition syntax in a correct manner.
|
|||||||
*/
|
*/
|
||||||
if (alter_info->partition_flags != ALTER_PARTITION_INFO ||
|
if (alter_info->partition_flags != ALTER_PARTITION_INFO ||
|
||||||
!table->part_info ||
|
!table->part_info ||
|
||||||
alter_info->requested_algorithm !=
|
alter_info->algorithm(thd) !=
|
||||||
Alter_info::ALTER_TABLE_ALGORITHM_INPLACE ||
|
Alter_info::ALTER_TABLE_ALGORITHM_INPLACE ||
|
||||||
!table->part_info->has_same_partitioning(part_info))
|
!table->part_info->has_same_partitioning(part_info))
|
||||||
{
|
{
|
||||||
|
@ -10678,6 +10678,7 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j,
|
|||||||
uchar *key_buff=j->ref.key_buff, *null_ref_key= 0;
|
uchar *key_buff=j->ref.key_buff, *null_ref_key= 0;
|
||||||
uint null_ref_part= NO_REF_PART;
|
uint null_ref_part= NO_REF_PART;
|
||||||
bool keyuse_uses_no_tables= TRUE;
|
bool keyuse_uses_no_tables= TRUE;
|
||||||
|
uint not_null_keyparts= 0;
|
||||||
if (ftkey)
|
if (ftkey)
|
||||||
{
|
{
|
||||||
j->ref.items[0]=((Item_func*)(keyuse->val))->key_item();
|
j->ref.items[0]=((Item_func*)(keyuse->val))->key_item();
|
||||||
@ -10707,6 +10708,8 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j,
|
|||||||
j->ref.items[i]=keyuse->val; // Save for cond removal
|
j->ref.items[i]=keyuse->val; // Save for cond removal
|
||||||
j->ref.cond_guards[i]= keyuse->cond_guard;
|
j->ref.cond_guards[i]= keyuse->cond_guard;
|
||||||
|
|
||||||
|
if (!keyuse->val->maybe_null || keyuse->null_rejecting)
|
||||||
|
not_null_keyparts++;
|
||||||
/*
|
/*
|
||||||
Set ref.null_rejecting to true only if we are going to inject a
|
Set ref.null_rejecting to true only if we are going to inject a
|
||||||
"keyuse->val IS NOT NULL" predicate.
|
"keyuse->val IS NOT NULL" predicate.
|
||||||
@ -10766,12 +10769,18 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j,
|
|||||||
ulong key_flags= j->table->actual_key_flags(keyinfo);
|
ulong key_flags= j->table->actual_key_flags(keyinfo);
|
||||||
if (j->type == JT_CONST)
|
if (j->type == JT_CONST)
|
||||||
j->table->const_table= 1;
|
j->table->const_table= 1;
|
||||||
else if (!((keyparts == keyinfo->user_defined_key_parts &&
|
else if (!((keyparts == keyinfo->user_defined_key_parts &&
|
||||||
((key_flags & (HA_NOSAME | HA_NULL_PART_KEY)) == HA_NOSAME)) ||
|
(
|
||||||
(keyparts > keyinfo->user_defined_key_parts && // true only for extended keys
|
(key_flags & (HA_NOSAME | HA_NULL_PART_KEY)) == HA_NOSAME ||
|
||||||
MY_TEST(key_flags & HA_EXT_NOSAME) &&
|
/* Unique key and all keyparts are NULL rejecting */
|
||||||
keyparts == keyinfo->ext_key_parts)) ||
|
((key_flags & HA_NOSAME) && keyparts == not_null_keyparts)
|
||||||
null_ref_key)
|
)) ||
|
||||||
|
/* true only for extended keys */
|
||||||
|
(keyparts > keyinfo->user_defined_key_parts &&
|
||||||
|
MY_TEST(key_flags & HA_EXT_NOSAME) &&
|
||||||
|
keyparts == keyinfo->ext_key_parts)
|
||||||
|
) ||
|
||||||
|
null_ref_key)
|
||||||
{
|
{
|
||||||
/* Must read with repeat */
|
/* Must read with repeat */
|
||||||
j->type= null_ref_key ? JT_REF_OR_NULL : JT_REF;
|
j->type= null_ref_key ? JT_REF_OR_NULL : JT_REF;
|
||||||
|
@ -9772,7 +9772,7 @@ do_continue:;
|
|||||||
*/
|
*/
|
||||||
if (!(alter_info->flags & ~(ALTER_RENAME | ALTER_KEYS_ONOFF)) &&
|
if (!(alter_info->flags & ~(ALTER_RENAME | ALTER_KEYS_ONOFF)) &&
|
||||||
alter_info->partition_flags == 0 &&
|
alter_info->partition_flags == 0 &&
|
||||||
alter_info->requested_algorithm !=
|
alter_info->algorithm(thd) !=
|
||||||
Alter_info::ALTER_TABLE_ALGORITHM_COPY) // No need to touch frm.
|
Alter_info::ALTER_TABLE_ALGORITHM_COPY) // No need to touch frm.
|
||||||
{
|
{
|
||||||
bool res;
|
bool res;
|
||||||
@ -9849,7 +9849,7 @@ do_continue:;
|
|||||||
"LOCK=DEFAULT");
|
"LOCK=DEFAULT");
|
||||||
DBUG_RETURN(true);
|
DBUG_RETURN(true);
|
||||||
}
|
}
|
||||||
else if (alter_info->requested_algorithm !=
|
else if (alter_info->algorithm(thd) !=
|
||||||
Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT)
|
Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT)
|
||||||
{
|
{
|
||||||
my_error(ER_ALTER_OPERATION_NOT_SUPPORTED_REASON, MYF(0),
|
my_error(ER_ALTER_OPERATION_NOT_SUPPORTED_REASON, MYF(0),
|
||||||
@ -9889,20 +9889,21 @@ do_continue:;
|
|||||||
using in-place API.
|
using in-place API.
|
||||||
*/
|
*/
|
||||||
if ((thd->variables.alter_algorithm == Alter_info::ALTER_TABLE_ALGORITHM_COPY &&
|
if ((thd->variables.alter_algorithm == Alter_info::ALTER_TABLE_ALGORITHM_COPY &&
|
||||||
alter_info->requested_algorithm !=
|
alter_info->algorithm(thd) !=
|
||||||
Alter_info::ALTER_TABLE_ALGORITHM_INPLACE)
|
Alter_info::ALTER_TABLE_ALGORITHM_INPLACE)
|
||||||
|| is_inplace_alter_impossible(table, create_info, alter_info)
|
|| is_inplace_alter_impossible(table, create_info, alter_info)
|
||||||
|| IF_PARTITIONING((partition_changed &&
|
|| IF_PARTITIONING((partition_changed &&
|
||||||
!(table->s->db_type()->partition_flags() & HA_USE_AUTO_PARTITION)), 0))
|
!(table->s->db_type()->partition_flags() & HA_USE_AUTO_PARTITION)), 0))
|
||||||
{
|
{
|
||||||
if (alter_info->requested_algorithm ==
|
if (alter_info->algorithm(thd) ==
|
||||||
Alter_info::ALTER_TABLE_ALGORITHM_INPLACE)
|
Alter_info::ALTER_TABLE_ALGORITHM_INPLACE)
|
||||||
{
|
{
|
||||||
my_error(ER_ALTER_OPERATION_NOT_SUPPORTED, MYF(0),
|
my_error(ER_ALTER_OPERATION_NOT_SUPPORTED, MYF(0),
|
||||||
"ALGORITHM=INPLACE", "ALGORITHM=COPY");
|
"ALGORITHM=INPLACE", "ALGORITHM=COPY");
|
||||||
DBUG_RETURN(true);
|
DBUG_RETURN(true);
|
||||||
}
|
}
|
||||||
alter_info->requested_algorithm= Alter_info::ALTER_TABLE_ALGORITHM_COPY;
|
alter_info->set_requested_algorithm(
|
||||||
|
Alter_info::ALTER_TABLE_ALGORITHM_COPY);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -10018,7 +10019,7 @@ do_continue:;
|
|||||||
/* Remember that we have not created table in storage engine yet. */
|
/* Remember that we have not created table in storage engine yet. */
|
||||||
bool no_ha_table= true;
|
bool no_ha_table= true;
|
||||||
|
|
||||||
if (alter_info->requested_algorithm != Alter_info::ALTER_TABLE_ALGORITHM_COPY)
|
if (alter_info->algorithm(thd) != Alter_info::ALTER_TABLE_ALGORITHM_COPY)
|
||||||
{
|
{
|
||||||
Alter_inplace_info ha_alter_info(create_info, alter_info,
|
Alter_inplace_info ha_alter_info(create_info, alter_info,
|
||||||
key_info, key_count,
|
key_info, key_count,
|
||||||
@ -10108,7 +10109,7 @@ do_continue:;
|
|||||||
// If SHARED lock and no particular algorithm was requested, use COPY.
|
// If SHARED lock and no particular algorithm was requested, use COPY.
|
||||||
if (inplace_supported == HA_ALTER_INPLACE_EXCLUSIVE_LOCK &&
|
if (inplace_supported == HA_ALTER_INPLACE_EXCLUSIVE_LOCK &&
|
||||||
alter_info->requested_lock == Alter_info::ALTER_TABLE_LOCK_SHARED &&
|
alter_info->requested_lock == Alter_info::ALTER_TABLE_LOCK_SHARED &&
|
||||||
alter_info->requested_algorithm ==
|
alter_info->algorithm(thd) ==
|
||||||
Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT &&
|
Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT &&
|
||||||
thd->variables.alter_algorithm ==
|
thd->variables.alter_algorithm ==
|
||||||
Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT)
|
Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT)
|
||||||
@ -10963,7 +10964,8 @@ bool mysql_recreate_table(THD *thd, TABLE_LIST *table_list, bool table_copy)
|
|||||||
alter_info.flags= (ALTER_CHANGE_COLUMN | ALTER_RECREATE);
|
alter_info.flags= (ALTER_CHANGE_COLUMN | ALTER_RECREATE);
|
||||||
|
|
||||||
if (table_copy)
|
if (table_copy)
|
||||||
alter_info.requested_algorithm= Alter_info::ALTER_TABLE_ALGORITHM_COPY;
|
alter_info.set_requested_algorithm(
|
||||||
|
Alter_info::ALTER_TABLE_ALGORITHM_COPY);
|
||||||
|
|
||||||
bool res= mysql_alter_table(thd, &null_clex_str, &null_clex_str, &create_info,
|
bool res= mysql_alter_table(thd, &null_clex_str, &null_clex_str, &create_info,
|
||||||
table_list, &alter_info, 0,
|
table_list, &alter_info, 0,
|
||||||
|
@ -8505,8 +8505,8 @@ opt_index_lock_algorithm:
|
|||||||
alter_algorithm_option:
|
alter_algorithm_option:
|
||||||
ALGORITHM_SYM opt_equal DEFAULT
|
ALGORITHM_SYM opt_equal DEFAULT
|
||||||
{
|
{
|
||||||
Lex->alter_info.requested_algorithm=
|
Lex->alter_info.set_requested_algorithm(
|
||||||
Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT;
|
Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT);
|
||||||
}
|
}
|
||||||
| ALGORITHM_SYM opt_equal ident
|
| ALGORITHM_SYM opt_equal ident
|
||||||
{
|
{
|
||||||
|
@ -8606,8 +8606,8 @@ opt_index_lock_algorithm:
|
|||||||
alter_algorithm_option:
|
alter_algorithm_option:
|
||||||
ALGORITHM_SYM opt_equal DEFAULT
|
ALGORITHM_SYM opt_equal DEFAULT
|
||||||
{
|
{
|
||||||
Lex->alter_info.requested_algorithm=
|
Lex->alter_info.set_requested_algorithm(
|
||||||
Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT;
|
Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT);
|
||||||
}
|
}
|
||||||
| ALGORITHM_SYM opt_equal ident
|
| ALGORITHM_SYM opt_equal ident
|
||||||
{
|
{
|
||||||
|
@ -23,13 +23,13 @@
|
|||||||
{L"Haiti Standard Time","America/Port-au-Prince"},
|
{L"Haiti Standard Time","America/Port-au-Prince"},
|
||||||
{L"Cuba Standard Time","America/Havana"},
|
{L"Cuba Standard Time","America/Havana"},
|
||||||
{L"US Eastern Standard Time","America/Indianapolis"},
|
{L"US Eastern Standard Time","America/Indianapolis"},
|
||||||
|
{L"Turks And Caicos Standard Time","America/Grand_Turk"},
|
||||||
{L"Paraguay Standard Time","America/Asuncion"},
|
{L"Paraguay Standard Time","America/Asuncion"},
|
||||||
{L"Atlantic Standard Time","America/Halifax"},
|
{L"Atlantic Standard Time","America/Halifax"},
|
||||||
{L"Venezuela Standard Time","America/Caracas"},
|
{L"Venezuela Standard Time","America/Caracas"},
|
||||||
{L"Central Brazilian Standard Time","America/Cuiaba"},
|
{L"Central Brazilian Standard Time","America/Cuiaba"},
|
||||||
{L"SA Western Standard Time","America/La_Paz"},
|
{L"SA Western Standard Time","America/La_Paz"},
|
||||||
{L"Pacific SA Standard Time","America/Santiago"},
|
{L"Pacific SA Standard Time","America/Santiago"},
|
||||||
{L"Turks And Caicos Standard Time","America/Grand_Turk"},
|
|
||||||
{L"Newfoundland Standard Time","America/St_Johns"},
|
{L"Newfoundland Standard Time","America/St_Johns"},
|
||||||
{L"Tocantins Standard Time","America/Araguaina"},
|
{L"Tocantins Standard Time","America/Araguaina"},
|
||||||
{L"E. South America Standard Time","America/Sao_Paulo"},
|
{L"E. South America Standard Time","America/Sao_Paulo"},
|
||||||
@ -46,11 +46,11 @@
|
|||||||
{L"UTC","Etc/GMT"},
|
{L"UTC","Etc/GMT"},
|
||||||
{L"GMT Standard Time","Europe/London"},
|
{L"GMT Standard Time","Europe/London"},
|
||||||
{L"Greenwich Standard Time","Atlantic/Reykjavik"},
|
{L"Greenwich Standard Time","Atlantic/Reykjavik"},
|
||||||
|
{L"Sao Tome Standard Time","Africa/Sao_Tome"},
|
||||||
|
{L"Morocco Standard Time","Africa/Casablanca"},
|
||||||
{L"W. Europe Standard Time","Europe/Berlin"},
|
{L"W. Europe Standard Time","Europe/Berlin"},
|
||||||
{L"Central Europe Standard Time","Europe/Budapest"},
|
{L"Central Europe Standard Time","Europe/Budapest"},
|
||||||
{L"Romance Standard Time","Europe/Paris"},
|
{L"Romance Standard Time","Europe/Paris"},
|
||||||
{L"Morocco Standard Time","Africa/Casablanca"},
|
|
||||||
{L"Sao Tome Standard Time","Africa/Sao_Tome"},
|
|
||||||
{L"Central European Standard Time","Europe/Warsaw"},
|
{L"Central European Standard Time","Europe/Warsaw"},
|
||||||
{L"W. Central Africa Standard Time","Africa/Lagos"},
|
{L"W. Central Africa Standard Time","Africa/Lagos"},
|
||||||
{L"Jordan Standard Time","Asia/Amman"},
|
{L"Jordan Standard Time","Asia/Amman"},
|
||||||
@ -81,11 +81,13 @@
|
|||||||
{L"Mauritius Standard Time","Indian/Mauritius"},
|
{L"Mauritius Standard Time","Indian/Mauritius"},
|
||||||
{L"Saratov Standard Time","Europe/Saratov"},
|
{L"Saratov Standard Time","Europe/Saratov"},
|
||||||
{L"Georgian Standard Time","Asia/Tbilisi"},
|
{L"Georgian Standard Time","Asia/Tbilisi"},
|
||||||
|
{L"Volgograd Standard Time","Europe/Volgograd"},
|
||||||
{L"Caucasus Standard Time","Asia/Yerevan"},
|
{L"Caucasus Standard Time","Asia/Yerevan"},
|
||||||
{L"Afghanistan Standard Time","Asia/Kabul"},
|
{L"Afghanistan Standard Time","Asia/Kabul"},
|
||||||
{L"West Asia Standard Time","Asia/Tashkent"},
|
{L"West Asia Standard Time","Asia/Tashkent"},
|
||||||
{L"Ekaterinburg Standard Time","Asia/Yekaterinburg"},
|
{L"Ekaterinburg Standard Time","Asia/Yekaterinburg"},
|
||||||
{L"Pakistan Standard Time","Asia/Karachi"},
|
{L"Pakistan Standard Time","Asia/Karachi"},
|
||||||
|
{L"Qyzylorda Standard Time","Asia/Qyzylorda"},
|
||||||
{L"India Standard Time","Asia/Calcutta"},
|
{L"India Standard Time","Asia/Calcutta"},
|
||||||
{L"Sri Lanka Standard Time","Asia/Colombo"},
|
{L"Sri Lanka Standard Time","Asia/Colombo"},
|
||||||
{L"Nepal Standard Time","Asia/Katmandu"},
|
{L"Nepal Standard Time","Asia/Katmandu"},
|
||||||
|
@ -817,12 +817,15 @@ bool TDBXML::Initialize(PGLOBAL g)
|
|||||||
if (Void)
|
if (Void)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (Columns && !Bufdone) {
|
if (Columns) {
|
||||||
// Allocate the buffers that will contain node values
|
// Allocate the buffers that will contain node values
|
||||||
for (colp = (PXMLCOL)Columns; colp; colp = (PXMLCOL)colp->GetNext())
|
for (colp = (PXMLCOL)Columns; colp; colp = (PXMLCOL)colp->GetNext())
|
||||||
if (!colp->IsSpecial()) // Not a pseudo column
|
if (!colp->IsSpecial()) { // Not a pseudo column
|
||||||
if (colp->AllocBuf(g, Mode == MODE_INSERT))
|
if (!Bufdone && colp->AllocBuf(g, Mode == MODE_INSERT))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
colp->Nx = colp->Sx = -1;
|
||||||
|
} // endif Special
|
||||||
|
|
||||||
Bufdone = true;
|
Bufdone = true;
|
||||||
} // endif Bufdone
|
} // endif Bufdone
|
||||||
|
@ -157,6 +157,7 @@ class DllExport TDBXML : public TDBASE {
|
|||||||
/* Class XMLCOL: XDB table access method column descriptor. */
|
/* Class XMLCOL: XDB table access method column descriptor. */
|
||||||
/***********************************************************************/
|
/***********************************************************************/
|
||||||
class XMLCOL : public COLBLK {
|
class XMLCOL : public COLBLK {
|
||||||
|
friend class TDBXML;
|
||||||
public:
|
public:
|
||||||
// Constructors
|
// Constructors
|
||||||
XMLCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am = "XML");
|
XMLCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am = "XML");
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
|
Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
|
||||||
Copyright (c) 2012, Facebook Inc.
|
Copyright (c) 2012, Facebook Inc.
|
||||||
Copyright (c) 2014, 2019, MariaDB Corporation.
|
Copyright (c) 2014, 2020, MariaDB Corporation.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify it under
|
This program is free software; you can redistribute it and/or modify it under
|
||||||
the terms of the GNU General Public License as published by the Free Software
|
the terms of the GNU General Public License as published by the Free Software
|
||||||
@ -782,7 +782,7 @@ btr_node_ptr_set_child_page_no(
|
|||||||
rec_t* rec, /*!< in: node pointer record */
|
rec_t* rec, /*!< in: node pointer record */
|
||||||
page_zip_des_t* page_zip,/*!< in/out: compressed page whose uncompressed
|
page_zip_des_t* page_zip,/*!< in/out: compressed page whose uncompressed
|
||||||
part will be updated, or NULL */
|
part will be updated, or NULL */
|
||||||
const offset_t* offsets,/*!< in: array returned by rec_get_offsets() */
|
const rec_offs* offsets,/*!< in: array returned by rec_get_offsets() */
|
||||||
ulint page_no,/*!< in: child node address */
|
ulint page_no,/*!< in: child node address */
|
||||||
mtr_t* mtr) /*!< in: mtr */
|
mtr_t* mtr) /*!< in: mtr */
|
||||||
{
|
{
|
||||||
@ -817,7 +817,7 @@ btr_node_ptr_get_child(
|
|||||||
/*===================*/
|
/*===================*/
|
||||||
const rec_t* node_ptr,/*!< in: node pointer */
|
const rec_t* node_ptr,/*!< in: node pointer */
|
||||||
dict_index_t* index, /*!< in: index */
|
dict_index_t* index, /*!< in: index */
|
||||||
const offset_t* offsets,/*!< in: array returned by rec_get_offsets() */
|
const rec_offs* offsets,/*!< in: array returned by rec_get_offsets() */
|
||||||
mtr_t* mtr) /*!< in: mtr */
|
mtr_t* mtr) /*!< in: mtr */
|
||||||
{
|
{
|
||||||
ut_ad(rec_offs_validate(node_ptr, index, offsets));
|
ut_ad(rec_offs_validate(node_ptr, index, offsets));
|
||||||
@ -836,10 +836,10 @@ Returns the upper level node pointer to a page. It is assumed that mtr holds
|
|||||||
an sx-latch on the tree.
|
an sx-latch on the tree.
|
||||||
@return rec_get_offsets() of the node pointer record */
|
@return rec_get_offsets() of the node pointer record */
|
||||||
static
|
static
|
||||||
offset_t*
|
rec_offs*
|
||||||
btr_page_get_father_node_ptr_func(
|
btr_page_get_father_node_ptr_func(
|
||||||
/*==============================*/
|
/*==============================*/
|
||||||
offset_t* offsets,/*!< in: work area for the return value */
|
rec_offs* offsets,/*!< in: work area for the return value */
|
||||||
mem_heap_t* heap, /*!< in: memory heap to use */
|
mem_heap_t* heap, /*!< in: memory heap to use */
|
||||||
btr_cur_t* cursor, /*!< in: cursor pointing to user record,
|
btr_cur_t* cursor, /*!< in: cursor pointing to user record,
|
||||||
out: cursor on node pointer record,
|
out: cursor on node pointer record,
|
||||||
@ -943,10 +943,10 @@ Returns the upper level node pointer to a page. It is assumed that mtr holds
|
|||||||
an x-latch on the tree.
|
an x-latch on the tree.
|
||||||
@return rec_get_offsets() of the node pointer record */
|
@return rec_get_offsets() of the node pointer record */
|
||||||
static
|
static
|
||||||
offset_t*
|
rec_offs*
|
||||||
btr_page_get_father_block(
|
btr_page_get_father_block(
|
||||||
/*======================*/
|
/*======================*/
|
||||||
offset_t* offsets,/*!< in: work area for the return value */
|
rec_offs* offsets,/*!< in: work area for the return value */
|
||||||
mem_heap_t* heap, /*!< in: memory heap to use */
|
mem_heap_t* heap, /*!< in: memory heap to use */
|
||||||
dict_index_t* index, /*!< in: b-tree index */
|
dict_index_t* index, /*!< in: b-tree index */
|
||||||
buf_block_t* block, /*!< in: child page in the index */
|
buf_block_t* block, /*!< in: child page in the index */
|
||||||
@ -1881,7 +1881,7 @@ btr_root_raise_and_insert(
|
|||||||
on the root page; when the function returns,
|
on the root page; when the function returns,
|
||||||
the cursor is positioned on the predecessor
|
the cursor is positioned on the predecessor
|
||||||
of the inserted record */
|
of the inserted record */
|
||||||
offset_t** offsets,/*!< out: offsets on inserted record */
|
rec_offs** offsets,/*!< out: offsets on inserted record */
|
||||||
mem_heap_t** heap, /*!< in/out: pointer to memory heap, or NULL */
|
mem_heap_t** heap, /*!< in/out: pointer to memory heap, or NULL */
|
||||||
const dtuple_t* tuple, /*!< in: tuple to insert */
|
const dtuple_t* tuple, /*!< in: tuple to insert */
|
||||||
ulint n_ext, /*!< in: number of externally stored columns */
|
ulint n_ext, /*!< in: number of externally stored columns */
|
||||||
@ -2225,7 +2225,7 @@ btr_page_get_split_rec(
|
|||||||
rec_t* next_rec;
|
rec_t* next_rec;
|
||||||
ulint n;
|
ulint n;
|
||||||
mem_heap_t* heap;
|
mem_heap_t* heap;
|
||||||
offset_t* offsets;
|
rec_offs* offsets;
|
||||||
|
|
||||||
page = btr_cur_get_page(cursor);
|
page = btr_cur_get_page(cursor);
|
||||||
|
|
||||||
@ -2331,7 +2331,7 @@ btr_page_insert_fits(
|
|||||||
const rec_t* split_rec,/*!< in: suggestion for first record
|
const rec_t* split_rec,/*!< in: suggestion for first record
|
||||||
on upper half-page, or NULL if
|
on upper half-page, or NULL if
|
||||||
tuple to be inserted should be first */
|
tuple to be inserted should be first */
|
||||||
offset_t** offsets,/*!< in: rec_get_offsets(
|
rec_offs** offsets,/*!< in: rec_get_offsets(
|
||||||
split_rec, cursor->index); out: garbage */
|
split_rec, cursor->index); out: garbage */
|
||||||
const dtuple_t* tuple, /*!< in: tuple to insert */
|
const dtuple_t* tuple, /*!< in: tuple to insert */
|
||||||
ulint n_ext, /*!< in: number of externally stored columns */
|
ulint n_ext, /*!< in: number of externally stored columns */
|
||||||
@ -2431,8 +2431,8 @@ btr_insert_on_non_leaf_level_func(
|
|||||||
dberr_t err;
|
dberr_t err;
|
||||||
rec_t* rec;
|
rec_t* rec;
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets = offsets_;
|
rec_offs* offsets = offsets_;
|
||||||
rec_offs_init(offsets_);
|
rec_offs_init(offsets_);
|
||||||
rtr_info_t rtr_info;
|
rtr_info_t rtr_info;
|
||||||
|
|
||||||
@ -2540,7 +2540,7 @@ btr_attach_half_pages(
|
|||||||
if (direction == FSP_DOWN) {
|
if (direction == FSP_DOWN) {
|
||||||
|
|
||||||
btr_cur_t cursor;
|
btr_cur_t cursor;
|
||||||
offset_t* offsets;
|
rec_offs* offsets;
|
||||||
|
|
||||||
lower_page = buf_block_get_frame(new_block);
|
lower_page = buf_block_get_frame(new_block);
|
||||||
lower_page_no = new_block->page.id.page_no();
|
lower_page_no = new_block->page.id.page_no();
|
||||||
@ -2662,7 +2662,7 @@ btr_page_tuple_smaller(
|
|||||||
/*===================*/
|
/*===================*/
|
||||||
btr_cur_t* cursor, /*!< in: b-tree cursor */
|
btr_cur_t* cursor, /*!< in: b-tree cursor */
|
||||||
const dtuple_t* tuple, /*!< in: tuple to consider */
|
const dtuple_t* tuple, /*!< in: tuple to consider */
|
||||||
offset_t** offsets,/*!< in/out: temporary storage */
|
rec_offs** offsets,/*!< in/out: temporary storage */
|
||||||
ulint n_uniq, /*!< in: number of unique fields
|
ulint n_uniq, /*!< in: number of unique fields
|
||||||
in the index page records */
|
in the index page records */
|
||||||
mem_heap_t** heap) /*!< in/out: heap for offsets */
|
mem_heap_t** heap) /*!< in/out: heap for offsets */
|
||||||
@ -2702,7 +2702,7 @@ rec_t*
|
|||||||
btr_insert_into_right_sibling(
|
btr_insert_into_right_sibling(
|
||||||
ulint flags,
|
ulint flags,
|
||||||
btr_cur_t* cursor,
|
btr_cur_t* cursor,
|
||||||
offset_t** offsets,
|
rec_offs** offsets,
|
||||||
mem_heap_t* heap,
|
mem_heap_t* heap,
|
||||||
const dtuple_t* tuple,
|
const dtuple_t* tuple,
|
||||||
ulint n_ext,
|
ulint n_ext,
|
||||||
@ -2838,7 +2838,7 @@ btr_page_split_and_insert(
|
|||||||
btr_cur_t* cursor, /*!< in: cursor at which to insert; when the
|
btr_cur_t* cursor, /*!< in: cursor at which to insert; when the
|
||||||
function returns, the cursor is positioned
|
function returns, the cursor is positioned
|
||||||
on the predecessor of the inserted record */
|
on the predecessor of the inserted record */
|
||||||
offset_t** offsets,/*!< out: offsets on inserted record */
|
rec_offs** offsets,/*!< out: offsets on inserted record */
|
||||||
mem_heap_t** heap, /*!< in/out: pointer to memory heap, or NULL */
|
mem_heap_t** heap, /*!< in/out: pointer to memory heap, or NULL */
|
||||||
const dtuple_t* tuple, /*!< in: tuple to insert */
|
const dtuple_t* tuple, /*!< in: tuple to insert */
|
||||||
ulint n_ext, /*!< in: number of externally stored columns */
|
ulint n_ext, /*!< in: number of externally stored columns */
|
||||||
@ -3390,7 +3390,7 @@ btr_lift_page_up(
|
|||||||
|
|
||||||
{
|
{
|
||||||
btr_cur_t cursor;
|
btr_cur_t cursor;
|
||||||
offset_t* offsets = NULL;
|
rec_offs* offsets = NULL;
|
||||||
mem_heap_t* heap = mem_heap_create(
|
mem_heap_t* heap = mem_heap_create(
|
||||||
sizeof(*offsets)
|
sizeof(*offsets)
|
||||||
* (REC_OFFS_HEADER_SIZE + 1 + 1
|
* (REC_OFFS_HEADER_SIZE + 1 + 1
|
||||||
@ -3582,7 +3582,7 @@ btr_compress(
|
|||||||
page_t* page;
|
page_t* page;
|
||||||
btr_cur_t father_cursor;
|
btr_cur_t father_cursor;
|
||||||
mem_heap_t* heap;
|
mem_heap_t* heap;
|
||||||
offset_t* offsets;
|
rec_offs* offsets;
|
||||||
ulint nth_rec = 0; /* remove bogus warning */
|
ulint nth_rec = 0; /* remove bogus warning */
|
||||||
bool mbr_changed = false;
|
bool mbr_changed = false;
|
||||||
#ifdef UNIV_DEBUG
|
#ifdef UNIV_DEBUG
|
||||||
@ -3725,7 +3725,7 @@ retry:
|
|||||||
if (is_left) {
|
if (is_left) {
|
||||||
btr_cur_t cursor2;
|
btr_cur_t cursor2;
|
||||||
rtr_mbr_t new_mbr;
|
rtr_mbr_t new_mbr;
|
||||||
offset_t* offsets2 = NULL;
|
rec_offs* offsets2 = NULL;
|
||||||
|
|
||||||
/* For rtree, we need to update father's mbr. */
|
/* For rtree, we need to update father's mbr. */
|
||||||
if (dict_index_is_spatial(index)) {
|
if (dict_index_is_spatial(index)) {
|
||||||
@ -3921,7 +3921,7 @@ retry:
|
|||||||
|
|
||||||
/* For rtree, we need to update father's mbr. */
|
/* For rtree, we need to update father's mbr. */
|
||||||
if (dict_index_is_spatial(index)) {
|
if (dict_index_is_spatial(index)) {
|
||||||
offset_t* offsets2;
|
rec_offs* offsets2;
|
||||||
ulint rec_info;
|
ulint rec_info;
|
||||||
|
|
||||||
offsets2 = rec_get_offsets(
|
offsets2 = rec_get_offsets(
|
||||||
@ -4150,7 +4150,7 @@ btr_discard_only_page_on_level(
|
|||||||
|
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
const rec_t* rec = NULL;
|
const rec_t* rec = NULL;
|
||||||
offset_t* offsets = NULL;
|
rec_offs* offsets = NULL;
|
||||||
if (index->table->instant) {
|
if (index->table->instant) {
|
||||||
const rec_t* r = page_rec_get_next(page_get_infimum_rec(
|
const rec_t* r = page_rec_get_next(page_get_infimum_rec(
|
||||||
block->frame));
|
block->frame));
|
||||||
@ -4395,7 +4395,7 @@ btr_print_recursive(
|
|||||||
ulint width, /*!< in: print this many entries from start
|
ulint width, /*!< in: print this many entries from start
|
||||||
and end */
|
and end */
|
||||||
mem_heap_t** heap, /*!< in/out: heap for rec_get_offsets() */
|
mem_heap_t** heap, /*!< in/out: heap for rec_get_offsets() */
|
||||||
offset_t** offsets,/*!< in/out: buffer for rec_get_offsets() */
|
rec_offs** offsets,/*!< in/out: buffer for rec_get_offsets() */
|
||||||
mtr_t* mtr) /*!< in: mtr */
|
mtr_t* mtr) /*!< in: mtr */
|
||||||
{
|
{
|
||||||
const page_t* page = buf_block_get_frame(block);
|
const page_t* page = buf_block_get_frame(block);
|
||||||
@ -4459,8 +4459,8 @@ btr_print_index(
|
|||||||
mtr_t mtr;
|
mtr_t mtr;
|
||||||
buf_block_t* root;
|
buf_block_t* root;
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets = offsets_;
|
rec_offs* offsets = offsets_;
|
||||||
rec_offs_init(offsets_);
|
rec_offs_init(offsets_);
|
||||||
|
|
||||||
fputs("--------------------------\n"
|
fputs("--------------------------\n"
|
||||||
@ -4494,7 +4494,7 @@ btr_check_node_ptr(
|
|||||||
{
|
{
|
||||||
mem_heap_t* heap;
|
mem_heap_t* heap;
|
||||||
dtuple_t* tuple;
|
dtuple_t* tuple;
|
||||||
offset_t* offsets;
|
rec_offs* offsets;
|
||||||
btr_cur_t cursor;
|
btr_cur_t cursor;
|
||||||
page_t* page = buf_block_get_frame(block);
|
page_t* page = buf_block_get_frame(block);
|
||||||
|
|
||||||
@ -4574,8 +4574,8 @@ btr_index_rec_validate(
|
|||||||
ulint len;
|
ulint len;
|
||||||
const page_t* page;
|
const page_t* page;
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets = offsets_;
|
rec_offs* offsets = offsets_;
|
||||||
rec_offs_init(offsets_);
|
rec_offs_init(offsets_);
|
||||||
|
|
||||||
page = page_align(rec);
|
page = page_align(rec);
|
||||||
@ -4840,8 +4840,8 @@ btr_validate_level(
|
|||||||
bool ret = true;
|
bool ret = true;
|
||||||
mtr_t mtr;
|
mtr_t mtr;
|
||||||
mem_heap_t* heap = mem_heap_create(256);
|
mem_heap_t* heap = mem_heap_create(256);
|
||||||
offset_t* offsets = NULL;
|
rec_offs* offsets = NULL;
|
||||||
offset_t* offsets2= NULL;
|
rec_offs* offsets2= NULL;
|
||||||
#ifdef UNIV_ZIP_DEBUG
|
#ifdef UNIV_ZIP_DEBUG
|
||||||
page_zip_des_t* page_zip;
|
page_zip_des_t* page_zip;
|
||||||
#endif /* UNIV_ZIP_DEBUG */
|
#endif /* UNIV_ZIP_DEBUG */
|
||||||
|
@ -175,7 +175,7 @@ PageBulk::init()
|
|||||||
void
|
void
|
||||||
PageBulk::insert(
|
PageBulk::insert(
|
||||||
const rec_t* rec,
|
const rec_t* rec,
|
||||||
offset_t* offsets)
|
rec_offs* offsets)
|
||||||
{
|
{
|
||||||
ulint rec_size;
|
ulint rec_size;
|
||||||
|
|
||||||
@ -188,7 +188,7 @@ PageBulk::insert(
|
|||||||
/* Check whether records are in order. */
|
/* Check whether records are in order. */
|
||||||
if (!page_rec_is_infimum(m_cur_rec)) {
|
if (!page_rec_is_infimum(m_cur_rec)) {
|
||||||
rec_t* old_rec = m_cur_rec;
|
rec_t* old_rec = m_cur_rec;
|
||||||
offset_t* old_offsets = rec_get_offsets(
|
rec_offs* old_offsets = rec_get_offsets(
|
||||||
old_rec, m_index, NULL, is_leaf,
|
old_rec, m_index, NULL, is_leaf,
|
||||||
ULINT_UNDEFINED, &m_heap);
|
ULINT_UNDEFINED, &m_heap);
|
||||||
|
|
||||||
@ -401,7 +401,7 @@ rec_t*
|
|||||||
PageBulk::getSplitRec()
|
PageBulk::getSplitRec()
|
||||||
{
|
{
|
||||||
rec_t* rec;
|
rec_t* rec;
|
||||||
offset_t* offsets;
|
rec_offs* offsets;
|
||||||
ulint total_used_size;
|
ulint total_used_size;
|
||||||
ulint total_recs_size;
|
ulint total_recs_size;
|
||||||
ulint n_recs;
|
ulint n_recs;
|
||||||
@ -447,7 +447,7 @@ PageBulk::copyIn(
|
|||||||
{
|
{
|
||||||
|
|
||||||
rec_t* rec = split_rec;
|
rec_t* rec = split_rec;
|
||||||
offset_t* offsets = NULL;
|
rec_offs* offsets = NULL;
|
||||||
|
|
||||||
ut_ad(m_rec_no == 0);
|
ut_ad(m_rec_no == 0);
|
||||||
ut_ad(page_rec_is_user_rec(rec));
|
ut_ad(page_rec_is_user_rec(rec));
|
||||||
@ -493,7 +493,7 @@ PageBulk::copyOut(
|
|||||||
ut_ad(n > 0);
|
ut_ad(n > 0);
|
||||||
|
|
||||||
/* Set last record's next in page */
|
/* Set last record's next in page */
|
||||||
offset_t* offsets = NULL;
|
rec_offs* offsets = NULL;
|
||||||
rec = page_rec_get_prev(split_rec);
|
rec = page_rec_get_prev(split_rec);
|
||||||
offsets = rec_get_offsets(rec, m_index, offsets,
|
offsets = rec_get_offsets(rec, m_index, offsets,
|
||||||
page_rec_is_leaf(split_rec),
|
page_rec_is_leaf(split_rec),
|
||||||
@ -603,7 +603,7 @@ the blob data is logged first, then the record is logged in bulk mode.
|
|||||||
dberr_t
|
dberr_t
|
||||||
PageBulk::storeExt(
|
PageBulk::storeExt(
|
||||||
const big_rec_t* big_rec,
|
const big_rec_t* big_rec,
|
||||||
offset_t* offsets)
|
rec_offs* offsets)
|
||||||
{
|
{
|
||||||
/* Note: not all fileds are initialized in btr_pcur. */
|
/* Note: not all fileds are initialized in btr_pcur. */
|
||||||
btr_pcur_t btr_pcur;
|
btr_pcur_t btr_pcur;
|
||||||
@ -863,7 +863,7 @@ BtrBulk::insert(
|
|||||||
ulint rec_size = rec_get_converted_size(m_index, tuple, n_ext);
|
ulint rec_size = rec_get_converted_size(m_index, tuple, n_ext);
|
||||||
big_rec_t* big_rec = NULL;
|
big_rec_t* big_rec = NULL;
|
||||||
rec_t* rec = NULL;
|
rec_t* rec = NULL;
|
||||||
offset_t* offsets = NULL;
|
rec_offs* offsets = NULL;
|
||||||
|
|
||||||
if (page_bulk->needExt(tuple, rec_size)) {
|
if (page_bulk->needExt(tuple, rec_size)) {
|
||||||
/* The record is so big that we have to store some fields
|
/* The record is so big that we have to store some fields
|
||||||
|
@ -158,7 +158,7 @@ btr_cur_unmark_extern_fields(
|
|||||||
part will be updated, or NULL */
|
part will be updated, or NULL */
|
||||||
rec_t* rec, /*!< in/out: record in a clustered index */
|
rec_t* rec, /*!< in/out: record in a clustered index */
|
||||||
dict_index_t* index, /*!< in: index of the page */
|
dict_index_t* index, /*!< in: index of the page */
|
||||||
const offset_t* offsets,/*!< in: array returned by rec_get_offsets() */
|
const rec_offs* offsets,/*!< in: array returned by rec_get_offsets() */
|
||||||
mtr_t* mtr); /*!< in: mtr, or NULL if not logged */
|
mtr_t* mtr); /*!< in: mtr, or NULL if not logged */
|
||||||
/*******************************************************************//**
|
/*******************************************************************//**
|
||||||
Adds path information to the cursor for the current page, for which
|
Adds path information to the cursor for the current page, for which
|
||||||
@ -183,7 +183,7 @@ btr_rec_free_updated_extern_fields(
|
|||||||
rec_t* rec, /*!< in: record */
|
rec_t* rec, /*!< in: record */
|
||||||
page_zip_des_t* page_zip,/*!< in: compressed page whose uncompressed
|
page_zip_des_t* page_zip,/*!< in: compressed page whose uncompressed
|
||||||
part will be updated, or NULL */
|
part will be updated, or NULL */
|
||||||
const offset_t* offsets,/*!< in: rec_get_offsets(rec, index) */
|
const rec_offs* offsets,/*!< in: rec_get_offsets(rec, index) */
|
||||||
const upd_t* update, /*!< in: update vector */
|
const upd_t* update, /*!< in: update vector */
|
||||||
bool rollback,/*!< in: performing rollback? */
|
bool rollback,/*!< in: performing rollback? */
|
||||||
mtr_t* mtr); /*!< in: mini-transaction handle which contains
|
mtr_t* mtr); /*!< in: mini-transaction handle which contains
|
||||||
@ -197,7 +197,7 @@ btr_rec_free_externally_stored_fields(
|
|||||||
dict_index_t* index, /*!< in: index of the data, the index
|
dict_index_t* index, /*!< in: index of the data, the index
|
||||||
tree MUST be X-latched */
|
tree MUST be X-latched */
|
||||||
rec_t* rec, /*!< in: record */
|
rec_t* rec, /*!< in: record */
|
||||||
const offset_t* offsets,/*!< in: rec_get_offsets(rec, index) */
|
const rec_offs* offsets,/*!< in: rec_get_offsets(rec, index) */
|
||||||
page_zip_des_t* page_zip,/*!< in: compressed page whose uncompressed
|
page_zip_des_t* page_zip,/*!< in: compressed page whose uncompressed
|
||||||
part will be updated, or NULL */
|
part will be updated, or NULL */
|
||||||
bool rollback,/*!< in: performing rollback? */
|
bool rollback,/*!< in: performing rollback? */
|
||||||
@ -592,7 +592,7 @@ incompatible:
|
|||||||
}
|
}
|
||||||
|
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t* offsets = rec_get_offsets(rec, index, NULL, true,
|
rec_offs* offsets = rec_get_offsets(rec, index, NULL, true,
|
||||||
ULINT_UNDEFINED, &heap);
|
ULINT_UNDEFINED, &heap);
|
||||||
if (rec_offs_any_default(offsets)) {
|
if (rec_offs_any_default(offsets)) {
|
||||||
inconsistent:
|
inconsistent:
|
||||||
@ -1297,10 +1297,10 @@ btr_cur_search_to_nth_level_func(
|
|||||||
btr_search_t* info;
|
btr_search_t* info;
|
||||||
#endif /* BTR_CUR_ADAPT */
|
#endif /* BTR_CUR_ADAPT */
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets = offsets_;
|
rec_offs* offsets = offsets_;
|
||||||
offset_t offsets2_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets2_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets2 = offsets2_;
|
rec_offs* offsets2 = offsets2_;
|
||||||
rec_offs_init(offsets_);
|
rec_offs_init(offsets_);
|
||||||
rec_offs_init(offsets2_);
|
rec_offs_init(offsets2_);
|
||||||
/* Currently, PAGE_CUR_LE is the only search mode used for searches
|
/* Currently, PAGE_CUR_LE is the only search mode used for searches
|
||||||
@ -2562,8 +2562,8 @@ btr_cur_open_at_index_side_func(
|
|||||||
ulint n_blocks = 0;
|
ulint n_blocks = 0;
|
||||||
ulint n_releases = 0;
|
ulint n_releases = 0;
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets = offsets_;
|
rec_offs* offsets = offsets_;
|
||||||
dberr_t err = DB_SUCCESS;
|
dberr_t err = DB_SUCCESS;
|
||||||
|
|
||||||
rec_offs_init(offsets_);
|
rec_offs_init(offsets_);
|
||||||
@ -2931,8 +2931,8 @@ btr_cur_open_at_rnd_pos_func(
|
|||||||
ulint n_blocks = 0;
|
ulint n_blocks = 0;
|
||||||
ulint n_releases = 0;
|
ulint n_releases = 0;
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets = offsets_;
|
rec_offs* offsets = offsets_;
|
||||||
rec_offs_init(offsets_);
|
rec_offs_init(offsets_);
|
||||||
|
|
||||||
ut_ad(!index->is_spatial());
|
ut_ad(!index->is_spatial());
|
||||||
@ -3221,7 +3221,7 @@ btr_cur_insert_if_possible(
|
|||||||
cursor stays valid */
|
cursor stays valid */
|
||||||
const dtuple_t* tuple, /*!< in: tuple to insert; the size info need not
|
const dtuple_t* tuple, /*!< in: tuple to insert; the size info need not
|
||||||
have been stored to tuple */
|
have been stored to tuple */
|
||||||
offset_t** offsets,/*!< out: offsets on *rec */
|
rec_offs** offsets,/*!< out: offsets on *rec */
|
||||||
mem_heap_t** heap, /*!< in/out: pointer to memory heap, or NULL */
|
mem_heap_t** heap, /*!< in/out: pointer to memory heap, or NULL */
|
||||||
ulint n_ext, /*!< in: number of externally stored columns */
|
ulint n_ext, /*!< in: number of externally stored columns */
|
||||||
mtr_t* mtr) /*!< in/out: mini-transaction */
|
mtr_t* mtr) /*!< in/out: mini-transaction */
|
||||||
@ -3387,7 +3387,7 @@ btr_cur_optimistic_insert(
|
|||||||
specified */
|
specified */
|
||||||
btr_cur_t* cursor, /*!< in: cursor on page after which to insert;
|
btr_cur_t* cursor, /*!< in: cursor on page after which to insert;
|
||||||
cursor stays valid */
|
cursor stays valid */
|
||||||
offset_t** offsets,/*!< out: offsets on *rec */
|
rec_offs** offsets,/*!< out: offsets on *rec */
|
||||||
mem_heap_t** heap, /*!< in/out: pointer to memory heap */
|
mem_heap_t** heap, /*!< in/out: pointer to memory heap */
|
||||||
dtuple_t* entry, /*!< in/out: entry to insert */
|
dtuple_t* entry, /*!< in/out: entry to insert */
|
||||||
rec_t** rec, /*!< out: pointer to inserted record if
|
rec_t** rec, /*!< out: pointer to inserted record if
|
||||||
@ -3692,7 +3692,7 @@ btr_cur_pessimistic_insert(
|
|||||||
insertion will certainly succeed */
|
insertion will certainly succeed */
|
||||||
btr_cur_t* cursor, /*!< in: cursor after which to insert;
|
btr_cur_t* cursor, /*!< in: cursor after which to insert;
|
||||||
cursor stays valid */
|
cursor stays valid */
|
||||||
offset_t** offsets,/*!< out: offsets on *rec */
|
rec_offs** offsets,/*!< out: offsets on *rec */
|
||||||
mem_heap_t** heap, /*!< in/out: pointer to memory heap
|
mem_heap_t** heap, /*!< in/out: pointer to memory heap
|
||||||
that can be emptied */
|
that can be emptied */
|
||||||
dtuple_t* entry, /*!< in/out: entry to insert */
|
dtuple_t* entry, /*!< in/out: entry to insert */
|
||||||
@ -3865,7 +3865,7 @@ btr_cur_upd_lock_and_undo(
|
|||||||
/*======================*/
|
/*======================*/
|
||||||
ulint flags, /*!< in: undo logging and locking flags */
|
ulint flags, /*!< in: undo logging and locking flags */
|
||||||
btr_cur_t* cursor, /*!< in: cursor on record to update */
|
btr_cur_t* cursor, /*!< in: cursor on record to update */
|
||||||
const offset_t* offsets,/*!< in: rec_get_offsets() on cursor */
|
const rec_offs* offsets,/*!< in: rec_get_offsets() on cursor */
|
||||||
const upd_t* update, /*!< in: update vector */
|
const upd_t* update, /*!< in: update vector */
|
||||||
ulint cmpl_info,/*!< in: compiler info on secondary index
|
ulint cmpl_info,/*!< in: compiler info on secondary index
|
||||||
updates */
|
updates */
|
||||||
@ -4039,7 +4039,7 @@ btr_cur_parse_update_in_place(
|
|||||||
roll_ptr_t roll_ptr;
|
roll_ptr_t roll_ptr;
|
||||||
ulint rec_offset;
|
ulint rec_offset;
|
||||||
mem_heap_t* heap;
|
mem_heap_t* heap;
|
||||||
offset_t* offsets;
|
rec_offs* offsets;
|
||||||
|
|
||||||
if (end_ptr < ptr + 1) {
|
if (end_ptr < ptr + 1) {
|
||||||
|
|
||||||
@ -4124,7 +4124,7 @@ btr_cur_update_alloc_zip_func(
|
|||||||
page_cur_t* cursor, /*!< in/out: B-tree page cursor */
|
page_cur_t* cursor, /*!< in/out: B-tree page cursor */
|
||||||
dict_index_t* index, /*!< in: the index corresponding to cursor */
|
dict_index_t* index, /*!< in: the index corresponding to cursor */
|
||||||
#ifdef UNIV_DEBUG
|
#ifdef UNIV_DEBUG
|
||||||
offset_t* offsets,/*!< in/out: offsets of the cursor record */
|
rec_offs* offsets,/*!< in/out: offsets of the cursor record */
|
||||||
#endif /* UNIV_DEBUG */
|
#endif /* UNIV_DEBUG */
|
||||||
ulint length, /*!< in: size needed */
|
ulint length, /*!< in: size needed */
|
||||||
bool create, /*!< in: true=delete-and-insert,
|
bool create, /*!< in: true=delete-and-insert,
|
||||||
@ -4206,7 +4206,7 @@ btr_cur_update_in_place(
|
|||||||
btr_cur_t* cursor, /*!< in: cursor on the record to update;
|
btr_cur_t* cursor, /*!< in: cursor on the record to update;
|
||||||
cursor stays valid and positioned on the
|
cursor stays valid and positioned on the
|
||||||
same record */
|
same record */
|
||||||
offset_t* offsets,/*!< in/out: offsets on cursor->page_cur.rec */
|
rec_offs* offsets,/*!< in/out: offsets on cursor->page_cur.rec */
|
||||||
const upd_t* update, /*!< in: update vector */
|
const upd_t* update, /*!< in: update vector */
|
||||||
ulint cmpl_info,/*!< in: compiler info on secondary index
|
ulint cmpl_info,/*!< in: compiler info on secondary index
|
||||||
updates */
|
updates */
|
||||||
@ -4499,7 +4499,7 @@ btr_cur_optimistic_update(
|
|||||||
btr_cur_t* cursor, /*!< in: cursor on the record to update;
|
btr_cur_t* cursor, /*!< in: cursor on the record to update;
|
||||||
cursor stays valid and positioned on the
|
cursor stays valid and positioned on the
|
||||||
same record */
|
same record */
|
||||||
offset_t** offsets,/*!< out: offsets on cursor->page_cur.rec */
|
rec_offs** offsets,/*!< out: offsets on cursor->page_cur.rec */
|
||||||
mem_heap_t** heap, /*!< in/out: pointer to NULL or memory heap */
|
mem_heap_t** heap, /*!< in/out: pointer to NULL or memory heap */
|
||||||
const upd_t* update, /*!< in: update vector; this must also
|
const upd_t* update, /*!< in: update vector; this must also
|
||||||
contain trx id and roll ptr fields */
|
contain trx id and roll ptr fields */
|
||||||
@ -4834,7 +4834,7 @@ btr_cur_pessimistic_update(
|
|||||||
btr_cur_t* cursor, /*!< in/out: cursor on the record to update;
|
btr_cur_t* cursor, /*!< in/out: cursor on the record to update;
|
||||||
cursor may become invalid if *big_rec == NULL
|
cursor may become invalid if *big_rec == NULL
|
||||||
|| !(flags & BTR_KEEP_POS_FLAG) */
|
|| !(flags & BTR_KEEP_POS_FLAG) */
|
||||||
offset_t** offsets,/*!< out: offsets on cursor->page_cur.rec */
|
rec_offs** offsets,/*!< out: offsets on cursor->page_cur.rec */
|
||||||
mem_heap_t** offsets_heap,
|
mem_heap_t** offsets_heap,
|
||||||
/*!< in/out: pointer to memory heap
|
/*!< in/out: pointer to memory heap
|
||||||
that can be emptied */
|
that can be emptied */
|
||||||
@ -5392,7 +5392,7 @@ btr_cur_parse_del_mark_set_clust_rec(
|
|||||||
clustered index fields. */
|
clustered index fields. */
|
||||||
ut_ad(pos <= MAX_REF_PARTS);
|
ut_ad(pos <= MAX_REF_PARTS);
|
||||||
|
|
||||||
offset_t offsets[REC_OFFS_HEADER_SIZE + MAX_REF_PARTS + 2];
|
rec_offs offsets[REC_OFFS_HEADER_SIZE + MAX_REF_PARTS + 2];
|
||||||
rec_offs_init(offsets);
|
rec_offs_init(offsets);
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
|
|
||||||
@ -5435,7 +5435,7 @@ btr_cur_del_mark_set_clust_rec(
|
|||||||
buf_block_t* block, /*!< in/out: buffer block of the record */
|
buf_block_t* block, /*!< in/out: buffer block of the record */
|
||||||
rec_t* rec, /*!< in/out: record */
|
rec_t* rec, /*!< in/out: record */
|
||||||
dict_index_t* index, /*!< in: clustered index of the record */
|
dict_index_t* index, /*!< in: clustered index of the record */
|
||||||
const offset_t* offsets,/*!< in: rec_get_offsets(rec) */
|
const rec_offs* offsets,/*!< in: rec_get_offsets(rec) */
|
||||||
que_thr_t* thr, /*!< in: query thread */
|
que_thr_t* thr, /*!< in: query thread */
|
||||||
const dtuple_t* entry, /*!< in: dtuple for the deleting record, also
|
const dtuple_t* entry, /*!< in: dtuple for the deleting record, also
|
||||||
contains the virtual cols if there are any */
|
contains the virtual cols if there are any */
|
||||||
@ -5721,8 +5721,8 @@ btr_cur_optimistic_delete_func(
|
|||||||
buf_block_t* block;
|
buf_block_t* block;
|
||||||
rec_t* rec;
|
rec_t* rec;
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets = offsets_;
|
rec_offs* offsets = offsets_;
|
||||||
ibool no_compress_needed;
|
ibool no_compress_needed;
|
||||||
rec_offs_init(offsets_);
|
rec_offs_init(offsets_);
|
||||||
|
|
||||||
@ -5904,7 +5904,7 @@ btr_cur_pessimistic_delete(
|
|||||||
bool success;
|
bool success;
|
||||||
ibool ret = FALSE;
|
ibool ret = FALSE;
|
||||||
mem_heap_t* heap;
|
mem_heap_t* heap;
|
||||||
offset_t* offsets;
|
rec_offs* offsets;
|
||||||
#ifdef UNIV_DEBUG
|
#ifdef UNIV_DEBUG
|
||||||
bool parent_latched = false;
|
bool parent_latched = false;
|
||||||
#endif /* UNIV_DEBUG */
|
#endif /* UNIV_DEBUG */
|
||||||
@ -6056,7 +6056,7 @@ discard_page:
|
|||||||
rtr_mbr_t father_mbr;
|
rtr_mbr_t father_mbr;
|
||||||
rec_t* father_rec;
|
rec_t* father_rec;
|
||||||
btr_cur_t father_cursor;
|
btr_cur_t father_cursor;
|
||||||
offset_t* offsets;
|
rec_offs* offsets;
|
||||||
bool upd_ret;
|
bool upd_ret;
|
||||||
ulint len;
|
ulint len;
|
||||||
|
|
||||||
@ -6802,7 +6802,7 @@ btr_record_not_null_field_in_rec(
|
|||||||
ulint n_unique, /*!< in: dict_index_get_n_unique(index),
|
ulint n_unique, /*!< in: dict_index_get_n_unique(index),
|
||||||
number of columns uniquely determine
|
number of columns uniquely determine
|
||||||
an index entry */
|
an index entry */
|
||||||
const offset_t* offsets, /*!< in: rec_get_offsets(rec, index),
|
const rec_offs* offsets, /*!< in: rec_get_offsets(rec, index),
|
||||||
its size could be for all fields or
|
its size could be for all fields or
|
||||||
that of "n_unique" */
|
that of "n_unique" */
|
||||||
ib_uint64_t* n_not_null) /*!< in/out: array to record number of
|
ib_uint64_t* n_not_null) /*!< in/out: array to record number of
|
||||||
@ -6856,8 +6856,8 @@ btr_estimate_number_of_different_key_vals(
|
|||||||
uintmax_t add_on;
|
uintmax_t add_on;
|
||||||
mtr_t mtr;
|
mtr_t mtr;
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t* offsets_rec = NULL;
|
rec_offs* offsets_rec = NULL;
|
||||||
offset_t* offsets_next_rec = NULL;
|
rec_offs* offsets_next_rec = NULL;
|
||||||
|
|
||||||
/* For spatial index, there is no such stats can be
|
/* For spatial index, there is no such stats can be
|
||||||
fetched. */
|
fetched. */
|
||||||
@ -7045,7 +7045,7 @@ btr_estimate_number_of_different_key_vals(
|
|||||||
and assign the old offsets_rec buffer to
|
and assign the old offsets_rec buffer to
|
||||||
offsets_next_rec. */
|
offsets_next_rec. */
|
||||||
{
|
{
|
||||||
offset_t* offsets_tmp = offsets_rec;
|
rec_offs* offsets_tmp = offsets_rec;
|
||||||
offsets_rec = offsets_next_rec;
|
offsets_rec = offsets_next_rec;
|
||||||
offsets_next_rec = offsets_tmp;
|
offsets_next_rec = offsets_tmp;
|
||||||
}
|
}
|
||||||
@ -7130,7 +7130,7 @@ static
|
|||||||
ulint
|
ulint
|
||||||
btr_rec_get_field_ref_offs(
|
btr_rec_get_field_ref_offs(
|
||||||
/*=======================*/
|
/*=======================*/
|
||||||
const offset_t* offsets,/*!< in: array returned by rec_get_offsets() */
|
const rec_offs* offsets,/*!< in: array returned by rec_get_offsets() */
|
||||||
ulint n) /*!< in: index of the external field */
|
ulint n) /*!< in: index of the external field */
|
||||||
{
|
{
|
||||||
ulint field_ref_offs;
|
ulint field_ref_offs;
|
||||||
@ -7159,7 +7159,7 @@ btr_rec_get_field_ref_offs(
|
|||||||
ulint
|
ulint
|
||||||
btr_rec_get_externally_stored_len(
|
btr_rec_get_externally_stored_len(
|
||||||
const rec_t* rec,
|
const rec_t* rec,
|
||||||
const offset_t* offsets)
|
const rec_offs* offsets)
|
||||||
{
|
{
|
||||||
ulint n_fields;
|
ulint n_fields;
|
||||||
ulint total_extern_len = 0;
|
ulint total_extern_len = 0;
|
||||||
@ -7198,7 +7198,7 @@ btr_cur_set_ownership_of_extern_field(
|
|||||||
part will be updated, or NULL */
|
part will be updated, or NULL */
|
||||||
rec_t* rec, /*!< in/out: clustered index record */
|
rec_t* rec, /*!< in/out: clustered index record */
|
||||||
dict_index_t* index, /*!< in: index of the page */
|
dict_index_t* index, /*!< in: index of the page */
|
||||||
const offset_t* offsets,/*!< in: array returned by rec_get_offsets() */
|
const rec_offs* offsets,/*!< in: array returned by rec_get_offsets() */
|
||||||
ulint i, /*!< in: field number */
|
ulint i, /*!< in: field number */
|
||||||
ibool val, /*!< in: value to set */
|
ibool val, /*!< in: value to set */
|
||||||
mtr_t* mtr) /*!< in: mtr, or NULL if not logged */
|
mtr_t* mtr) /*!< in: mtr, or NULL if not logged */
|
||||||
@ -7248,7 +7248,7 @@ btr_cur_disown_inherited_fields(
|
|||||||
part will be updated, or NULL */
|
part will be updated, or NULL */
|
||||||
rec_t* rec, /*!< in/out: record in a clustered index */
|
rec_t* rec, /*!< in/out: record in a clustered index */
|
||||||
dict_index_t* index, /*!< in: index of the page */
|
dict_index_t* index, /*!< in: index of the page */
|
||||||
const offset_t* offsets,/*!< in: array returned by rec_get_offsets() */
|
const rec_offs* offsets,/*!< in: array returned by rec_get_offsets() */
|
||||||
const upd_t* update, /*!< in: update vector */
|
const upd_t* update, /*!< in: update vector */
|
||||||
mtr_t* mtr) /*!< in/out: mini-transaction */
|
mtr_t* mtr) /*!< in/out: mini-transaction */
|
||||||
{
|
{
|
||||||
@ -7279,7 +7279,7 @@ btr_cur_unmark_extern_fields(
|
|||||||
part will be updated, or NULL */
|
part will be updated, or NULL */
|
||||||
rec_t* rec, /*!< in/out: record in a clustered index */
|
rec_t* rec, /*!< in/out: record in a clustered index */
|
||||||
dict_index_t* index, /*!< in: index of the page */
|
dict_index_t* index, /*!< in: index of the page */
|
||||||
const offset_t* offsets,/*!< in: array returned by rec_get_offsets() */
|
const rec_offs* offsets,/*!< in: array returned by rec_get_offsets() */
|
||||||
mtr_t* mtr) /*!< in: mtr, or NULL if not logged */
|
mtr_t* mtr) /*!< in: mtr, or NULL if not logged */
|
||||||
{
|
{
|
||||||
ulint n;
|
ulint n;
|
||||||
@ -7374,7 +7374,7 @@ struct btr_blob_log_check_t {
|
|||||||
/** Mini transaction holding the latches for m_pcur */
|
/** Mini transaction holding the latches for m_pcur */
|
||||||
mtr_t* m_mtr;
|
mtr_t* m_mtr;
|
||||||
/** rec_get_offsets(rec, index); offset of clust_rec */
|
/** rec_get_offsets(rec, index); offset of clust_rec */
|
||||||
const offset_t* m_offsets;
|
const rec_offs* m_offsets;
|
||||||
/** The block containing clustered record */
|
/** The block containing clustered record */
|
||||||
buf_block_t** m_block;
|
buf_block_t** m_block;
|
||||||
/** The clustered record pointer */
|
/** The clustered record pointer */
|
||||||
@ -7394,7 +7394,7 @@ struct btr_blob_log_check_t {
|
|||||||
btr_blob_log_check_t(
|
btr_blob_log_check_t(
|
||||||
btr_pcur_t* pcur,
|
btr_pcur_t* pcur,
|
||||||
mtr_t* mtr,
|
mtr_t* mtr,
|
||||||
const offset_t* offsets,
|
const rec_offs* offsets,
|
||||||
buf_block_t** block,
|
buf_block_t** block,
|
||||||
rec_t** rec,
|
rec_t** rec,
|
||||||
enum blob_op op)
|
enum blob_op op)
|
||||||
@ -7465,7 +7465,7 @@ struct btr_blob_log_check_t {
|
|||||||
*m_rec = btr_pcur_get_rec(m_pcur);
|
*m_rec = btr_pcur_get_rec(m_pcur);
|
||||||
|
|
||||||
rec_offs_make_valid(*m_rec, index, true,
|
rec_offs_make_valid(*m_rec, index, true,
|
||||||
const_cast<offset_t*>(m_offsets));
|
const_cast<rec_offs*>(m_offsets));
|
||||||
|
|
||||||
ut_ad(m_mtr->memo_contains_page_flagged(
|
ut_ad(m_mtr->memo_contains_page_flagged(
|
||||||
*m_rec,
|
*m_rec,
|
||||||
@ -7496,7 +7496,7 @@ btr_store_big_rec_extern_fields(
|
|||||||
btr_pcur_t* pcur, /*!< in/out: a persistent cursor. if
|
btr_pcur_t* pcur, /*!< in/out: a persistent cursor. if
|
||||||
btr_mtr is restarted, then this can
|
btr_mtr is restarted, then this can
|
||||||
be repositioned. */
|
be repositioned. */
|
||||||
offset_t* offsets, /*!< in/out: rec_get_offsets() on
|
rec_offs* offsets, /*!< in/out: rec_get_offsets() on
|
||||||
pcur. the "external storage" flags
|
pcur. the "external storage" flags
|
||||||
in offsets will correctly correspond
|
in offsets will correctly correspond
|
||||||
to rec when this function returns */
|
to rec when this function returns */
|
||||||
@ -7979,7 +7979,7 @@ btr_free_externally_stored_field(
|
|||||||
byte* field_ref, /*!< in/out: field reference */
|
byte* field_ref, /*!< in/out: field reference */
|
||||||
const rec_t* rec, /*!< in: record containing field_ref, for
|
const rec_t* rec, /*!< in: record containing field_ref, for
|
||||||
page_zip_write_blob_ptr(), or NULL */
|
page_zip_write_blob_ptr(), or NULL */
|
||||||
const offset_t* offsets, /*!< in: rec_get_offsets(rec, index),
|
const rec_offs* offsets, /*!< in: rec_get_offsets(rec, index),
|
||||||
or NULL */
|
or NULL */
|
||||||
page_zip_des_t* page_zip, /*!< in: compressed page corresponding
|
page_zip_des_t* page_zip, /*!< in: compressed page corresponding
|
||||||
to rec, or NULL if rec == NULL */
|
to rec, or NULL if rec == NULL */
|
||||||
@ -8152,7 +8152,7 @@ btr_rec_free_externally_stored_fields(
|
|||||||
dict_index_t* index, /*!< in: index of the data, the index
|
dict_index_t* index, /*!< in: index of the data, the index
|
||||||
tree MUST be X-latched */
|
tree MUST be X-latched */
|
||||||
rec_t* rec, /*!< in/out: record */
|
rec_t* rec, /*!< in/out: record */
|
||||||
const offset_t* offsets,/*!< in: rec_get_offsets(rec, index) */
|
const rec_offs* offsets,/*!< in: rec_get_offsets(rec, index) */
|
||||||
page_zip_des_t* page_zip,/*!< in: compressed page whose uncompressed
|
page_zip_des_t* page_zip,/*!< in: compressed page whose uncompressed
|
||||||
part will be updated, or NULL */
|
part will be updated, or NULL */
|
||||||
bool rollback,/*!< in: performing rollback? */
|
bool rollback,/*!< in: performing rollback? */
|
||||||
@ -8193,7 +8193,7 @@ btr_rec_free_updated_extern_fields(
|
|||||||
rec_t* rec, /*!< in/out: record */
|
rec_t* rec, /*!< in/out: record */
|
||||||
page_zip_des_t* page_zip,/*!< in: compressed page whose uncompressed
|
page_zip_des_t* page_zip,/*!< in: compressed page whose uncompressed
|
||||||
part will be updated, or NULL */
|
part will be updated, or NULL */
|
||||||
const offset_t* offsets,/*!< in: rec_get_offsets(rec, index) */
|
const rec_offs* offsets,/*!< in: rec_get_offsets(rec, index) */
|
||||||
const upd_t* update, /*!< in: update vector */
|
const upd_t* update, /*!< in: update vector */
|
||||||
bool rollback,/*!< in: performing rollback? */
|
bool rollback,/*!< in: performing rollback? */
|
||||||
mtr_t* mtr) /*!< in: mini-transaction handle which contains
|
mtr_t* mtr) /*!< in: mini-transaction handle which contains
|
||||||
@ -8590,7 +8590,7 @@ protected by a lock or a page latch
|
|||||||
byte*
|
byte*
|
||||||
btr_rec_copy_externally_stored_field(
|
btr_rec_copy_externally_stored_field(
|
||||||
const rec_t* rec,
|
const rec_t* rec,
|
||||||
const offset_t* offsets,
|
const rec_offs* offsets,
|
||||||
ulint zip_size,
|
ulint zip_size,
|
||||||
ulint no,
|
ulint no,
|
||||||
ulint* len,
|
ulint* len,
|
||||||
|
@ -338,8 +338,8 @@ btr_defragment_calc_n_recs_for_size(
|
|||||||
{
|
{
|
||||||
page_t* page = buf_block_get_frame(block);
|
page_t* page = buf_block_get_frame(block);
|
||||||
ulint n_recs = 0;
|
ulint n_recs = 0;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets = offsets_;
|
rec_offs* offsets = offsets_;
|
||||||
rec_offs_init(offsets_);
|
rec_offs_init(offsets_);
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
ulint size = 0;
|
ulint size = 0;
|
||||||
|
@ -326,10 +326,10 @@ btr_pcur_restore_position_func(
|
|||||||
if (cursor->rel_pos == BTR_PCUR_ON) {
|
if (cursor->rel_pos == BTR_PCUR_ON) {
|
||||||
#ifdef UNIV_DEBUG
|
#ifdef UNIV_DEBUG
|
||||||
const rec_t* rec;
|
const rec_t* rec;
|
||||||
offset_t offsets1_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets1_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t offsets2_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets2_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets1 = offsets1_;
|
rec_offs* offsets1 = offsets1_;
|
||||||
offset_t* offsets2 = offsets2_;
|
rec_offs* offsets2 = offsets2_;
|
||||||
rec = btr_pcur_get_rec(cursor);
|
rec = btr_pcur_get_rec(cursor);
|
||||||
|
|
||||||
rec_offs_init(offsets1_);
|
rec_offs_init(offsets1_);
|
||||||
@ -399,7 +399,7 @@ btr_pcur_restore_position_func(
|
|||||||
ut_ad(cursor->rel_pos == BTR_PCUR_ON
|
ut_ad(cursor->rel_pos == BTR_PCUR_ON
|
||||||
|| cursor->rel_pos == BTR_PCUR_BEFORE
|
|| cursor->rel_pos == BTR_PCUR_BEFORE
|
||||||
|| cursor->rel_pos == BTR_PCUR_AFTER);
|
|| cursor->rel_pos == BTR_PCUR_AFTER);
|
||||||
offset_t offsets[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets[REC_OFFS_NORMAL_SIZE];
|
||||||
rec_offs_init(offsets);
|
rec_offs_init(offsets);
|
||||||
if (cursor->rel_pos == BTR_PCUR_ON
|
if (cursor->rel_pos == BTR_PCUR_ON
|
||||||
&& btr_pcur_is_on_user_rec(cursor)
|
&& btr_pcur_is_on_user_rec(cursor)
|
||||||
|
@ -478,7 +478,7 @@ btr_pessimistic_scrub(
|
|||||||
/* arguments to btr_page_split_and_insert */
|
/* arguments to btr_page_split_and_insert */
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
dtuple_t* entry = NULL;
|
dtuple_t* entry = NULL;
|
||||||
offset_t* offsets = NULL;
|
rec_offs* offsets = NULL;
|
||||||
ulint n_ext = 0;
|
ulint n_ext = 0;
|
||||||
ulint flags = BTR_MODIFY_TREE;
|
ulint flags = BTR_MODIFY_TREE;
|
||||||
|
|
||||||
|
@ -97,7 +97,7 @@ static inline
|
|||||||
ulint
|
ulint
|
||||||
rec_fold(
|
rec_fold(
|
||||||
const rec_t* rec,
|
const rec_t* rec,
|
||||||
const offset_t* offsets,
|
const rec_offs* offsets,
|
||||||
ulint n_fields,
|
ulint n_fields,
|
||||||
ulint n_bytes,
|
ulint n_bytes,
|
||||||
index_id_t tree_id)
|
index_id_t tree_id)
|
||||||
@ -669,7 +669,7 @@ btr_search_update_hash_ref(
|
|||||||
&& (block->curr_n_bytes == info->n_bytes)
|
&& (block->curr_n_bytes == info->n_bytes)
|
||||||
&& (block->curr_left_side == info->left_side)) {
|
&& (block->curr_left_side == info->left_side)) {
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
rec_offs_init(offsets_);
|
rec_offs_init(offsets_);
|
||||||
|
|
||||||
rec = btr_cur_get_rec(cursor);
|
rec = btr_cur_get_rec(cursor);
|
||||||
@ -722,8 +722,8 @@ btr_search_check_guess(
|
|||||||
ulint match;
|
ulint match;
|
||||||
int cmp;
|
int cmp;
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets = offsets_;
|
rec_offs* offsets = offsets_;
|
||||||
ibool success = FALSE;
|
ibool success = FALSE;
|
||||||
rec_offs_init(offsets_);
|
rec_offs_init(offsets_);
|
||||||
|
|
||||||
@ -1082,7 +1082,7 @@ void btr_search_drop_page_hash_index(buf_block_t* block)
|
|||||||
ulint i;
|
ulint i;
|
||||||
mem_heap_t* heap;
|
mem_heap_t* heap;
|
||||||
const dict_index_t* index;
|
const dict_index_t* index;
|
||||||
offset_t* offsets;
|
rec_offs* offsets;
|
||||||
rw_lock_t* latch;
|
rw_lock_t* latch;
|
||||||
btr_search_t* info;
|
btr_search_t* info;
|
||||||
|
|
||||||
@ -1337,8 +1337,8 @@ btr_search_build_page_hash_index(
|
|||||||
const rec_t** recs;
|
const rec_t** recs;
|
||||||
ulint i;
|
ulint i;
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets = offsets_;
|
rec_offs* offsets = offsets_;
|
||||||
|
|
||||||
#ifdef MYSQL_INDEX_DISABLE_AHI
|
#ifdef MYSQL_INDEX_DISABLE_AHI
|
||||||
if (index->disable_ahi) return;
|
if (index->disable_ahi) return;
|
||||||
@ -1642,7 +1642,7 @@ void btr_search_update_hash_on_delete(btr_cur_t* cursor)
|
|||||||
const rec_t* rec;
|
const rec_t* rec;
|
||||||
ulint fold;
|
ulint fold;
|
||||||
dict_index_t* index;
|
dict_index_t* index;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
rec_offs_init(offsets_);
|
rec_offs_init(offsets_);
|
||||||
|
|
||||||
@ -1797,8 +1797,8 @@ btr_search_update_hash_on_insert(btr_cur_t* cursor, rw_lock_t* ahi_latch)
|
|||||||
ibool left_side;
|
ibool left_side;
|
||||||
bool locked = false;
|
bool locked = false;
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets = offsets_;
|
rec_offs* offsets = offsets_;
|
||||||
rec_offs_init(offsets_);
|
rec_offs_init(offsets_);
|
||||||
|
|
||||||
ut_ad(ahi_latch == btr_get_search_latch(cursor->index));
|
ut_ad(ahi_latch == btr_get_search_latch(cursor->index));
|
||||||
@ -1955,8 +1955,8 @@ btr_search_hash_table_validate(ulint hash_table_id)
|
|||||||
ulint i;
|
ulint i;
|
||||||
ulint cell_count;
|
ulint cell_count;
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets = offsets_;
|
rec_offs* offsets = offsets_;
|
||||||
|
|
||||||
if (!btr_search_enabled) {
|
if (!btr_search_enabled) {
|
||||||
return(TRUE);
|
return(TRUE);
|
||||||
|
@ -1270,11 +1270,12 @@ buf_madvise_do_dump()
|
|||||||
|
|
||||||
/* mirrors allocation in log_t::create() */
|
/* mirrors allocation in log_t::create() */
|
||||||
if (log_sys.buf) {
|
if (log_sys.buf) {
|
||||||
ret+= madvise(log_sys.first_in_use
|
ret += madvise(log_sys.buf,
|
||||||
? log_sys.buf
|
srv_log_buffer_size,
|
||||||
: log_sys.buf - srv_log_buffer_size,
|
MADV_DODUMP);
|
||||||
srv_log_buffer_size * 2,
|
ret += madvise(log_sys.flush_buf,
|
||||||
MADV_DODUMP);
|
srv_log_buffer_size,
|
||||||
|
MADV_DODUMP);
|
||||||
}
|
}
|
||||||
/* mirrors recv_sys_t::create() */
|
/* mirrors recv_sys_t::create() */
|
||||||
if (recv_sys.buf)
|
if (recv_sys.buf)
|
||||||
|
@ -602,17 +602,15 @@ dict_mem_table_col_rename_low(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dict_index_t* new_index = dict_foreign_find_index(
|
/* New index can be null if InnoDB already dropped
|
||||||
|
the foreign index when FOREIGN_KEY_CHECKS is
|
||||||
|
disabled */
|
||||||
|
foreign->foreign_index = dict_foreign_find_index(
|
||||||
foreign->foreign_table, NULL,
|
foreign->foreign_table, NULL,
|
||||||
foreign->foreign_col_names,
|
foreign->foreign_col_names,
|
||||||
foreign->n_fields, NULL, true, false,
|
foreign->n_fields, NULL, true, false,
|
||||||
NULL, NULL, NULL);
|
NULL, NULL, NULL);
|
||||||
|
|
||||||
/* New index can be null if InnoDB already dropped
|
|
||||||
the foreign index when FOREIGN_KEY_CHECKS is
|
|
||||||
disabled */
|
|
||||||
foreign->foreign_index = new_index;
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
for (unsigned f = 0; f < foreign->n_fields; f++) {
|
for (unsigned f = 0; f < foreign->n_fields; f++) {
|
||||||
@ -634,7 +632,41 @@ dict_mem_table_col_rename_low(
|
|||||||
|
|
||||||
foreign = *it;
|
foreign = *it;
|
||||||
|
|
||||||
ut_ad(foreign->referenced_index != NULL);
|
if (!foreign->referenced_index) {
|
||||||
|
/* Referenced index could have been dropped
|
||||||
|
when foreign_key_checks is disabled. In that case,
|
||||||
|
rename the corresponding referenced_col_names and
|
||||||
|
find the equivalent referenced index also */
|
||||||
|
for (unsigned f = 0; f < foreign->n_fields; f++) {
|
||||||
|
|
||||||
|
const char*& rc =
|
||||||
|
foreign->referenced_col_names[f];
|
||||||
|
if (strcmp(rc, from)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (to_len <= strlen(rc)) {
|
||||||
|
memcpy(const_cast<char*>(rc), to,
|
||||||
|
to_len + 1);
|
||||||
|
} else {
|
||||||
|
rc = static_cast<char*>(
|
||||||
|
mem_heap_dup(
|
||||||
|
foreign->heap,
|
||||||
|
to, to_len + 1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* New index can be null if InnoDB already dropped
|
||||||
|
the referenced index when FOREIGN_KEY_CHECKS is
|
||||||
|
disabled */
|
||||||
|
foreign->referenced_index = dict_foreign_find_index(
|
||||||
|
foreign->referenced_table, NULL,
|
||||||
|
foreign->referenced_col_names,
|
||||||
|
foreign->n_fields, NULL, true, false,
|
||||||
|
NULL, NULL, NULL);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
for (unsigned f = 0; f < foreign->n_fields; f++) {
|
for (unsigned f = 0; f < foreign->n_fields; f++) {
|
||||||
/* foreign->referenced_col_names[] need to be
|
/* foreign->referenced_col_names[] need to be
|
||||||
@ -1281,7 +1313,7 @@ bool dict_table_t::deserialise_columns(const byte* metadata, ulint len)
|
|||||||
bool
|
bool
|
||||||
dict_index_t::vers_history_row(
|
dict_index_t::vers_history_row(
|
||||||
const rec_t* rec,
|
const rec_t* rec,
|
||||||
const offset_t* offsets)
|
const rec_offs* offsets)
|
||||||
{
|
{
|
||||||
ut_ad(is_primary());
|
ut_ad(is_primary());
|
||||||
|
|
||||||
@ -1312,8 +1344,8 @@ dict_index_t::vers_history_row(
|
|||||||
bool error = false;
|
bool error = false;
|
||||||
mem_heap_t* heap = NULL;
|
mem_heap_t* heap = NULL;
|
||||||
dict_index_t* clust_index = NULL;
|
dict_index_t* clust_index = NULL;
|
||||||
offset_t offsets_[REC_OFFS_NORMAL_SIZE];
|
rec_offs offsets_[REC_OFFS_NORMAL_SIZE];
|
||||||
offset_t* offsets = offsets_;
|
rec_offs* offsets = offsets_;
|
||||||
rec_offs_init(offsets_);
|
rec_offs_init(offsets_);
|
||||||
|
|
||||||
mtr_t mtr;
|
mtr_t mtr;
|
||||||
|
@ -1010,8 +1010,8 @@ dict_stats_analyze_index_level(
|
|||||||
bool prev_rec_is_copied;
|
bool prev_rec_is_copied;
|
||||||
byte* prev_rec_buf = NULL;
|
byte* prev_rec_buf = NULL;
|
||||||
ulint prev_rec_buf_size = 0;
|
ulint prev_rec_buf_size = 0;
|
||||||
offset_t* rec_offsets;
|
rec_offs* rec_offsets;
|
||||||
offset_t* prev_rec_offsets;
|
rec_offs* prev_rec_offsets;
|
||||||
ulint i;
|
ulint i;
|
||||||
|
|
||||||
DEBUG_PRINTF(" %s(table=%s, index=%s, level=" ULINTPF ")\n",
|
DEBUG_PRINTF(" %s(table=%s, index=%s, level=" ULINTPF ")\n",
|
||||||
@ -1032,9 +1032,9 @@ dict_stats_analyze_index_level(
|
|||||||
i = (REC_OFFS_HEADER_SIZE + 1 + 1) + n_uniq;
|
i = (REC_OFFS_HEADER_SIZE + 1 + 1) + n_uniq;
|
||||||
|
|
||||||
heap = mem_heap_create((2 * sizeof *rec_offsets) * i);
|
heap = mem_heap_create((2 * sizeof *rec_offsets) * i);
|
||||||
rec_offsets = static_cast<offset_t*>(
|
rec_offsets = static_cast<rec_offs*>(
|
||||||
mem_heap_alloc(heap, i * sizeof *rec_offsets));
|
mem_heap_alloc(heap, i * sizeof *rec_offsets));
|
||||||
prev_rec_offsets = static_cast<offset_t*>(
|
prev_rec_offsets = static_cast<rec_offs*>(
|
||||||
mem_heap_alloc(heap, i * sizeof *prev_rec_offsets));
|
mem_heap_alloc(heap, i * sizeof *prev_rec_offsets));
|
||||||
rec_offs_set_n_alloc(rec_offsets, i);
|
rec_offs_set_n_alloc(rec_offsets, i);
|
||||||
rec_offs_set_n_alloc(prev_rec_offsets, i);
|
rec_offs_set_n_alloc(prev_rec_offsets, i);
|
||||||
@ -1323,11 +1323,11 @@ to the number of externally stored pages which were encountered
|
|||||||
@return offsets1 or offsets2 (the offsets of *out_rec),
|
@return offsets1 or offsets2 (the offsets of *out_rec),
|
||||||
or NULL if the page is empty and does not contain user records. */
|
or NULL if the page is empty and does not contain user records. */
|
||||||
UNIV_INLINE
|
UNIV_INLINE
|
||||||
offset_t*
|
rec_offs*
|
||||||
dict_stats_scan_page(
|
dict_stats_scan_page(
|
||||||
const rec_t** out_rec,
|
const rec_t** out_rec,
|
||||||
offset_t* offsets1,
|
rec_offs* offsets1,
|
||||||
offset_t* offsets2,
|
rec_offs* offsets2,
|
||||||
const dict_index_t* index,
|
const dict_index_t* index,
|
||||||
const page_t* page,
|
const page_t* page,
|
||||||
ulint n_prefix,
|
ulint n_prefix,
|
||||||
@ -1335,8 +1335,8 @@ dict_stats_scan_page(
|
|||||||
ib_uint64_t* n_diff,
|
ib_uint64_t* n_diff,
|
||||||
ib_uint64_t* n_external_pages)
|
ib_uint64_t* n_external_pages)
|
||||||
{
|
{
|
||||||
offset_t* offsets_rec = offsets1;
|
rec_offs* offsets_rec = offsets1;
|
||||||
offset_t* offsets_next_rec = offsets2;
|
rec_offs* offsets_next_rec = offsets2;
|
||||||
const rec_t* rec;
|
const rec_t* rec;
|
||||||
const rec_t* next_rec;
|
const rec_t* next_rec;
|
||||||
/* A dummy heap, to be passed to rec_get_offsets().
|
/* A dummy heap, to be passed to rec_get_offsets().
|
||||||
@ -1449,9 +1449,9 @@ dict_stats_analyze_index_below_cur(
|
|||||||
const page_t* page;
|
const page_t* page;
|
||||||
mem_heap_t* heap;
|
mem_heap_t* heap;
|
||||||
const rec_t* rec;
|
const rec_t* rec;
|
||||||
offset_t* offsets1;
|
rec_offs* offsets1;
|
||||||
offset_t* offsets2;
|
rec_offs* offsets2;
|
||||||
offset_t* offsets_rec;
|
rec_offs* offsets_rec;
|
||||||
ulint size;
|
ulint size;
|
||||||
mtr_t mtr;
|
mtr_t mtr;
|
||||||
|
|
||||||
@ -1469,10 +1469,10 @@ dict_stats_analyze_index_below_cur(
|
|||||||
|
|
||||||
heap = mem_heap_create(size * (sizeof *offsets1 + sizeof *offsets2));
|
heap = mem_heap_create(size * (sizeof *offsets1 + sizeof *offsets2));
|
||||||
|
|
||||||
offsets1 = static_cast<offset_t*>(mem_heap_alloc(
|
offsets1 = static_cast<rec_offs*>(mem_heap_alloc(
|
||||||
heap, size * sizeof *offsets1));
|
heap, size * sizeof *offsets1));
|
||||||
|
|
||||||
offsets2 = static_cast<offset_t*>(mem_heap_alloc(
|
offsets2 = static_cast<rec_offs*>(mem_heap_alloc(
|
||||||
heap, size * sizeof *offsets2));
|
heap, size * sizeof *offsets2));
|
||||||
|
|
||||||
rec_offs_set_n_alloc(offsets1, size);
|
rec_offs_set_n_alloc(offsets1, size);
|
||||||
|
@ -3195,7 +3195,7 @@ fts_fetch_doc_from_rec(
|
|||||||
dict_index_t* clust_index, /*!< in: cluster index */
|
dict_index_t* clust_index, /*!< in: cluster index */
|
||||||
btr_pcur_t* pcur, /*!< in: cursor whose position
|
btr_pcur_t* pcur, /*!< in: cursor whose position
|
||||||
has been stored */
|
has been stored */
|
||||||
offset_t* offsets, /*!< in: offsets */
|
rec_offs* offsets, /*!< in: offsets */
|
||||||
fts_doc_t* doc) /*!< out: fts doc to hold parsed
|
fts_doc_t* doc) /*!< out: fts doc to hold parsed
|
||||||
documents */
|
documents */
|
||||||
{
|
{
|
||||||
@ -3469,7 +3469,7 @@ fts_add_doc_by_id(
|
|||||||
btr_pcur_t* doc_pcur;
|
btr_pcur_t* doc_pcur;
|
||||||
const rec_t* clust_rec;
|
const rec_t* clust_rec;
|
||||||
btr_pcur_t clust_pcur;
|
btr_pcur_t clust_pcur;
|
||||||
offset_t* offsets = NULL;
|
rec_offs* offsets = NULL;
|
||||||
ulint num_idx = ib_vector_size(cache->get_docs);
|
ulint num_idx = ib_vector_size(cache->get_docs);
|
||||||
|
|
||||||
rec = btr_pcur_get_rec(&pcur);
|
rec = btr_pcur_get_rec(&pcur);
|
||||||
@ -5146,7 +5146,7 @@ doc_id_t
|
|||||||
fts_get_doc_id_from_rec(
|
fts_get_doc_id_from_rec(
|
||||||
const rec_t* rec,
|
const rec_t* rec,
|
||||||
const dict_index_t* index,
|
const dict_index_t* index,
|
||||||
const offset_t* offsets)
|
const rec_offs* offsets)
|
||||||
{
|
{
|
||||||
ulint f = dict_col_get_index_pos(
|
ulint f = dict_col_get_index_pos(
|
||||||
&index->table->cols[index->table->fts->doc_col], index);
|
&index->table->cols[index->table->fts->doc_col], index);
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user