diff options
| author | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-03-31 12:38:20 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-03-31 12:38:20 +0200 |
| commit | 1139dde7ac855becc62099a6ae5f2f888436bd82 (patch) | |
| tree | be100a1c85263bae5a6b28463c3a341962a79347 /sql/sql_class.h | |
| parent | fd4dbbf5be93dd78562642f07102b4d16ed73f1d (diff) | |
| parent | f07077673cbc2cf38fc0cbb2e5cf068f609457ea (diff) | |
| download | mariadb-git-1139dde7ac855becc62099a6ae5f2f888436bd82.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
sql/field.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index d4868cc1934..66914bdf908 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1270,7 +1270,7 @@ public: return first_successful_insert_id_in_prev_stmt; } /* - Used by Intvar_log_event::exec_event() and by "SET INSERT_ID=#" + Used by Intvar_log_event::do_apply_event() and by "SET INSERT_ID=#" (mysqlbinlog). We'll soon add a variant which can take many intervals in argument. */ |