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

Merge branch '10.1' of github.com:MariaDB/server into 10.1

Browse Source 
Conflicts:
	sql/item_subselect.cc

Fixed also typo in comment
This commit is contained in:
Monty
2015-07-09 14:47:32 +03:00
parent a6c8014387 7780370343
commit 9bb8b74e99
113 changed files with 15585 additions and 1581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/rpl_injector.h
View File

@ -180,27 +180,6 @@ public:
*/
int use_table(server_id_type sid, table tbl);
/*
Add a 'write row' entry to the transaction.
*/
int write_row (server_id_type sid, table tbl,
MY_BITMAP const *cols, size_t colcnt,
record_type record);
/*
Add a 'delete row' entry to the transaction.
*/
int delete_row(server_id_type sid, table tbl,
MY_BITMAP const *cols, size_t colcnt,
record_type record);
/*
Add an 'update row' entry to the transaction.
*/
int update_row(server_id_type sid, table tbl,
MY_BITMAP const *cols, size_t colcnt,
record_type before, record_type after);
/*
Commit a transaction.