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
6ad30c9b
Commit
6ad30c9b
authored
Jun 18, 2002
by
Sinisa@sinisa.nasamreza.org
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some comments , plus introduced some tests so that I do not
make some new mistakes.
parent
73ffcf6e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
mysql-test/r/merge.result
mysql-test/r/merge.result
+3
-0
mysql-test/t/merge.test
mysql-test/t/merge.test
+1
-0
sql/sql_update.cc
sql/sql_update.cc
+3
-3
No files found.
mysql-test/r/merge.result
View file @
6ad30c9b
...
@@ -470,4 +470,7 @@ CREATE TABLE t ( a int(11) NOT NULL default '0', b int(11) NOT NULL default '0
...
@@ -470,4 +470,7 @@ CREATE TABLE t ( a int(11) NOT NULL default '0', b int(11) NOT NULL default '0
select max(b) from t where a = 2;
select max(b) from t where a = 2;
max(b)
max(b)
NULL
NULL
select max(b) from t1 where a = 2;
max(b)
1
drop table if exists t,t1,t2;
drop table if exists t,t1,t2;
mysql-test/t/merge.test
View file @
6ad30c9b
...
@@ -174,4 +174,5 @@ CREATE TABLE t2 ( a int(11) NOT NULL default '0', b int(11) NOT NULL default '
...
@@ -174,4 +174,5 @@ CREATE TABLE t2 ( a int(11) NOT NULL default '0', b int(11) NOT NULL default '
INSERT
INTO
t2
VALUES
(
1
,
2
),
(
2
,
2
);
INSERT
INTO
t2
VALUES
(
1
,
2
),
(
2
,
2
);
CREATE
TABLE
t
(
a
int
(
11
)
NOT
NULL
default
'0'
,
b
int
(
11
)
NOT
NULL
default
'0'
,
KEY
a
(
a
,
b
))
TYPE
=
MRG_MyISAM
UNION
=
(
t1
,
t2
);
CREATE
TABLE
t
(
a
int
(
11
)
NOT
NULL
default
'0'
,
b
int
(
11
)
NOT
NULL
default
'0'
,
KEY
a
(
a
,
b
))
TYPE
=
MRG_MyISAM
UNION
=
(
t1
,
t2
);
select
max
(
b
)
from
t
where
a
=
2
;
select
max
(
b
)
from
t
where
a
=
2
;
select
max
(
b
)
from
t1
where
a
=
2
;
drop
table
if
exists
t
,
t1
,
t2
;
drop
table
if
exists
t
,
t1
,
t2
;
sql/sql_update.cc
View file @
6ad30c9b
...
@@ -506,7 +506,7 @@ multi_update::prepare(List<Item> &values)
...
@@ -506,7 +506,7 @@ multi_update::prepare(List<Item> &values)
void
void
multi_update
::
initialize_tables
(
JOIN
*
join
)
multi_update
::
initialize_tables
(
JOIN
*
join
)
{
{
/*
#ifdef NOT_YET
We
skip
it
as
it
only
makes
a
mess
...........
We
skip
it
as
it
only
makes
a
mess
...........
TABLE_LIST
*
walk
;
TABLE_LIST
*
walk
;
table_map
tables_to_update_from
=
0
;
table_map
tables_to_update_from
=
0
;
...
@@ -522,12 +522,12 @@ multi_update::initialize_tables(JOIN *join)
...
@@ -522,12 +522,12 @@ multi_update::initialize_tables(JOIN *join)
{
{
We
are
going
to
update
from
this
table
We
are
going
to
update
from
this
table
TABLE
*
tbl
=
walk
->
table
=
tab
->
table
;
TABLE
*
tbl
=
walk
->
table
=
tab
->
table
;
Don't use KEYREAD optimization on this table
/* Don't use KEYREAD optimization on this table */
tbl
->
no_keyread
=
1
;
tbl
->
no_keyread
=
1
;
walk
=
walk
->
next
;
walk
=
walk
->
next
;
}
}
}
}
*/
#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