mirror of
https://github.com/MariaDB/server.git
synced 2025-10-24 07:13:33 +03:00
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''
84 lines
2.6 KiB
Plaintext
84 lines
2.6 KiB
Plaintext
-- source include/have_ndb.inc
|
|
-- source include/have_multi_ndb.inc
|
|
-- source include/have_binlog_format_row.inc
|
|
|
|
--disable_warnings
|
|
connection server2;
|
|
drop table if exists t1,t2,t3;
|
|
connection server1;
|
|
drop table if exists t1,t2,t3;
|
|
--enable_warnings
|
|
|
|
# Dummy table create/drop to avoid a race where table is created
|
|
# before event subscription is set up, causing test failure (BUG#20677).
|
|
connection server2;
|
|
CREATE TABLE t3 (dummy INT PRIMARY KEY) ENGINE = NDB;
|
|
connection server1;
|
|
DROP TABLE t3;
|
|
|
|
# reset for test
|
|
connection server1;
|
|
reset master;
|
|
connection server2;
|
|
reset master;
|
|
|
|
#
|
|
# basic test to see if one server sees the table from the other
|
|
# and sets up the replication correctly
|
|
#
|
|
|
|
# create table on the other server
|
|
connection server2;
|
|
CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB;
|
|
|
|
# insert something on server2
|
|
INSERT INTO t2 VALUES (1,1),(2,2);
|
|
# verify that we get the data in the binlog
|
|
--source include/show_binlog_events.inc
|
|
select * from t2 order by a;
|
|
--replace_column 1 <the_epoch>
|
|
SELECT @the_epoch:=epoch,inserts,updates,deletes,schemaops FROM
|
|
mysql.binlog_index ORDER BY epoch DESC LIMIT 1;
|
|
let $the_epoch= `SELECT @the_epoch`;
|
|
|
|
# see if we got something on server1
|
|
connection server1;
|
|
SELECT * FROM t2 ORDER BY a;
|
|
# doing drop table will ensure that all the events have been received
|
|
DROP TABLE t2;
|
|
# verify thar we have table and data in binlog
|
|
--source include/show_binlog_events.inc
|
|
--replace_result $the_epoch <the_epoch>
|
|
eval SELECT inserts,updates,deletes,schemaops FROM
|
|
mysql.binlog_index WHERE epoch=$the_epoch;
|
|
|
|
# reset for next test
|
|
connection server1;
|
|
reset master;
|
|
connection server2;
|
|
reset master;
|
|
|
|
# single schema ops will not show
|
|
connection server2;
|
|
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB;
|
|
INSERT INTO t1 VALUES (1),(2);
|
|
--source include/show_binlog_events.inc
|
|
--replace_column 1 <the_epoch2>
|
|
SELECT @the_epoch2:=epoch,inserts,updates,deletes,schemaops FROM
|
|
mysql.binlog_index ORDER BY epoch DESC LIMIT 1;
|
|
let $the_epoch2= `SELECT @the_epoch2`;
|
|
|
|
--replace_result $the_epoch <the_epoch> $the_epoch2 <the_epoch2>
|
|
eval SELECT inserts,updates,deletes,schemaops FROM
|
|
mysql.binlog_index WHERE epoch > $the_epoch AND epoch <= $the_epoch2;
|
|
|
|
# now see that we have the events on the other server
|
|
connection server2;
|
|
# doing drop table will ensure that all the events have been received
|
|
drop table t1;
|
|
# verify thar we have table and data in binlog
|
|
--source include/show_binlog_events.inc
|
|
--replace_result $the_epoch <the_epoch> $the_epoch2 <the_epoch2>
|
|
eval SELECT inserts,updates,deletes,schemaops FROM
|
|
mysql.binlog_index WHERE epoch > $the_epoch AND epoch <= $the_epoch2;
|