diff options
| author | unknown <acurtis@xiphis.org> | 2005-08-10 22:17:53 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-08-10 22:17:53 +0100 |
| commit | 5329be868e6dc44bd78e5b5540b37ee8cb204513 (patch) | |
| tree | e56c88e5c44e91416f40652b7af3a1165c35b4ba /innobase/btr | |
| parent | 42fec6b68be70f65553db40c853134bee5aa7eb6 (diff) | |
| parent | fdb4d307ab8c7639ced6e08c61528bfe81823fae (diff) | |
| download | mariadb-git-5329be868e6dc44bd78e5b5540b37ee8cb204513.tar.gz | |
Merge xiphis.org:/usr/home/antony/work2/p2-bug10109.3
into xiphis.org:/usr/home/antony/work2/p2-bug10109.4
mysql-test/t/insert_update.test:
Auto merged
mysql-test/r/insert_update.result:
Auto merged
sql/sql_class.h:
discard bug10109 changes from 4.1
sql/sql_insert.cc:
merge bug10109 from 4.1 to 5.0
sql/sql_parse.cc:
discard bug10109 changes from 4.1
Diffstat (limited to 'innobase/btr')
0 files changed, 0 insertions, 0 deletions