diff options
| author | jani@hynda.mysql.fi <> | 2007-08-21 19:03:28 +0300 |
|---|---|---|
| committer | jani@hynda.mysql.fi <> | 2007-08-21 19:03:28 +0300 |
| commit | 2fd7a743e42336c5158fc664f3a36ad1ed03ab1d (patch) | |
| tree | b11162ac1a6ea4a0f6b04559f50d2c6e44e51b38 /sql/sql_class.h | |
| parent | 76d173fa9df9384c40f4ef368977aeac6381c7b7 (diff) | |
| parent | 9b6b53f0d0d747e47a707d7c579b9e2b66020ed3 (diff) | |
| download | mariadb-git-2fd7a743e42336c5158fc664f3a36ad1ed03ab1d.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 55987ae8ad9..7117c08a7e1 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -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) { |