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
6b52ad9a
Commit
6b52ad9a
authored
Sep 10, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0
parents
e85f42c5
a94a724d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
mysql-test/r/insert_select.result
mysql-test/r/insert_select.result
+10
-0
mysql-test/t/insert_select.test
mysql-test/t/insert_select.test
+10
-0
sql/sql_parse.cc
sql/sql_parse.cc
+0
-3
No files found.
mysql-test/r/insert_select.result
View file @
6b52ad9a
...
...
@@ -668,3 +668,13 @@ ERROR 42S22: Unknown column 't2.a' in 'field list'
insert into t1 select t2.a from t2 group by t2.a on duplicate key update a= t1.a + t2.b;
ERROR 42S22: Unknown column 't2.b' in 'field list'
drop table t1,t2,t3;
create table t1(f1 varchar(5) key);
insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;
insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;
insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;
select * from t1;
f1
2000
2001
2002
drop table t1;
mysql-test/t/insert_select.test
View file @
6b52ad9a
...
...
@@ -202,4 +202,14 @@ insert into t1 select t2.a from t2 on duplicate key update t2.a= a + t2.b;
insert
into
t1
select
t2
.
a
from
t2
group
by
t2
.
a
on
duplicate
key
update
a
=
t1
.
a
+
t2
.
b
;
drop
table
t1
,
t2
,
t3
;
#
# Bug #12695 Item_func_isnull::update_used_tables() did not update
# const_item_cache
create
table
t1
(
f1
varchar
(
5
)
key
);
insert
into
t1
(
f1
)
select
if
(
max
(
f1
)
is
null
,
'2000'
,
max
(
f1
)
+
1
)
from
t1
;
insert
into
t1
(
f1
)
select
if
(
max
(
f1
)
is
null
,
'2000'
,
max
(
f1
)
+
1
)
from
t1
;
insert
into
t1
(
f1
)
select
if
(
max
(
f1
)
is
null
,
'2000'
,
max
(
f1
)
+
1
)
from
t1
;
select
*
from
t1
;
drop
table
t1
;
# End of 4.1 tests
sql/sql_parse.cc
View file @
6b52ad9a
...
...
@@ -3516,7 +3516,6 @@ end_with_restore_list:
!
db_ok_with_wild_table
(
lex
->
name
)))
{
my_message
(
ER_SLAVE_IGNORED_TABLE
,
ER
(
ER_SLAVE_IGNORED_TABLE
),
MYF
(
0
));
reset_one_shot_variables
(
thd
);
break
;
}
#endif
...
...
@@ -3551,7 +3550,6 @@ end_with_restore_list:
!
db_ok_with_wild_table
(
lex
->
name
)))
{
my_message
(
ER_SLAVE_IGNORED_TABLE
,
ER
(
ER_SLAVE_IGNORED_TABLE
),
MYF
(
0
));
reset_one_shot_variables
(
thd
);
break
;
}
#endif
...
...
@@ -3592,7 +3590,6 @@ end_with_restore_list:
!
db_ok_with_wild_table
(
db
)))
{
my_message
(
ER_SLAVE_IGNORED_TABLE
,
ER
(
ER_SLAVE_IGNORED_TABLE
),
MYF
(
0
));
reset_one_shot_variables
(
thd
);
break
;
}
#endif
...
...
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