mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
f0148b21c3
up a couple of tests and adjusting the output of others. Exposes two bugs (9472 and 9508). BitKeeper/deleted/.del-drop_temp_table.result.es~bc4cfb1ee1257458: Delete: mysql-test/r/drop_temp_table.result.es BitKeeper/deleted/.del-insert_select.result.es~ae7eb9891d6c07c4: Delete: mysql-test/r/insert_select.result.es BitKeeper/deleted/.del-myisam-blob.result.es~d498dae7d9f1a6d4: Delete: mysql-test/r/myisam-blob.result.es BitKeeper/deleted/.del-packet.result.es~6e71c3b634806185: Delete: mysql-test/r/packet.result.es BitKeeper/deleted/.del-query_cache.result.es~246ad731a517d9ab: Delete: mysql-test/r/query_cache.result.es BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079: Delete: mysql-test/r/select.result.es BitKeeper/deleted/.del-type_blob.result.es~a4a0d4454b2d0218: Delete: mysql-test/r/type_blob.result.es BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04: Delete: mysql-test/r/type_float.result.es BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978: Delete: mysql-test/r/type_ranges.result.es mysql-test/mysql-test-run.sh: Remove support for special result extension -- bad idea! mysql-test/t/ps_1general.test: Explain --replace_result mysql-test/r/insert_select.result: Update results mysql-test/r/select.result: Update results mysql-test/r/type_blob.result: Update results mysql-test/r/type_float.result: Update results mysql-test/r/type_ranges.result: Update results mysql-test/t/drop_temp_table.test: Skip this test with embedded server mysql-test/t/insert_select.test: Move binlog test to new file mysql-test/t/select.test: Replace grants column from 'show full columns' mysql-test/t/type_blob.test: Replace grants column from 'show full columns' mysql-test/t/type_float.test: Replace grants column from 'show full columns' mysql-test/t/type_ranges.test: Replace grants column from 'show full columns' sql/sql_select.cc: Fix conditional around query_cache_abort() call.
34 lines
946 B
Text
34 lines
946 B
Text
# Embedded server doesn't support binlog
|
|
-- source include/not_embedded.inc
|
|
|
|
# Check if a partly-completed INSERT SELECT in a MyISAM table goes into the
|
|
# binlog
|
|
|
|
create table t1(a int, unique(a));
|
|
insert into t1 values(2);
|
|
create table t2(a int);
|
|
insert into t2 values(1),(2);
|
|
reset master;
|
|
--error 1062
|
|
insert into t1 select * from t2;
|
|
# The above should produce an error, but still be in the binlog;
|
|
# verify the binlog :
|
|
let $VERSION=`select version()`;
|
|
--replace_result $VERSION VERSION
|
|
show binlog events;
|
|
select * from t1;
|
|
drop table t1, t2;
|
|
|
|
# Verify that a partly-completed CREATE TABLE .. SELECT does not
|
|
# get into the binlog (Bug #6682)
|
|
create table t1(a int);
|
|
insert into t1 values(1),(1);
|
|
reset master;
|
|
--error 1062
|
|
create table t2(unique(a)) select a from t1;
|
|
# The above should produce an error, *and* not appear in the binlog
|
|
let $VERSION=`select version()`;
|
|
--replace_result $VERSION VERSION
|
|
show binlog events;
|
|
drop table t1;
|
|
|