database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

after merge fixes

Browse Source 
include/my_tree.h:
  After merge fixes
mysql-test/r/create.result:
  After merge fixes
mysql-test/r/insert.result:
  After merge fixes
mysql-test/r/multi_update.result:
  After merge fixes
mysql-test/r/query_cache.result:
  After merge fixes
mysql-test/r/rpl_error_ignored_table.result:
  After merge fixes
mysql-test/r/rpl_optimize.result:
  After merge fixes
mysql-test/r/show_check.result:
  After merge fixes
mysql-test/t/insert.test:
  After merge fixes (Remove columns with space last)
mysql-test/t/multi_update.test:
  After merge fixes
mysql-test/t/show_check.test:
  After merge fixes
sql/field.cc:
  Remove compiler warnings
sql/sql_base.cc:
  Fix bug when table was refreshed
This commit is contained in:
unknown
2004-03-18 00:09:13 +02:00
parent 219bbd5232
commit 022c5241a9
14 changed files with 289 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/r/rpl_error_ignored_table.result
View File

@ -9,7 +9,7 @@ insert into t1 values (1),(1);
ERROR 23000: Duplicate entry '1' for key 1
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.000001 213 slave-relay-bin.000002 257 master-bin.000001 Yes Yes test.t1 0 0 213 257 None 0 No #
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 213 slave-relay-bin.000002 257 master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 213 257 None 0 No #
show tables like 't1';
Tables_in_test (t1)
drop table t1;
@ -26,15 +26,15 @@ select (@id := id) - id from t3;
0
kill @id;
drop table t2,t3;
Server shutdown in progress
ERROR 08S01: Server shutdown in progress
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use `test`; create table t1 (a int primary key)
master-bin.001 149 Query 1 149 use `test`; insert into t1 values (1),(1)
master-bin.001 213 Query 1 213 use `test`; drop table t1
master-bin.001 261 Query 1 261 use `test`; create table t2 (a int primary key)
master-bin.001 331 Query 1 331 use `test`; insert into t2 values(1)
master-bin.001 390 Query 1 390 use `test`; create table t3 (id int)
master-bin.001 449 Query 1 449 use `test`; insert into t3 values(connection_id())
master-bin.001 522 Query 1 522 use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10)
master-bin.001 613 Query 1 613 use `test`; drop table t2,t3
master-bin.000001 79 Query 1 79 use `test`; create table t1 (a int primary key)
master-bin.000001 149 Query 1 149 use `test`; insert into t1 values (1),(1)
master-bin.000001 213 Query 1 213 use `test`; drop table t1
master-bin.000001 261 Query 1 261 use `test`; create table t2 (a int primary key)
master-bin.000001 331 Query 1 331 use `test`; insert into t2 values(1)
master-bin.000001 390 Query 1 390 use `test`; create table t3 (id int)
master-bin.000001 449 Query 1 449 use `test`; insert into t3 values(connection_id())
master-bin.000001 522 Query 1 522 use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10)
master-bin.000001 613 Query 1 613 use `test`; drop table t2,t3