database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Code Activity

Merge trift2.:/MySQL/M51/target-5.1.22

Browse Source 
into  trift2.:/MySQL/M51/push-5.1

Includes manual merges.
This commit is contained in:
joerg@trift2.
2007-08-22 16:08:55 +02:00
parent 057c591e29 e33ff1c708
commit 20ce606797
147 changed files with 1451 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.h
View File

@@ -1317,10 +1317,10 @@ public:
mode, row-based binlogging is used for such cases where two
auto_increment columns are inserted.
*/
inline void record_first_successful_insert_id_in_cur_stmt(ulonglong id)
inline void record_first_successful_insert_id_in_cur_stmt(ulonglong id_arg)
{
if (first_successful_insert_id_in_cur_stmt == 0)
first_successful_insert_id_in_cur_stmt= id;
first_successful_insert_id_in_cur_stmt= id_arg;
}
inline ulonglong read_first_successful_insert_id_in_prev_stmt(void)
{