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

Indentation cleanups

Browse Source 
Remove wait_if_global_read_lock on commit as this can cause deadlocks


BUILD/FINISH.sh:
  Cleanup
BUILD/SETUP.sh:
  Cleanup
BUILD/compile-pentium-valgrind-max:
  Don't write message twice
mysql-test/r/innodb.result:
  Removed failure as this can cause deadlocks
mysql-test/r/rpl_max_relay_size.result:
  Make test repeatable
mysql-test/t/innodb.test:
  Removed failure as this can cause deadlocks
mysql-test/t/rpl_max_relay_size.test:
  Removed failure as this can cause deadlocks
sql/handler.cc:
  Remove wait_if_global_read_lock as this can cause deadlocks
sql/opt_range.cc:
  Indentation cleanup
sql/sql_db.cc:
  Comment cleanup
sql/sql_parse.cc:
  Comment cleanup
sql/sql_repl.cc:
  Indentation cleanup
sql/sql_select.cc:
  Indentation cleanup
This commit is contained in:
unknown
2003-10-08 21:50:05 +03:00
parent 44e3cbcfeb
commit d1d07c99d7
13 changed files with 40 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/innodb.result
View File

@ -256,7 +256,6 @@ start transaction;
insert into t1 values (4);
flush tables with read lock;
commit;
ERROR HY000: Can't execute the query because you have a conflicting read lock
unlock tables;
commit;
select * from t1;

4
mysql-test/r/rpl_max_relay_size.result
View File

@ -49,12 +49,12 @@ flush logs;
create table t1 (a int);
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 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
127.0.0.1 root MASTER_PORT 1 master-bin.000001 50535 slave-relay-bin.000009 62 master-bin.000001 Yes Yes 0 0 50535 62 None 0 No
127.0.0.1 root MASTER_PORT 1 master-bin.000001 50535 slave-relay-bin.000009 62 master-bin.000001 Yes Yes 0 0 50535 # None 0 No
flush logs;
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 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
127.0.0.1 root MASTER_PORT 1 master-bin.000001 50583 slave-relay-bin.000010 52 master-bin.000001 Yes Yes 0 0 50583 52 None 0 No
127.0.0.1 root MASTER_PORT 1 master-bin.000001 50583 slave-relay-bin.000010 52 master-bin.000001 Yes Yes 0 0 50583 # None 0 No
flush logs;
show master status;
File Position Binlog_do_db Binlog_ignore_db

4
mysql-test/t/innodb.test
View File

@ -141,7 +141,9 @@ create table t1 (n int not null primary key) type=innodb;
start transaction;
insert into t1 values (4);
flush tables with read lock;
--error 1223;
#
# Current code can't handle a read lock in middle of transaction
#--error 1223;
commit;
unlock tables;
commit;

2
mysql-test/t/rpl_max_relay_size.test
View File

@ -70,6 +70,7 @@ save_master_pos;
connection slave;
sync_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
--replace_column 22 #
show slave status;
# one more rotation, to be sure Relay_log_space is correctly updated
flush logs;
@ -79,6 +80,7 @@ save_master_pos;
connection slave;
sync_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
--replace_column 22 #
show slave status;
connection master;