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

undo unneccessary change to ha_innodb.cc

Browse Source 
remove 'drop database' from new tests.


mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  remove "DROP DATABASE test"
mysql-test/suite/rpl/r/rpl_innodb_bug30888.result:
  remove "DROP DATABASE test"
mysql-test/suite/rpl/r/rpl_innodb_bug30919.result:
  remove "DROP DATABASE test"
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
  remove "DROP DATABASE test"
mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
  remove "DROP DATABASE test"
mysql-test/suite/rpl/t/rpl_innodb_bug30919.test:
  remove "DROP DATABASE test"
storage/innobase/handler/ha_innodb.cc:
  undo unneccessary edits.
This commit is contained in:
unknown
2007-09-12 13:35:39 -07:00
parent db1f9468d4
commit 23227604be
7 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
View File

@ -4,8 +4,6 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
DROP DATABASE IF EXISTS test;
CREATE DATABASE test;
use test; use test;
CREATE TABLE test.regular_tbl(id MEDIUMINT NOT NULL AUTO_INCREMENT, CREATE TABLE test.regular_tbl(id MEDIUMINT NOT NULL AUTO_INCREMENT,
dt TIMESTAMP, user CHAR(255), uuidf LONGBLOB, dt TIMESTAMP, user CHAR(255), uuidf LONGBLOB,
@ -123,9 +121,9 @@ Master_User root
Master_Port 12000 Master_Port 12000
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 945644 Read_Master_Log_Pos 945470
Relay_Log_File slave-relay-bin.000003 Relay_Log_File slave-relay-bin.000003
Relay_Log_Pos 945790 Relay_Log_Pos 945616
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
Slave_IO_Running Yes Slave_IO_Running Yes
Slave_SQL_Running Yes Slave_SQL_Running Yes
@ -138,8 +136,8 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 945644 Exec_Master_Log_Pos 945470
Relay_Log_Space 945945 Relay_Log_Space 945771
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
Until_Log_Pos 0 Until_Log_Pos 0

2
mysql-test/suite/rpl/r/rpl_innodb_bug30888.result
View File

@ -4,8 +4,6 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
DROP DATABASE IF EXISTS test;
CREATE DATABASE test;
use test; use test;
CREATE TABLE test.regular_tbl(id MEDIUMINT NOT NULL AUTO_INCREMENT, CREATE TABLE test.regular_tbl(id MEDIUMINT NOT NULL AUTO_INCREMENT,
dt TIMESTAMP, user CHAR(255), uuidf LONGBLOB, dt TIMESTAMP, user CHAR(255), uuidf LONGBLOB,

2
mysql-test/suite/rpl/r/rpl_innodb_bug30919.result
View File

@ -1,5 +1,3 @@
DROP DATABASE IF EXISTS test;
CREATE DATABASE test;
use test; use test;
CREATE TABLE test.part_tbl(id MEDIUMINT NOT NULL AUTO_INCREMENT, CREATE TABLE test.part_tbl(id MEDIUMINT NOT NULL AUTO_INCREMENT,
dt TIMESTAMP, user CHAR(255), uuidf LONGBLOB, dt TIMESTAMP, user CHAR(255), uuidf LONGBLOB,

8
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
View File

@ -7,12 +7,6 @@
let $engine_type= 'innodb'; let $engine_type= 'innodb';
###### CLEAN UP SECTION ##############
DROP DATABASE IF EXISTS test;
CREATE DATABASE test;
######## Creat Table Section ######### ######## Creat Table Section #########
use test; use test;
@ -145,6 +139,8 @@ SELECT count(*) "Slave norm" FROM test.regular_tbl;
SELECT count(*) "Slave bykey" FROM test.bykey_tbl; SELECT count(*) "Slave bykey" FROM test.bykey_tbl;
SELECT count(*) "Slave byrange" FROM test.byrange_tbl; SELECT count(*) "Slave byrange" FROM test.byrange_tbl;
###### CLEAN UP SECTION ##############
connection master; connection master;
DROP PROCEDURE test.proc_norm; DROP PROCEDURE test.proc_norm;
DROP PROCEDURE test.proc_bykey; DROP PROCEDURE test.proc_bykey;

8
mysql-test/suite/rpl/t/rpl_innodb_bug30888.test
View File

@ -8,12 +8,6 @@
#let $engine_type= 'myisam'; #let $engine_type= 'myisam';
let $engine_type= 'innodb'; let $engine_type= 'innodb';
###### CLEAN UP SECTION ##############
DROP DATABASE IF EXISTS test;
CREATE DATABASE test;
######## Creat Table Section ######### ######## Creat Table Section #########
use test; use test;
@ -61,6 +55,8 @@ CALL test.proc_norm();
--sync_slave_with_master --sync_slave_with_master
###### CLEAN UP SECTION ##############
connection master; connection master;
DROP PROCEDURE test.proc_norm; DROP PROCEDURE test.proc_norm;
DROP TABLE test.regular_tbl; DROP TABLE test.regular_tbl;

6
mysql-test/suite/rpl/t/rpl_innodb_bug30919.test
View File

@ -2,10 +2,6 @@
--vertical_results --vertical_results
let $engine_type= 'innodb'; let $engine_type= 'innodb';
###### CLEAN UP SECTION ##############
DROP DATABASE IF EXISTS test;
CREATE DATABASE test;
######## Creat Table Section ######### ######## Creat Table Section #########
use test; use test;
@ -64,6 +60,8 @@ CALL test.proc_part();
select count(*) as Part from test.part_tbl; select count(*) as Part from test.part_tbl;
###### CLEAN UP SECTION ##############
DROP PROCEDURE test.proc_part; DROP PROCEDURE test.proc_part;
DROP TABLE test.part_tbl; DROP TABLE test.part_tbl;

9
storage/innobase/handler/ha_innodb.cc
View File

@ -7130,7 +7130,6 @@ ha_innobase::innobase_read_and_init_auto_inc(
int mysql_error = 0; int mysql_error = 0;
dict_table_t* innodb_table = prebuilt->table; dict_table_t* innodb_table = prebuilt->table;
ibool trx_was_not_started = FALSE; ibool trx_was_not_started = FALSE;
ulint error;
ut_a(prebuilt); ut_a(prebuilt);
ut_a(prebuilt->table); ut_a(prebuilt->table);
@ -7151,11 +7150,7 @@ ha_innobase::innobase_read_and_init_auto_inc(
trx_search_latch_release_if_reserved(prebuilt->trx); trx_search_latch_release_if_reserved(prebuilt->trx);
error = innobase_autoinc_lock(); dict_table_autoinc_lock(prebuilt->table);
if (error != DB_SUCCESS) {
mysql_error = 1;
goto err;
}
auto_inc = dict_table_autoinc_read(prebuilt->table); auto_inc = dict_table_autoinc_read(prebuilt->table);
@ -7168,6 +7163,7 @@ ha_innobase::innobase_read_and_init_auto_inc(
if (auto_inc == 0) { if (auto_inc == 0) {
dict_index_t* index; dict_index_t* index;
ulint error;
const char* autoinc_col_name; const char* autoinc_col_name;
ut_a(!innodb_table->autoinc_inited); ut_a(!innodb_table->autoinc_inited);
@ -7195,7 +7191,6 @@ ha_innobase::innobase_read_and_init_auto_inc(
dict_table_autoinc_unlock(prebuilt->table); dict_table_autoinc_unlock(prebuilt->table);
err:
/* Since MySQL does not seem to call autocommit after SHOW TABLE /* Since MySQL does not seem to call autocommit after SHOW TABLE
STATUS (even if we would register the trx here), we commit our STATUS (even if we would register the trx here), we commit our
transaction here if it was started here. This is to eliminate a transaction here if it was started here. This is to eliminate a