mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
2901c3b8fa
Use server character set if --default-character-set is not used Added convert_string() for more efficient alloc+character-set convert of strings BitKeeper/deleted/.del-convert.result~a3b56e1db6f498e9: Delete: mysql-test/r/convert.result BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72: Delete: mysql-test/t/convert.test BitKeeper/deleted/.del-make_win_src_distribution.old~5c9ebdc4a852b43b: Delete: scripts/make_win_src_distribution.old client/mysql.cc: Use server character set if --default-character-set is not used client/mysqltest.c: Code cleanup (merge identical code) More debug messages heap/hp_create.c: After merge fix include/m_ctype.h: After merge fix include/my_global.h: Remove size_str (we already have size_s) include/mysql_com.h: After merge fix libmysql/libmysql.c: After merge fix libmysqld/Makefile.am: After merge fix mysql-test/r/auto_increment.result: After merge fix mysql-test/r/create.result: After merge fix mysql-test/r/ctype_latin1_de.result: After merge fix mysql-test/r/distinct.result: After merge fix mysql-test/r/drop.result: After merge fix mysql-test/r/fulltext.result: After merge fix mysql-test/r/func_gconcat.result: After merge fix mysql-test/r/func_str.result: After merge fix mysql-test/r/func_test.result: After merge fix mysql-test/r/grant.result: After merge fix mysql-test/r/group_by.result: After merge fix mysql-test/r/handler.result: After merge fix mysql-test/r/heap.result: After merge fix mysql-test/r/heap_btree.result: After merge fix mysql-test/r/heap_hash.result: After merge fix mysql-test/r/innodb.result: After merge fix mysql-test/r/insert.result: After merge fix mysql-test/r/insert_select.result: After merge fix mysql-test/r/join_outer.result: After merge fix mysql-test/r/key.result: After merge fix mysql-test/r/key_cache.result: After merge fix mysql-test/r/loaddata.result: After merge fix mysql-test/r/myisam.result: After merge fix mysql-test/r/null.result: After merge fix mysql-test/r/null_key.result: After merge fix mysql-test/r/order_by.result: After merge fix mysql-test/r/rpl_do_grant.result: After merge fix mysql-test/r/rpl_error_ignored_table.result: After merge fix mysql-test/r/rpl_ignore_grant.result: After merge fix mysql-test/r/rpl_loaddata.result: After merge fix mysql-test/r/rpl_log.result: After merge fix mysql-test/r/rpl_log_pos.result: After merge fix mysql-test/r/rpl_max_relay_size.result: After merge fix mysql-test/r/rpl_replicate_do.result: After merge fix mysql-test/r/rpl_reset_slave.result: After merge fix mysql-test/r/rpl_rotate_logs.result: After merge fix mysql-test/r/rpl_user_variables.result: After merge fix mysql-test/r/select.result: After merge fix mysql-test/r/select_safe.result: After merge fix mysql-test/r/subselect.result: After merge fix mysql-test/r/type_blob.result: After merge fix mysql-test/r/type_decimal.result: After merge fix mysql-test/r/type_float.result: After merge fix mysql-test/r/type_ranges.result: After merge fix mysql-test/r/type_time.result: After merge fix mysql-test/r/type_uint.result: After merge fix mysql-test/r/union.result: After merge fix mysql-test/r/warnings.result: After merge fix mysql-test/t/auto_increment.test: After merge fix mysql-test/t/case.test: After merge fix mysql-test/t/ctype_collate.test: After merge fix mysql-test/t/ctype_latin1_de.test: After merge fix mysql-test/t/drop.test: After merge fix mysql-test/t/func_in.test: After merge fix mysql-test/t/func_set.test: After merge fix mysql-test/t/func_str.test: After merge fix mysql-test/t/func_test.test: After merge fix mysql-test/t/grant.test: After merge fix mysql-test/t/group_by.test: After merge fix mysql-test/t/handler.test: After merge fix mysql-test/t/heap.test: After merge fix mysql-test/t/heap_btree.test: After merge fix mysql-test/t/heap_hash.test: After merge fix mysql-test/t/innodb.test: After merge fix mysql-test/t/insert_select.test: After merge fix mysql-test/t/key.test: After merge fix mysql-test/t/key_cache.test: After merge fix mysql-test/t/lock_tables_lost_commit-master.opt: After merge fix mysql-test/t/lock_tables_lost_commit.test: After merge fix mysql-test/t/myisam.test: After merge fix mysql-test/t/row.test: After merge fix mysql-test/t/subselect.test: After merge fix mysql-test/t/type_decimal.test: After merge fix mysql-test/t/type_ranges.test: After merge fix mysql-test/t/type_uint.test: After merge fix mysql-test/t/variables.test: After merge fix mysql-test/t/warnings.test: After merge fix scripts/make_win_src_distribution.sh: after merge fixes sql-common/client.c: After merge fix Change my_connect() to use poll() If character set is not given, use servers character set. sql/field.cc: After merge fix Don't give warnings when storing data in fields in optimizer. sql/ha_myisammrg.h: After merge fix sql/log.cc: After merge fix sql/log_event.cc: After merge fix sql/mysqld.cc: After merge fix sql/opt_range.cc: After merge fix sql/set_var.cc: Code cleanup Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps sql/set_var.h: Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps sql/slave.cc: After merge fix sql/sql_acl.cc: After merge fix Code cleanup sql/sql_class.cc: Added convert_string() for more efficient alloc+character-set convert of strings Add cached flags to avoid calling mysql_charset_same() during parsing. sql/sql_class.h: Added convert_string() for more efficient alloc+character-set convert of strings Add cached flags to avoid calling mysql_charset_same() during parsing. sql/sql_handler.cc: After merge fix sql/sql_lex.h: After merge fix sql/sql_parse.cc: Optimize and fix memory reference errors reported by valgrind sql/sql_repl.cc: After merge fix sql/sql_yacc.yy: After merge fix Avoid calling mysql_charset_same() when parsing identifiers strings/ctype-latin1.c: Port latin_de conversion code from 4.0
98 lines
4.9 KiB
Text
98 lines
4.9 KiB
Text
stop slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
reset master;
|
|
reset slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
start slave;
|
|
stop slave;
|
|
reset master;
|
|
reset slave;
|
|
reset master;
|
|
create table t1(n int not null auto_increment primary key);
|
|
insert into t1 values (NULL);
|
|
drop table t1;
|
|
create table t1 (word char(20) not null);
|
|
load data infile '../../std_data/words.dat' into table t1;
|
|
drop table t1;
|
|
show binlog events;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3
|
|
master-bin.000001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key)
|
|
master-bin.000001 172 Intvar 1 172 INSERT_ID=1
|
|
master-bin.000001 200 Query 1 200 use `test`; insert into t1 values (NULL)
|
|
master-bin.000001 263 Query 1 263 use `test`; drop table t1
|
|
master-bin.000001 311 Query 1 311 use `test`; create table t1 (word char(20) not null)
|
|
master-bin.000001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=581
|
|
master-bin.000001 1056 Exec_load 1 1056 ;file_id=1
|
|
master-bin.000001 1079 Query 1 1079 use `test`; drop table t1
|
|
show binlog events from 79 limit 1;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.000001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key)
|
|
show binlog events from 79 limit 2;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.000001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key)
|
|
master-bin.000001 172 Intvar 1 172 INSERT_ID=1
|
|
show binlog events from 79 limit 2,1;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.000001 200 Query 1 200 use `test`; insert into t1 values (NULL)
|
|
flush logs;
|
|
create table t5 (a int);
|
|
drop table t5;
|
|
start slave;
|
|
flush logs;
|
|
stop slave;
|
|
create table t1 (n int);
|
|
insert into t1 values (1);
|
|
drop table t1;
|
|
show binlog events;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3
|
|
master-bin.000001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key)
|
|
master-bin.000001 172 Intvar 1 172 INSERT_ID=1
|
|
master-bin.000001 200 Query 1 200 use `test`; insert into t1 values (NULL)
|
|
master-bin.000001 263 Query 1 263 use `test`; drop table t1
|
|
master-bin.000001 311 Query 1 311 use `test`; create table t1 (word char(20) not null)
|
|
master-bin.000001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=581
|
|
master-bin.000001 1056 Exec_load 1 1056 ;file_id=1
|
|
master-bin.000001 1079 Query 1 1079 use `test`; drop table t1
|
|
master-bin.000001 1127 Rotate 1 1127 master-bin.000002;pos=4
|
|
show binlog events in 'master-bin.000002';
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
master-bin.000002 4 Query 1 4 use `test`; create table t5 (a int)
|
|
master-bin.000002 62 Query 1 62 use `test`; drop table t5
|
|
master-bin.000002 110 Query 1 110 use `test`; create table t1 (n int)
|
|
master-bin.000002 168 Query 1 168 use `test`; insert into t1 values (1)
|
|
master-bin.000002 228 Query 1 228 use `test`; drop table t1
|
|
show binary logs;
|
|
Log_name
|
|
master-bin.000001
|
|
master-bin.000002
|
|
start slave;
|
|
show binary logs;
|
|
Log_name
|
|
slave-bin.000001
|
|
slave-bin.000002
|
|
show binlog events in 'slave-bin.000001' from 4;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
slave-bin.000001 4 Start 2 4 Server ver: VERSION, Binlog ver: 3
|
|
slave-bin.000001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key)
|
|
slave-bin.000001 172 Intvar 1 172 INSERT_ID=1
|
|
slave-bin.000001 200 Query 1 200 use `test`; insert into t1 values (NULL)
|
|
slave-bin.000001 263 Query 1 263 use `test`; drop table t1
|
|
slave-bin.000001 311 Query 1 311 use `test`; create table t1 (word char(20) not null)
|
|
slave-bin.000001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=581
|
|
slave-bin.000001 1065 Exec_load 1 1056 ;file_id=1
|
|
slave-bin.000001 1088 Query 1 1079 use `test`; drop table t1
|
|
slave-bin.000001 1136 Query 1 4 use `test`; create table t5 (a int)
|
|
slave-bin.000001 1194 Query 1 62 use `test`; drop table t5
|
|
slave-bin.000001 1242 Rotate 2 1242 slave-bin.000002;pos=4
|
|
show binlog events in 'slave-bin.000002' from 4;
|
|
Log_name Pos Event_type Server_id Orig_log_pos Info
|
|
slave-bin.000002 4 Query 1 110 use `test`; create table t1 (n int)
|
|
slave-bin.000002 62 Query 1 168 use `test`; insert into t1 values (1)
|
|
slave-bin.000002 122 Query 1 228 use `test`; drop table t1
|
|
show slave status;
|
|
Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Replicate_do_table Replicate_ignore_table Replicate_wild_do_table Replicate_wild_ignore_table Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
|
|
127.0.0.1 root MASTER_PORT 1 master-bin.000002 276 slave-relay-bin.000003 214 master-bin.000002 Yes Yes 0 0 276 214
|
|
show binlog events in 'slave-bin.000005' from 4;
|
|
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
|