mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
85a590a26c
Moved .progress files into the log directory Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23 Fixed some compiler warnings Fixed small memory leak in libmysql Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1 client/client_priv.h: Added OPT_DEBUG_INFO and OPT_COLUMN_TYPES client/mysql.cc: Split --debug-info into --debug-info and --column-type-info client/mysql_upgrade.c: Give only error info at end if using --debug-info client/mysqladmin.cc: Added --debug-info to detect memory leaks in mysqltest client/mysqlbinlog.cc: Added --debug-info to detect memory leaks in mysqltest client/mysqlcheck.c: Added --debug-info to detect memory leaks in mysqltest client/mysqlimport.c: Added --debug-info to detect memory leaks in mysqltest client/mysqlshow.c: Added --debug-info to detect memory leaks in mysqltest client/mysqltest.c: Added --debug-info to detect memory leaks in mysqltest Added option --logdir to force .progress files in a specific directory libmysql/libmysql.c: Fixed memory leak mysql-test/include/ndb_setup_slave.inc: Moved cluster tables under 'mysql' mysql-test/include/query_cache.inc: Added more tests for query cache mysql-test/lib/init_db.sql: Move cluster.binlog_index -> mysql.binlog_index mysql-test/lib/mtr_report.pl: Find memory leaks mysql-test/mysql-test-run-shell.sh: Added --debug-info to programs to detect memory leaks mysql-test/mysql-test-run.pl: Added --debug-info to programs to detect memory leaks Force log files to var/log cluster tables moved under 'mysql' mysql-test/r/cache_innodb.result: New query cache test with innodb mysql-test/r/connect.result: binlog_index is now in mysql mysql-test/r/drop.result: Removed 'cluster' database mysql-test/r/information_schema.result: Removed 'cluster' database mysql-test/r/mysqlcheck.result: cluster.binlog_index -> mysql.binlog_index mysql-test/r/ndb_binlog_basic.result: cluster.binlog_index -> mysql.binlog_index mysql-test/r/ndb_binlog_ddl_multi.result: cluster -> mysql mysql-test/r/ndb_binlog_discover.result: cluster -> mysql mysql-test/r/ndb_binlog_multi.result: cluster -> mysql mysql-test/r/ndb_restore_compat.result: cluster -> mysql mysql-test/r/ps_1general.result: Removed cluster database mysql-test/r/rpl_create_database.result: Removed cluster database mysql-test/r/rpl_load_from_master.result: Removed cluster database mysql-test/r/rpl_loaddata_m.result: Removed cluster database mysql-test/r/rpl_ndb_bank.result: cluster -> mysql mysql-test/r/rpl_ndb_dd_advance.result: cluster -> mysql mysql-test/r/rpl_ndb_dd_basic.result: cluster -> mysql mysql-test/r/rpl_ndb_idempotent.result: cluster -> mysql mysql-test/r/rpl_ndb_log.result: cluster -> mysql mysql-test/r/rpl_ndb_multi.result: cluster -> mysql mysql-test/r/rpl_ndb_sync.result: cluster -> mysql mysql-test/r/rpl_row_basic_11bugs.result: Removed cluster database mysql-test/r/rpl_truncate_7ndb.result: Position have changed mysql-test/r/rpl_truncate_7ndb_2.result: cluster -> mysql mysql-test/r/schema.result: Removed cluster database mysql-test/r/show_check.result: Removed cluster database mysql-test/r/system_mysql_db.result: binlog_index moved under mysql mysql-test/r/upgrade.result: More tests mysql-test/t/information_schema.test: cluster -> mysql mysql-test/t/mysqldump.test: More test to detect memory leaks mysql-test/t/ndb_binlog_basic.test: cluster -> mysql mysql-test/t/ndb_binlog_multi.test: cluster -> mysql mysql-test/t/ndb_restore_compat.test: cluster -> mysql mysql-test/t/rpl_ndb_bank.test: cluster -> mysql mysql-test/t/rpl_ndb_dd_advance.test: cluster -> mysql mysql-test/t/rpl_ndb_idempotent.test: cluster -> mysql mysql-test/t/rpl_ndb_multi.test: cluster -> mysql mysql-test/t/rpl_ndb_sync.test: cluster -> mysql mysql-test/t/system_mysql_db_fix.test: Drop also binlog_index mysql-test/t/upgrade.test: Check that tables created with 3.23 works mysys/my_error.c: Remove all registered errors (to avoid memory leaks) mysys/my_init.c: call my_error_unregister_all() to avoid some possible memory leaks mysys/mysys_priv.h: Added prototype scripts/mysql_create_system_tables.sh: cluster -> mysql scripts/mysql_fix_privilege_tables.sql: Changed -- to # Create binlog_index table if it dosesn't exist sql/field.cc: Made offset() inline sql/field.h: Changed prototype of offset() to not make it depending on TABLE structure sql/field_conv.cc: Removed some usage of current_thd sql/ha_ndbcluster_tables.h: cluster -> mysql sql/item_sum.cc: Usage of new 'offset' parameters sql/key.cc: Changed 'find_ref_key' to not be dependent on field->table (This fixed a crash when using a table created in MySQL 3.23) sql/mysql_priv.h: Changed find_ref_key() to not use field->table sql/mysqld.cc: Fix that plugin_init() works properly on bootstrap (Previously we got warnings from plugin_init) sql/sql_class.cc: new 'field->offset()' sql/sql_select.cc: New field->offset() sql/table.cc: We don't need field->table to be set in find_ref_key() or find_field() anymore. storage/archive/ha_archive.cc: New field->offset() storage/federated/ha_federated.cc: New field->offset() storage/innobase/handler/ha_innodb.cc: Fixed compiler warnings storage/myisam/ha_myisam.cc: Fixed compiler warnings (Wrong paramter to sprintf()) New field->offset() storage/myisam/ha_myisam.h: Fixed wrong type of table_flags storage/ndb/tools/restore/Restore.cpp: Fixed compiler warning mysql-test/r/1st.result: New BitKeeper file ``mysql-test/r/1st.result'' mysql-test/std_data/old_table-323.frm: New BitKeeper file ``mysql-test/std_data/old_table-323.frm'' mysql-test/t/1st.test: New BitKeeper file ``mysql-test/t/1st.test''
150 lines
7.2 KiB
Text
150 lines
7.2 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)ENGINE=NDB;
|
|
insert into t1 values (NULL);
|
|
drop table t1;
|
|
create table t1 (word char(20) not null)ENGINE=NDB;
|
|
load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;
|
|
select count(*) from t1;
|
|
count(*)
|
|
69
|
|
show binlog events;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
|
|
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
|
|
master-bin.000001 # Query 1 # BEGIN
|
|
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
|
|
master-bin.000001 # Table_map 1 # table_id: # (mysql.apply_status)
|
|
master-bin.000001 # Write_rows 1 # table_id: #
|
|
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
|
master-bin.000001 # Query 1 # COMMIT
|
|
master-bin.000001 # Query 1 # use `test`; drop table t1
|
|
master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=NDB
|
|
master-bin.000001 # Query 1 # BEGIN
|
|
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
|
|
master-bin.000001 # Table_map 1 # table_id: # (mysql.apply_status)
|
|
master-bin.000001 # Write_rows 1 # table_id: #
|
|
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
|
master-bin.000001 # Query 1 # COMMIT
|
|
show binlog events from 102 limit 1;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
|
|
show binlog events from 102 limit 2;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
|
|
master-bin.000001 # Query 1 # BEGIN
|
|
show binlog events from 102 limit 2,1;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
|
|
flush logs;
|
|
create table t3 (a int)ENGINE=NDB;
|
|
start slave;
|
|
|
|
let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;
|
|
|
|
--source include/wait_slave_status.inc
|
|
flush logs;
|
|
stop slave;
|
|
create table t2 (n int)ENGINE=NDB;
|
|
insert into t2 values (1);
|
|
show binlog events;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
|
|
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
|
|
master-bin.000001 # Query 1 # BEGIN
|
|
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
|
|
master-bin.000001 # Table_map 1 # table_id: # (mysql.apply_status)
|
|
master-bin.000001 # Write_rows 1 # table_id: #
|
|
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
|
master-bin.000001 # Query 1 # COMMIT
|
|
master-bin.000001 # Query 1 # use `test`; drop table t1
|
|
master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=NDB
|
|
master-bin.000001 # Query 1 # BEGIN
|
|
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
|
|
master-bin.000001 # Table_map 1 # table_id: # (mysql.apply_status)
|
|
master-bin.000001 # Write_rows 1 # table_id: #
|
|
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
|
master-bin.000001 # Query 1 # COMMIT
|
|
master-bin.000001 # Rotate 1 # master-bin.000002;pos=4
|
|
show binlog events in 'master-bin.000002';
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
|
|
master-bin.000002 # Query 1 # use `test`; create table t3 (a int)ENGINE=NDB
|
|
master-bin.000002 # Query 1 # use `test`; create table t2 (n int)ENGINE=NDB
|
|
master-bin.000002 # Query 1 # BEGIN
|
|
master-bin.000002 # Table_map 1 # table_id: # (test.t2)
|
|
master-bin.000002 # Table_map 1 # table_id: # (mysql.apply_status)
|
|
master-bin.000002 # Write_rows 1 # table_id: #
|
|
master-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F
|
|
master-bin.000002 # Query 1 # COMMIT
|
|
show binary logs;
|
|
Log_name File_size
|
|
master-bin.000001 1694
|
|
master-bin.000002 589
|
|
start slave;
|
|
show binary logs;
|
|
Log_name File_size
|
|
slave-bin.000001 1789
|
|
slave-bin.000002 198
|
|
show binlog events in 'slave-bin.000001' from 4;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
|
|
slave-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
|
|
slave-bin.000001 # Query 2 # BEGIN
|
|
slave-bin.000001 # Table_map 2 # table_id: # (test.t1)
|
|
slave-bin.000001 # Table_map 2 # table_id: # (mysql.apply_status)
|
|
slave-bin.000001 # Write_rows 2 # table_id: #
|
|
slave-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
|
|
slave-bin.000001 # Query 2 # COMMIT
|
|
slave-bin.000001 # Query 1 # use `test`; drop table t1
|
|
slave-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=NDB
|
|
slave-bin.000001 # Query 2 # BEGIN
|
|
slave-bin.000001 # Table_map 2 # table_id: # (test.t1)
|
|
slave-bin.000001 # Table_map 2 # table_id: # (mysql.apply_status)
|
|
slave-bin.000001 # Write_rows 2 # table_id: #
|
|
slave-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
|
|
slave-bin.000001 # Query 2 # COMMIT
|
|
slave-bin.000001 # Query 1 # use `test`; create table t3 (a int)ENGINE=NDB
|
|
slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4
|
|
show binlog events in 'slave-bin.000002' from 4;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
|
|
slave-bin.000002 # Query 1 # use `test`; create table t2 (n int)ENGINE=NDB
|
|
slave-bin.000002 # Query 2 # BEGIN
|
|
slave-bin.000002 # Table_map 2 # table_id: # (test.t2)
|
|
slave-bin.000002 # Table_map 2 # table_id: # (mysql.apply_status)
|
|
slave-bin.000002 # Write_rows 2 # table_id: #
|
|
slave-bin.000002 # Write_rows 2 # table_id: # flags: STMT_END_F
|
|
slave-bin.000002 # Query 2 # COMMIT
|
|
show slave status;
|
|
Slave_IO_State 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 Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
|
|
# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 589 # # master-bin.000002 Yes Yes # 0 0 589 # None 0 No #
|
|
show binlog events in 'slave-bin.000005' from 4;
|
|
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
|
|
DROP TABLE t1;
|
|
DROP TABLE t2;
|
|
DROP TABLE t3;
|
|
create table t1(a int auto_increment primary key, b int);
|
|
insert into t1 values (NULL, 1);
|
|
reset master;
|
|
set insert_id=5;
|
|
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
|
|
show binlog events;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
|
|
slave-bin.000001 # Table_map 2 # table_id: # (test.t1)
|
|
slave-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
|
|
select * from t1;
|
|
a b
|
|
1 1
|
|
5 1
|
|
6 1
|
|
drop table t1;
|