Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
170bec36
Commit
170bec36
authored
Jun 12, 2018
by
Vicențiu Ciorbaru
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '5.5' into 10.0
parents
6b8d34fe
ca733d03
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
39 additions
and
15 deletions
+39
-15
client/mysqltest.cc
client/mysqltest.cc
+1
-0
mysql-test/r/information_schema.result
mysql-test/r/information_schema.result
+1
-1
mysql-test/r/lock.result
mysql-test/r/lock.result
+1
-1
mysql-test/suite/federated/have_federatedx.inc
mysql-test/suite/federated/have_federatedx.inc
+1
-1
mysql-test/suite/funcs_1/r/is_engines_archive.result
mysql-test/suite/funcs_1/r/is_engines_archive.result
+1
-1
mysql-test/suite/funcs_1/r/is_engines_csv.result
mysql-test/suite/funcs_1/r/is_engines_csv.result
+1
-1
mysql-test/suite/funcs_1/r/is_engines_federated.result
mysql-test/suite/funcs_1/r/is_engines_federated.result
+1
-1
mysql-test/suite/funcs_1/r/is_engines_myisam.result
mysql-test/suite/funcs_1/r/is_engines_myisam.result
+1
-1
mysql-test/suite/handler/handler.inc
mysql-test/suite/handler/handler.inc
+2
-0
mysql-test/suite/handler/interface.result
mysql-test/suite/handler/interface.result
+1
-1
mysql-test/suite/handler/interface.test
mysql-test/suite/handler/interface.test
+1
-1
mysql-test/suite/handler/ps.result
mysql-test/suite/handler/ps.result
+9
-0
mysql-test/suite/handler/ps.test
mysql-test/suite/handler/ps.test
+11
-0
mysql-test/t/lock.test
mysql-test/t/lock.test
+1
-1
sql/sql_handler.cc
sql/sql_handler.cc
+1
-0
storage/archive/ha_archive.cc
storage/archive/ha_archive.cc
+1
-1
storage/csv/ha_tina.cc
storage/csv/ha_tina.cc
+1
-1
storage/federated/ha_federated.cc
storage/federated/ha_federated.cc
+1
-1
storage/federatedx/ha_federatedx.cc
storage/federatedx/ha_federatedx.cc
+1
-1
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.cc
+1
-1
No files found.
client/mysqltest.cc
View file @
170bec36
...
@@ -8770,6 +8770,7 @@ void init_re(void)
...
@@ -8770,6 +8770,7 @@ void init_re(void)
"[[:space:]]*SELECT[[:space:]]|"
"[[:space:]]*SELECT[[:space:]]|"
"[[:space:]]*CREATE[[:space:]]+TABLE[[:space:]]|"
"[[:space:]]*CREATE[[:space:]]+TABLE[[:space:]]|"
"[[:space:]]*DO[[:space:]]|"
"[[:space:]]*DO[[:space:]]|"
"[[:space:]]*HANDLER[[:space:]]+.*[[:space:]]+READ[[:space:]]|"
"[[:space:]]*SET[[:space:]]+OPTION[[:space:]]|"
"[[:space:]]*SET[[:space:]]+OPTION[[:space:]]|"
"[[:space:]]*DELETE[[:space:]]+MULTI[[:space:]]|"
"[[:space:]]*DELETE[[:space:]]+MULTI[[:space:]]|"
"[[:space:]]*UPDATE[[:space:]]+MULTI[[:space:]]|"
"[[:space:]]*UPDATE[[:space:]]+MULTI[[:space:]]|"
...
...
mysql-test/r/information_schema.result
View file @
170bec36
...
@@ -1405,7 +1405,7 @@ USE test;
...
@@ -1405,7 +1405,7 @@ USE test;
End of 5.0 tests.
End of 5.0 tests.
select * from information_schema.engines WHERE ENGINE="MyISAM";
select * from information_schema.engines WHERE ENGINE="MyISAM";
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
MyISAM DEFAULT
MyISAM storage engine
NO NO NO
MyISAM DEFAULT
Non-transactional engine with good performance and small data footprint
NO NO NO
grant select on *.* to user3148@localhost;
grant select on *.* to user3148@localhost;
select user,db from information_schema.processlist;
select user,db from information_schema.processlist;
user db
user db
...
...
mysql-test/r/lock.result
View file @
170bec36
...
@@ -407,7 +407,7 @@ LOCK TABLE t1 WRITE;
...
@@ -407,7 +407,7 @@ LOCK TABLE t1 WRITE;
HANDLER t1 OPEN;
HANDLER t1 OPEN;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
HANDLER t1 READ FIRST;
HANDLER t1 READ FIRST;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
Got one of the listed errors
HANDLER t1 CLOSE;
HANDLER t1 CLOSE;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
UNLOCK TABLES;
UNLOCK TABLES;
...
...
mysql-test/suite/federated/have_federatedx.inc
View file @
170bec36
if
(
!
`SELECT count(*) FROM information_schema.plugins WHERE
if
(
!
`SELECT count(*) FROM information_schema.plugins WHERE
plugin_name = 'federated' AND plugin_status = 'active' AND
plugin_name = 'federated' AND plugin_status = 'active' AND
plugin_description LIKE '%
FederatedX
%'`
){
plugin_description LIKE '%
transactions
%'`
){
skip
Need
FederatedX
engine
;
skip
Need
FederatedX
engine
;
}
}
mysql-test/suite/funcs_1/r/is_engines_archive.result
View file @
170bec36
...
@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
...
@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
WHERE ENGINE = 'ARCHIVE';
WHERE ENGINE = 'ARCHIVE';
ENGINE ARCHIVE
ENGINE ARCHIVE
SUPPORT YES
SUPPORT YES
COMMENT
Archive storage engine
COMMENT
gzip-compresses tables for a low storage footprint
TRANSACTIONS NO
TRANSACTIONS NO
XA NO
XA NO
SAVEPOINTS NO
SAVEPOINTS NO
mysql-test/suite/funcs_1/r/is_engines_csv.result
View file @
170bec36
...
@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
...
@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
WHERE ENGINE = 'CSV';
WHERE ENGINE = 'CSV';
ENGINE CSV
ENGINE CSV
SUPPORT YES
SUPPORT YES
COMMENT
CSV storage engine
COMMENT
Stores tables as CSV files
TRANSACTIONS NO
TRANSACTIONS NO
XA NO
XA NO
SAVEPOINTS NO
SAVEPOINTS NO
mysql-test/suite/funcs_1/r/is_engines_federated.result
View file @
170bec36
...
@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
...
@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
WHERE ENGINE = 'FEDERATED';
WHERE ENGINE = 'FEDERATED';
ENGINE FEDERATED
ENGINE FEDERATED
SUPPORT YES
SUPPORT YES
COMMENT
FederatedX pluggable storage engin
e
COMMENT
Allows to access tables on other MariaDB servers, supports transactions and mor
e
TRANSACTIONS YES
TRANSACTIONS YES
XA NO
XA NO
SAVEPOINTS YES
SAVEPOINTS YES
mysql-test/suite/funcs_1/r/is_engines_myisam.result
View file @
170bec36
...
@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
...
@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
WHERE ENGINE = 'MyISAM';
WHERE ENGINE = 'MyISAM';
ENGINE MyISAM
ENGINE MyISAM
SUPPORT DEFAULT
SUPPORT DEFAULT
COMMENT
MyISAM storage engine
COMMENT
Non-transactional engine with good performance and small data footprint
TRANSACTIONS NO
TRANSACTIONS NO
XA NO
XA NO
SAVEPOINTS NO
SAVEPOINTS NO
mysql-test/suite/handler/handler.inc
View file @
170bec36
...
@@ -377,7 +377,9 @@ send optimize table t1;
...
@@ -377,7 +377,9 @@ send optimize table t1;
# client 1
# client 1
--
echo
proceed
with
the
normal
connection
--
echo
proceed
with
the
normal
connection
connection
default
;
connection
default
;
--
disable_ps_protocol
handler
t1
read
next
;
handler
t1
read
next
;
--
enable_ps_protocol
handler
t1
close
;
handler
t1
close
;
# client 2
# client 2
--
echo
read
the
result
from
the
other
connection
--
echo
read
the
result
from
the
other
connection
...
...
mysql-test/suite/handler/interface.result
View file @
170bec36
...
@@ -269,7 +269,7 @@ handler t1 open;
...
@@ -269,7 +269,7 @@ handler t1 open;
lock table t1 write;
lock table t1 write;
alter table t1 engine=csv;
alter table t1 engine=csv;
handler t1 read a next;
handler t1 read a next;
ERROR HY000: Storage engine CSV of the table `test`.`t1` doesn't have this option
Got one of the listed errors
handler t1 close;
handler t1 close;
unlock tables;
unlock tables;
drop table t1;
drop table t1;
...
...
mysql-test/suite/handler/interface.test
View file @
170bec36
...
@@ -326,7 +326,7 @@ let $wait_condition=
...
@@ -326,7 +326,7 @@ let $wait_condition=
info
=
"alter table t1 engine=csv"
;
info
=
"alter table t1 engine=csv"
;
--
source
include
/
wait_condition
.
inc
--
source
include
/
wait_condition
.
inc
connection
default
;
connection
default
;
--
error
ER_ILLEGAL_HA
--
error
ER_ILLEGAL_HA
,
ER_KEY_DOES_NOT_EXITS
handler
t1
read
a
next
;
handler
t1
read
a
next
;
handler
t1
close
;
handler
t1
close
;
connection
con1
;
connection
con1
;
...
...
mysql-test/suite/handler/ps.result
0 → 100644
View file @
170bec36
create table t1 (i int);
handler test.t1 open handler_a;
flush status;
handler handler_a read first;
i
show status like 'Com_stmt_prepare%';
Variable_name Value
Com_stmt_prepare OK
drop table t1;
mysql-test/suite/handler/ps.test
0 → 100644
View file @
170bec36
#
# MDEV-15729 Server crashes in Field::make_field upon HANDLER READ executed with PS protocol
#
create
table
t1
(
i
int
);
handler
test
.
t1
open
handler_a
;
flush
status
;
handler
handler_a
read
first
;
# handler...read must be prepared in --ps-protocol mode
--
replace_result
$PS_PROTOCOL
OK
show
status
like
'Com_stmt_prepare%'
;
drop
table
t1
;
mysql-test/t/lock.test
View file @
170bec36
...
@@ -481,7 +481,7 @@ LOCK TABLE t1 WRITE;
...
@@ -481,7 +481,7 @@ LOCK TABLE t1 WRITE;
--
echo
# HANDLER commands are not allowed in LOCK TABLES mode
--
echo
# HANDLER commands are not allowed in LOCK TABLES mode
--
error
ER_LOCK_OR_ACTIVE_TRANSACTION
--
error
ER_LOCK_OR_ACTIVE_TRANSACTION
HANDLER
t1
OPEN
;
HANDLER
t1
OPEN
;
--
error
ER_LOCK_OR_ACTIVE_TRANSACTION
--
error
ER_LOCK_OR_ACTIVE_TRANSACTION
,
ER_UNKNOWN_TABLE
HANDLER
t1
READ
FIRST
;
HANDLER
t1
READ
FIRST
;
--
error
ER_LOCK_OR_ACTIVE_TRANSACTION
--
error
ER_LOCK_OR_ACTIVE_TRANSACTION
HANDLER
t1
CLOSE
;
HANDLER
t1
CLOSE
;
...
...
sql/sql_handler.cc
View file @
170bec36
...
@@ -986,6 +986,7 @@ SQL_HANDLER *mysql_ha_read_prepare(THD *thd, TABLE_LIST *tables,
...
@@ -986,6 +986,7 @@ SQL_HANDLER *mysql_ha_read_prepare(THD *thd, TABLE_LIST *tables,
if
(
!
(
handler
=
mysql_ha_find_handler
(
thd
,
tables
->
alias
)))
if
(
!
(
handler
=
mysql_ha_find_handler
(
thd
,
tables
->
alias
)))
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
tables
->
table
=
handler
->
table
;
// This is used by fix_fields
tables
->
table
=
handler
->
table
;
// This is used by fix_fields
handler
->
table
->
pos_in_table_list
=
tables
;
if
(
mysql_ha_fix_cond_and_key
(
handler
,
mode
,
keyname
,
key_expr
,
cond
,
1
))
if
(
mysql_ha_fix_cond_and_key
(
handler
,
mode
,
keyname
,
key_expr
,
cond
,
1
))
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
DBUG_RETURN
(
handler
);
DBUG_RETURN
(
handler
);
...
...
storage/archive/ha_archive.cc
View file @
170bec36
...
@@ -1890,7 +1890,7 @@ maria_declare_plugin(archive)
...
@@ -1890,7 +1890,7 @@ maria_declare_plugin(archive)
&
archive_storage_engine
,
&
archive_storage_engine
,
"ARCHIVE"
,
"ARCHIVE"
,
"Brian Aker, MySQL AB"
,
"Brian Aker, MySQL AB"
,
"
Archive storage engine
"
,
"
gzip-compresses tables for a low storage footprint
"
,
PLUGIN_LICENSE_GPL
,
PLUGIN_LICENSE_GPL
,
archive_db_init
,
/* Plugin Init */
archive_db_init
,
/* Plugin Init */
NULL
,
/* Plugin Deinit */
NULL
,
/* Plugin Deinit */
...
...
storage/csv/ha_tina.cc
View file @
170bec36
...
@@ -1760,7 +1760,7 @@ maria_declare_plugin(csv)
...
@@ -1760,7 +1760,7 @@ maria_declare_plugin(csv)
&
csv_storage_engine
,
&
csv_storage_engine
,
"CSV"
,
"CSV"
,
"Brian Aker, MySQL AB"
,
"Brian Aker, MySQL AB"
,
"
CSV storage engine
"
,
"
Stores tables as CSV files
"
,
PLUGIN_LICENSE_GPL
,
PLUGIN_LICENSE_GPL
,
tina_init_func
,
/* Plugin Init */
tina_init_func
,
/* Plugin Init */
tina_done_func
,
/* Plugin Deinit */
tina_done_func
,
/* Plugin Deinit */
...
...
storage/federated/ha_federated.cc
View file @
170bec36
...
@@ -3474,7 +3474,7 @@ maria_declare_plugin(federated)
...
@@ -3474,7 +3474,7 @@ maria_declare_plugin(federated)
&
federated_storage_engine
,
&
federated_storage_engine
,
"FEDERATED"
,
"FEDERATED"
,
"Patrick Galbraith and Brian Aker, MySQL AB"
,
"Patrick Galbraith and Brian Aker, MySQL AB"
,
"
Federated MySQL storage engine
"
,
"
Allows to access tables on other MariaDB servers
"
,
PLUGIN_LICENSE_GPL
,
PLUGIN_LICENSE_GPL
,
federated_db_init
,
/* Plugin Init */
federated_db_init
,
/* Plugin Init */
federated_done
,
/* Plugin Deinit */
federated_done
,
/* Plugin Deinit */
...
...
storage/federatedx/ha_federatedx.cc
View file @
170bec36
...
@@ -3645,7 +3645,7 @@ maria_declare_plugin(federatedx)
...
@@ -3645,7 +3645,7 @@ maria_declare_plugin(federatedx)
&
federatedx_storage_engine
,
&
federatedx_storage_engine
,
"FEDERATED"
,
"FEDERATED"
,
"Patrick Galbraith"
,
"Patrick Galbraith"
,
"
FederatedX pluggable storage engin
e"
,
"
Allows to access tables on other MariaDB servers, supports transactions and mor
e"
,
PLUGIN_LICENSE_GPL
,
PLUGIN_LICENSE_GPL
,
federatedx_db_init
,
/* Plugin Init */
federatedx_db_init
,
/* Plugin Init */
federatedx_done
,
/* Plugin Deinit */
federatedx_done
,
/* Plugin Deinit */
...
...
storage/myisam/ha_myisam.cc
View file @
170bec36
...
@@ -2450,7 +2450,7 @@ maria_declare_plugin(myisam)
...
@@ -2450,7 +2450,7 @@ maria_declare_plugin(myisam)
&
myisam_storage_engine
,
&
myisam_storage_engine
,
"MyISAM"
,
"MyISAM"
,
"MySQL AB"
,
"MySQL AB"
,
"
MyISAM storage engine
"
,
"
Non-transactional engine with good performance and small data footprint
"
,
PLUGIN_LICENSE_GPL
,
PLUGIN_LICENSE_GPL
,
myisam_init
,
/* Plugin Init */
myisam_init
,
/* Plugin Init */
NULL
,
/* Plugin Deinit */
NULL
,
/* Plugin Deinit */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment