diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-02 15:01:19 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-02 15:01:19 +0400 |
| commit | 43ed743350afd799d04b76ac26582e765f4cbbca (patch) | |
| tree | 0e2fdcdcda49fec88475e692d7b790d452c2f103 /storage | |
| parent | 6a698c3b3aec6c88cc4083a2b24ee64f6dc8f794 (diff) | |
| parent | be929087ec9a5b4e161591fcebab9687472779eb (diff) | |
| download | mariadb-git-43ed743350afd799d04b76ac26582e765f4cbbca.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
mysql-test/t/rpl_insert_id.test:
Use local.
sql/item_func.cc:
Use local.
sql/item_func.h:
Use local.
sql/log_event.cc:
SCCS merged
sql/set_var.cc:
Use local.
sql/sql_class.h:
Use local.
sql/sql_insert.cc:
Use local.
sql/sql_load.cc:
Use local.
sql/sql_parse.cc:
Use local.
sql/sql_select.cc:
Use local.
sql/sql_update.cc:
Use local.
mysql-test/r/rpl_insert_id.result:
Use local.
sql/sql_class.cc:
Manual merge. Add comment for THD::cleanup_after_query().
tests/mysql_client_test.c:
Manual merge. Add test case for bug#21726: Incorrect result with
multiple invocations of LAST_INSERT_ID.
Diffstat (limited to 'storage')
0 files changed, 0 insertions, 0 deletions