Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
e01f6c89
Commit
e01f6c89
authored
Jan 14, 2009
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Plain Diff
merged
parents
bdd170c5
7dc83c50
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
52 additions
and
22 deletions
+52
-22
mysql-test/r/delayed.result
mysql-test/r/delayed.result
+5
-1
mysql-test/suite/maria/r/maria.result
mysql-test/suite/maria/r/maria.result
+2
-0
mysql-test/suite/maria/t/maria.test
mysql-test/suite/maria/t/maria.test
+2
-0
mysql-test/t/delayed.test
mysql-test/t/delayed.test
+5
-1
sql/sql_base.cc
sql/sql_base.cc
+4
-1
sql/sql_insert.cc
sql/sql_insert.cc
+32
-18
storage/maria/ma_blockrec.c
storage/maria/ma_blockrec.c
+2
-1
No files found.
mysql-test/r/delayed.result
View file @
e01f6c89
...
...
@@ -251,8 +251,12 @@ HEX(a)
1
DROP TABLE t1;
CREATE TABLE t1 (a INT);
INSERT DELAYED INTO t1 SET b= b();
INSERT DELAYED INTO t1 SET a= b();
ERROR 42000: FUNCTION test.b does not exist
INSERT DELAYED INTO t1 SET b= 1;
ERROR 42S22: Unknown column 'b' in 'field list'
INSERT DELAYED INTO t1 SET b= b();
ERROR 42000: FUNCTION test.b does not exist
DROP TABLE t1;
End of 5.0 tests
DROP TABLE IF EXISTS t1,t2;
...
...
mysql-test/suite/maria/r/maria.result
View file @
e01f6c89
...
...
@@ -2568,7 +2568,9 @@ create table t2 (f3 int, f4 int) engine=maria;
create view v1 as select * from t1, t2 where f1= f3;
insert into t1 values (1,11), (2,22);
insert into v1 (f1) values (3) on duplicate key update f1= f3 + 10;
ERROR HY000: Can not modify more than one base table through a join view 'test.v1'
insert into v1 (f1) values (3) on duplicate key update f1= f3 + 10;
ERROR HY000: Can not modify more than one base table through a join view 'test.v1'
drop table t1,t2;
drop view v1;
CREATE TABLE t1 (id int, c varchar(10)) engine=maria;
...
...
mysql-test/suite/maria/t/maria.test
View file @
e01f6c89
...
...
@@ -1820,7 +1820,9 @@ create table t1 (f1 int unique, f2 int) engine=maria;
create
table
t2
(
f3
int
,
f4
int
)
engine
=
maria
;
create
view
v1
as
select
*
from
t1
,
t2
where
f1
=
f3
;
insert
into
t1
values
(
1
,
11
),
(
2
,
22
);
--
error
1393
insert
into
v1
(
f1
)
values
(
3
)
on
duplicate
key
update
f1
=
f3
+
10
;
--
error
1393
insert
into
v1
(
f1
)
values
(
3
)
on
duplicate
key
update
f1
=
f3
+
10
;
drop
table
t1
,
t2
;
drop
view
v1
;
...
...
mysql-test/t/delayed.test
View file @
e01f6c89
...
...
@@ -256,7 +256,11 @@ DROP TABLE t1;
# Bug #32676: insert delayed crash with wrong column and function specified
#
CREATE
TABLE
t1
(
a
INT
);
--
error
ER_BAD_FIELD_ERROR
--
error
ER_SP_DOES_NOT_EXIST
INSERT
DELAYED
INTO
t1
SET
a
=
b
();
--
error
ER_BAD_FIELD_ERROR
INSERT
DELAYED
INTO
t1
SET
b
=
1
;
--
error
ER_SP_DOES_NOT_EXIST
INSERT
DELAYED
INTO
t1
SET
b
=
b
();
DROP
TABLE
t1
;
...
...
sql/sql_base.cc
View file @
e01f6c89
...
...
@@ -7342,7 +7342,10 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
/* make * substituting permanent */
SELECT_LEX
*
select_lex
=
thd
->
lex
->
current_select
;
select_lex
->
with_wild
=
0
;
select_lex
->
item_list
=
fields
;
#ifdef HAVE_purify
if
(
&
select_lex
->
item_list
!=
&
fields
)
// Avoid warning
#endif
select_lex
->
item_list
=
fields
;
thd
->
restore_active_arena
(
arena
,
&
backup
);
}
...
...
sql/sql_insert.cc
View file @
e01f6c89
...
...
@@ -88,6 +88,7 @@ static bool check_view_insertability(THD *thd, TABLE_LIST *view);
SYNOPSIS
check_view_single_update()
fields The insert/update fields to be checked.
values Values to use for update
view The view for insert.
map [in/out] The insert table map.
...
...
@@ -107,7 +108,7 @@ static bool check_view_insertability(THD *thd, TABLE_LIST *view);
1 Error
*/
bool
check_view_single_update
(
List
<
Item
>
&
fields
,
List
<
Item
>
&
values
,
bool
check_view_single_update
(
List
<
Item
>
&
fields
,
List
<
Item
>
*
values
,
TABLE_LIST
*
view
,
table_map
*
map
)
{
/* it is join view => we need to find the table for update */
...
...
@@ -119,10 +120,15 @@ bool check_view_single_update(List<Item> &fields, List<Item> &values,
while
((
item
=
it
++
))
tables
|=
item
->
used_tables
();
it
.
init
(
values
);
while
((
item
=
it
++
))
tables
|=
item
->
used_tables
();
if
(
values
)
{
it
.
init
(
*
values
);
while
((
item
=
it
++
))
tables
|=
item
->
used_tables
();
}
/* Convert to real table bits */
tables
&=
~
PSEUDO_TABLE_BITS
;
/* Check found map against provided map */
if
(
*
map
)
{
...
...
@@ -156,6 +162,10 @@ error:
fields The insert fields.
values The insert values.
check_unique If duplicate values should be rejected.
fields_and_values_from_different_maps
Set to 1 if fields and values are using
different table maps, like on select ... insert
map Store here table map for used fields
NOTE
Clears TIMESTAMP_AUTO_SET_ON_INSERT from table->timestamp_field_type
...
...
@@ -169,7 +179,9 @@ error:
static
int
check_insert_fields
(
THD
*
thd
,
TABLE_LIST
*
table_list
,
List
<
Item
>
&
fields
,
List
<
Item
>
&
values
,
bool
check_unique
,
table_map
*
map
)
bool
check_unique
,
bool
fields_and_values_from_different_maps
,
table_map
*
map
)
{
TABLE
*
table
=
table_list
->
table
;
...
...
@@ -242,7 +254,10 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list,
if
(
table_list
->
effective_algorithm
==
VIEW_ALGORITHM_MERGE
)
{
if
(
check_view_single_update
(
fields
,
values
,
table_list
,
map
))
if
(
check_view_single_update
(
fields
,
fields_and_values_from_different_maps
?
(
List
<
Item
>*
)
0
:
&
values
,
table_list
,
map
))
return
-
1
;
table
=
table_list
->
table
;
}
...
...
@@ -325,8 +340,8 @@ static int check_update_fields(THD *thd, TABLE_LIST *insert_table_list,
return
-
1
;
if
(
insert_table_list
->
effective_algorithm
==
VIEW_ALGORITHM_MERGE
&&
check_view_single_update
(
update_fields
,
update_values
,
insert_table_list
,
map
))
check_view_single_update
(
update_fields
,
&
update_values
,
insert_table_list
,
map
))
return
-
1
;
if
(
table
->
timestamp_field
)
...
...
@@ -1234,9 +1249,9 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
table_list
->
next_local
=
0
;
context
->
resolve_in_table_list_only
(
table_list
);
res
=
check_insert_fields
(
thd
,
context
->
table_list
,
fields
,
*
values
,
!
insert_into_view
,
&
map
)
||
setup_fields
(
thd
,
0
,
*
values
,
MARK_COLUMNS_READ
,
0
,
0
);
res
=
(
setup_fields
(
thd
,
0
,
*
values
,
MARK_COLUMNS_READ
,
0
,
0
)
||
check_insert_fields
(
thd
,
context
->
table_list
,
fields
,
*
values
,
!
insert_into_view
,
0
,
&
map
)
);
if
(
!
res
&&
check_fields
)
{
...
...
@@ -1249,6 +1264,9 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
thd
->
abort_on_warning
=
saved_abort_on_warning
;
}
if
(
!
res
)
res
=
setup_fields
(
thd
,
0
,
update_values
,
MARK_COLUMNS_READ
,
0
,
0
);
if
(
!
res
&&
duplic
==
DUP_UPDATE
)
{
select_lex
->
no_wrap_view_item
=
TRUE
;
...
...
@@ -1259,9 +1277,6 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
/* Restore the current context. */
ctx_state
.
restore_state
(
context
,
table_list
);
if
(
!
res
)
res
=
setup_fields
(
thd
,
0
,
update_values
,
MARK_COLUMNS_READ
,
0
,
0
);
}
if
(
res
)
...
...
@@ -2890,10 +2905,9 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
we are fixing fields from insert list.
*/
lex
->
current_select
=
&
lex
->
select_lex
;
res
=
check_insert_fields
(
thd
,
table_list
,
*
fields
,
values
,
!
insert_into_view
,
&
map
)
||
setup_fields
(
thd
,
0
,
values
,
MARK_COLUMNS_READ
,
0
,
0
);
res
=
(
setup_fields
(
thd
,
0
,
values
,
MARK_COLUMNS_READ
,
0
,
0
)
||
check_insert_fields
(
thd
,
table_list
,
*
fields
,
values
,
!
insert_into_view
,
1
,
&
map
));
if
(
!
res
&&
fields
->
elements
)
{
bool
saved_abort_on_warning
=
thd
->
abort_on_warning
;
...
...
storage/maria/ma_blockrec.c
View file @
e01f6c89
...
...
@@ -2422,7 +2422,8 @@ static my_bool free_full_page_range(MARIA_HA *info, pgcache_page_no_t page,
*/
delete_count
--
;
}
if
(
pagecache_delete_pages
(
share
->
pagecache
,
&
info
->
dfile
,
if
(
delete_count
&&
pagecache_delete_pages
(
share
->
pagecache
,
&
info
->
dfile
,
page
,
delete_count
,
PAGECACHE_LOCK_WRITE
,
0
))
res
=
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment