1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

after-merge fixes.

Browse Source 
mysql-test/r/rpl_log.result:
  after-merge fix.
sql/ha_archive.cc:
  after-merge fix.
sql/item_func.cc:
  after-merge fix.
sql/sql_class.cc:
  after-merge fix.
sql/sql_class.h:
  after-merge fix.
This commit is contained in:
unknown 2006-06-16 14:05:58 +05:00
parent 4a9985762e
commit dd285aac1b
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/rpl_log.result
View File

@ -107,11 +107,11 @@ reset master;
set insert_id=5; set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()); insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events; show binlog events;
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 4 Start 2 4 Server ver: VERSION, Binlog ver: 3 slave-bin.000001 4 Format_desc 2 98 Server ver: VERSION, Binlog ver: 4
slave-bin.000001 79 Intvar 2 79 LAST_INSERT_ID=1 slave-bin.000001 98 Intvar 2 126 LAST_INSERT_ID=1
slave-bin.000001 107 Intvar 2 107 INSERT_ID=5 slave-bin.000001 126 Intvar 2 154 INSERT_ID=5
slave-bin.000001 135 Query 2 135 use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id()) slave-bin.000001 154 Query 2 289 use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id())
select * from t1; select * from t1;
a b a b
1 1 1 1

2
sql/ha_archive.cc
View File

@ -1131,7 +1131,7 @@ int ha_archive::end_bulk_insert()
int ha_archive::delete_all_rows() int ha_archive::delete_all_rows()
{ {
DBUG_ENTER("ha_archive::delete_all_rows"); DBUG_ENTER("ha_archive::delete_all_rows");
DBUG_RETURN(0); DBUG_RETURN(HA_ERR_WRONG_COMMAND);
} }
/* /*

2
sql/item_func.cc
View File

@ -3296,7 +3296,7 @@ longlong Item_func_last_insert_id::val_int()
return value; // Avoid side effect of insert_id() return value; // Avoid side effect of insert_id()
} }
thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT); thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
return thd->insert_id(); return thd->last_insert_id_used ? thd->current_insert_id : thd->insert_id();
} }
/* This function is just used to test speed of different functions */ /* This function is just used to test speed of different functions */

4
sql/sql_class.cc
View File

@ -2050,7 +2050,9 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup,
backup->enable_slow_log= enable_slow_log; backup->enable_slow_log= enable_slow_log;
backup->last_insert_id= last_insert_id; backup->last_insert_id= last_insert_id;
backup->next_insert_id= next_insert_id; backup->next_insert_id= next_insert_id;
backup->current_insert_id= current_insert_id;
backup->insert_id_used= insert_id_used; backup->insert_id_used= insert_id_used;
backup->last_insert_id_used= last_insert_id_used;
backup->clear_next_insert_id= clear_next_insert_id; backup->clear_next_insert_id= clear_next_insert_id;
backup->limit_found_rows= limit_found_rows; backup->limit_found_rows= limit_found_rows;
backup->examined_row_count= examined_row_count; backup->examined_row_count= examined_row_count;
@ -2099,7 +2101,9 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup)
enable_slow_log= backup->enable_slow_log; enable_slow_log= backup->enable_slow_log;
last_insert_id= backup->last_insert_id; last_insert_id= backup->last_insert_id;
next_insert_id= backup->next_insert_id; next_insert_id= backup->next_insert_id;
current_insert_id= backup->current_insert_id;
insert_id_used= backup->insert_id_used; insert_id_used= backup->insert_id_used;
last_insert_id_used= backup->last_insert_id_used;
clear_next_insert_id= backup->clear_next_insert_id; clear_next_insert_id= backup->clear_next_insert_id;
limit_found_rows= backup->limit_found_rows; limit_found_rows= backup->limit_found_rows;
sent_row_count= backup->sent_row_count; sent_row_count= backup->sent_row_count;

3
sql/sql_class.h
View File

@ -1051,12 +1051,13 @@ class Sub_statement_state
{ {
public: public:
ulonglong options; ulonglong options;
ulonglong last_insert_id, next_insert_id; ulonglong last_insert_id, next_insert_id, current_insert_id;
ulonglong limit_found_rows; ulonglong limit_found_rows;
ha_rows cuted_fields, sent_row_count, examined_row_count; ha_rows cuted_fields, sent_row_count, examined_row_count;
ulong client_capabilities; ulong client_capabilities;
uint in_sub_stmt; uint in_sub_stmt;
bool enable_slow_log, insert_id_used, clear_next_insert_id; bool enable_slow_log, insert_id_used, clear_next_insert_id;
bool last_insert_id_used;
my_bool no_send_ok; my_bool no_send_ok;
SAVEPOINT *savepoints; SAVEPOINT *savepoints;
}; };