diff options
| author | Michael Widenius <monty@mysql.com> | 2008-09-26 16:49:51 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-09-26 16:49:51 +0300 |
| commit | 2a9d33f07d18a7180cb02a4f74f42d208dc0e2c0 (patch) | |
| tree | 5e8b192260ab2104fe0d65cc6b0116e601c58263 /sql/stacktrace.h | |
| parent | be0b4042669d2d960294cfb823d61b833678beed (diff) | |
| download | mariadb-git-2a9d33f07d18a7180cb02a4f74f42d208dc0e2c0.tar.gz | |
Fixed for Bug #39248 Maria: INSERT ON DUPLICATE KEY UPDATE gives error if using a view
The bug was that prepared statements didn't downgrade TL_WRITE_CONCURRENT properly
mysql-test/r/maria.result:
Added test case
mysql-test/t/maria.test:
Added test case
sql/mysql_priv.h:
Make upgrade_lock_type() global
sql/sql_base.cc:
Fixed indentation
sql/sql_insert.cc:
Make upgrade_lock_type() global
sql/sql_prepare.cc:
Call upgrade_lock_type_for_insert() to get right lock to use
sql/sql_view.cc:
Indentation fix
Diffstat (limited to 'sql/stacktrace.h')
0 files changed, 0 insertions, 0 deletions