mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 01:04:19 +01:00
33efc9677d
Fixed (together with Guilhem) bugs in mysqlbinlog regarding --offset Prefix addresses with 0x for easier comparisons of debug logs Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index This fix changed some 'index' queries to 'range' queries in the test suite Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause. This fix removed of a lot of 'Using where' notes in the test suite. Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS Give NOTE instead of WARNING for safe field-type conversions Makefile.am: Don't automaticly update files from bk client/mysqlbinlog.cc: Merge with 4.1 (+ apply bug fixes for --offset and --start-position) include/my_sys.h: Faster clear_alloc_root() mysql-test/r/bdb.result: Updated results after merge mysql-test/r/create.result: Updated results after merge mysql-test/r/func_group.result: Updated results after merge mysql-test/r/func_if.result: Updated results after merge mysql-test/r/heap_btree.result: Updated results after merge mysql-test/r/index_merge.result: Updated results after merge mysql-test/r/index_merge_ror.result: Updated results after merge mysql-test/r/innodb.result: Updated results after merge mysql-test/r/join_outer.result: Updated results after merge mysql-test/r/mysqlbinlog2.result: Updated results after merge mysql-test/r/negation_elimination.result: Updated results after merge mysql-test/r/null.result: Updated results after merge Added more tests mysql-test/r/null_key.result: Updated results after merge Added more tests mysql-test/r/order_by.result: Updated results after merge mysql-test/r/range.result: Updated results after merge Added more tests mysql-test/r/rpl_charset.result: Updated results after merge mysql-test/r/sp-error.result: Updated results after merge mysql-test/r/sp.result: Updated results after merge Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle mysql-test/r/type_blob.result: Updated results after merge (Some warnings are now notes) mysql-test/r/user_var.result: Updated results after merge Added more tests mysql-test/r/variables.result: Updated results after merge mysql-test/r/view.result: Updated results after merge mysql-test/t/mysqlbinlog2.test: Updated tests to use new positions mysql-test/t/null.test: More tests mysql-test/t/null_key.test: More tests mysql-test/t/range.test: More tests mysql-test/t/rpl_charset.test: Avoid big diffs in the future if tests changes mysql-test/t/sp-error.test: Updated error numbers mysql-test/t/sp-security.test: Updated error numbers mysql-test/t/sp.test: Updated results after merge Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle mysql-test/t/user_var.test: More tests mysql-test/t/view.test: Updated error numbers mysys/my_alloc.c: Write into debug log the address of the allocated area sql/ha_isam.cc: Prefix addresses with 0x for easier comparisons of debug logs sql/ha_myisam.cc: Prefix addresses with 0x for easier comparisons of debug logs sql/ha_ndbcluster.cc: Add missing enum to switch sql/handler.cc: remove compiler warning sql/item.cc: More debugging Simple cleanup sql/item.h: Move Item::cleanup() to item.cc sql/item_cmpfunc.cc: Fix arena code sql/item_subselect.cc: After merge fixes sql/item_subselect.h: After merge fixes sql/item_sum.cc: Updated comment sql/log_event.cc: Remove wrong test sql/mysql_priv.h: Indentation fixes sql/mysqld.cc: After merge fixes Added 0x to pointers in debug log sql/opt_range.cc: Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index This fix changed some 'index' queries to 'range' queries in the test suite sql/set_var.cc: Indentation fixes sql/sp_head.cc: Set state to INITIALIZED to make SP work with new arena code sql/sql_base.cc: After merge fixes sql/sql_class.cc: More debugging Use clear_alloc_root() instead of init_alloc_root() as the former is faster sql/sql_class.h: New method 'only_prepare()' sql/sql_lex.cc: After merge fixes sql/sql_lex.h: After merge fixes sql/sql_parse.cc: Fix for timezone tables. (The old way to add timezone tables to global list in 'create_total_list' doesn't work anymore) Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS sql/sql_prepare.cc: After merge fixes sql/sql_select.cc: Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause. This fix removed of a lot of 'Using where' notes in the test suite sql/sql_table.cc: Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS sql/sql_union.cc: After merge fix sql/sql_view.cc: After merge fix sql/table.cc: After merge fix sql/tztime.cc: Update timezone table handling to use new table lists structure sql/tztime.h: Update timezone table handling to use new table lists structure sql/unireg.cc: Use 0x before pointers
154 lines
4.7 KiB
Text
154 lines
4.7 KiB
Text
# Replication of character sets.
|
||
# This test will fail if the server/client does not support enough charsets.
|
||
|
||
# Remember that there currently exists
|
||
# Bug #2326: Charset of table is determined by charset of db only if "USE db;"
|
||
|
||
source include/master-slave.inc;
|
||
--disable_warnings
|
||
drop database if exists mysqltest2;
|
||
drop database if exists mysqltest3;
|
||
--enable_warnings
|
||
|
||
create database mysqltest2 character set latin2;
|
||
set @@character_set_server=latin5;
|
||
create database mysqltest3;
|
||
--disable_query_log
|
||
select "--- --master--" as "";
|
||
--enable_query_log
|
||
show create database mysqltest2;
|
||
show create database mysqltest3;
|
||
sync_slave_with_master;
|
||
--disable_query_log
|
||
select "--- --slave--" as "";
|
||
--enable_query_log
|
||
show create database mysqltest2;
|
||
show create database mysqltest3;
|
||
|
||
connection master;
|
||
set @@collation_server=armscii8_bin;
|
||
drop database mysqltest3;
|
||
create database mysqltest3;
|
||
--disable_query_log
|
||
select "--- --master--" as "";
|
||
--enable_query_log
|
||
show create database mysqltest3;
|
||
sync_slave_with_master;
|
||
--disable_query_log
|
||
select "--- --slave--" as "";
|
||
--enable_query_log
|
||
show create database mysqltest3;
|
||
|
||
connection master;
|
||
use mysqltest2;
|
||
create table t1 (a int auto_increment primary key, b varchar(100));
|
||
set character_set_client=cp850, collation_connection=latin2_croatian_ci;
|
||
insert into t1 (b) values(@@character_set_server);
|
||
insert into t1 (b) values(@@collation_server);
|
||
# character_set_database and collation_database are not tested as they
|
||
# are not replicated (Bar said that this variable may be removed shortly).
|
||
insert into t1 (b) values(@@character_set_client);
|
||
# collation_client does not exist
|
||
insert into t1 (b) values(@@character_set_connection);
|
||
insert into t1 (b) values(@@collation_connection);
|
||
--disable_query_log
|
||
select "--- --master--" as "";
|
||
--enable_query_log
|
||
select * from t1 order by a;
|
||
sync_slave_with_master;
|
||
--disable_query_log
|
||
select "--- --slave--" as "";
|
||
--enable_query_log
|
||
select * from mysqltest2.t1 order by a;
|
||
|
||
connection master;
|
||
set character_set_client=latin1, collation_connection=latin1_german1_ci;
|
||
truncate table t1;
|
||
insert into t1 (b) values(@@collation_connection);
|
||
insert into t1 (b) values(LEAST("M<>ller","Muffler"));
|
||
set collation_connection=latin1_german2_ci;
|
||
insert into t1 (b) values(@@collation_connection);
|
||
insert into t1 (b) values(LEAST("M<>ller","Muffler"));
|
||
--disable_query_log
|
||
select "--- --master--" as "";
|
||
--enable_query_log
|
||
select * from t1 order by a;
|
||
sync_slave_with_master;
|
||
--disable_query_log
|
||
select "--- --slave--" as "";
|
||
--enable_query_log
|
||
select * from mysqltest2.t1 order by a;
|
||
|
||
# See if SET ONE_SHOT gets into binlog when LOAD DATA
|
||
connection master;
|
||
load data infile '../../std_data/words.dat' into table t1 (b);
|
||
|
||
# See if user var is prefixed with collation in binlog and replicated well.
|
||
# Note: replication of user variables is broken as far as derivation is
|
||
# concerned. That's because when we store a user variable in the binlog,
|
||
# we lose its derivation. So later on the slave, it's impossible to
|
||
# know if the collation was explicit or not, so we use DERIVATION_NONE,
|
||
# which provokes error messages (like 'Illegal mix of collation') when
|
||
# we replay the master's INSERT/etc statements.
|
||
set @a= _cp850 'M<>ller' collate cp850_general_ci;
|
||
truncate table t1;
|
||
insert into t1 (b) values(collation(@a));
|
||
--disable_query_log
|
||
select "--- --master--" as "";
|
||
--enable_query_log
|
||
select * from t1 order by a;
|
||
sync_slave_with_master;
|
||
--disable_query_log
|
||
select "--- --slave--" as "";
|
||
--enable_query_log
|
||
select * from mysqltest2.t1 order by a;
|
||
|
||
connection master;
|
||
drop database mysqltest2;
|
||
drop database mysqltest3;
|
||
--replace_column 2 # 5 #
|
||
show binlog events from 95;
|
||
sync_slave_with_master;
|
||
|
||
# Check that we can't change global.collation_server
|
||
|
||
error 1105;
|
||
set global character_set_server=latin2;
|
||
connection master;
|
||
error 1105;
|
||
set global character_set_server=latin2;
|
||
|
||
# Check that SET ONE_SHOT is really one shot
|
||
|
||
set one_shot @@character_set_server=latin5;
|
||
set @@max_join_size=1000;
|
||
select @@character_set_server;
|
||
select @@character_set_server;
|
||
set @@character_set_server=latin5;
|
||
select @@character_set_server;
|
||
select @@character_set_server;
|
||
|
||
# ONE_SHOT on not charset/collation stuff is not allowed
|
||
error 1105;
|
||
set one_shot max_join_size=10;
|
||
|
||
# Test of wrong character set numbers;
|
||
error 1115;
|
||
set character_set_client=9999999;
|
||
error 1273;
|
||
set collation_server=9999998;
|
||
|
||
# This one was contributed by Sergey Petrunia (BUG#3943)
|
||
|
||
use test;
|
||
CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255));
|
||
SET CHARACTER_SET_CLIENT=koi8r,
|
||
CHARACTER_SET_CONNECTION=cp1251,
|
||
CHARACTER_SET_RESULTS=koi8r;
|
||
INSERT INTO t1 (c1, c2) VALUES ('<27><>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','<27><>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>');
|
||
select hex(c1), hex(c2) from t1;
|
||
sync_slave_with_master;
|
||
select hex(c1), hex(c2) from t1;
|
||
connection master;
|
||
drop table t1;
|
||
sync_slave_with_master;
|