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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
a27e3d1a
Commit
a27e3d1a
authored
19 years ago
by
joreland@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
parents
b0e888fd
a5a99cf7
Branches unavailable
Tags unavailable
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
28 deletions
+29
-28
mysql-test/r/join_outer.result
mysql-test/r/join_outer.result
+14
-14
mysql-test/t/join_outer.test
mysql-test/t/join_outer.test
+14
-14
sql/item_cmpfunc.h
sql/item_cmpfunc.h
+1
-0
No files found.
mysql-test/r/join_outer.result
View file @
a27e3d1a
...
...
@@ -784,32 +784,32 @@ t2.flag_value IS NULL;
flag_name flag_value
flag2 NULL
DROP TABLE t1,t2;
CREATE TABLE
invoice
(
CREATE TABLE
t1
(
id int(11) unsigned NOT NULL auto_increment,
text_id int(10) unsigned default NULL,
PRIMARY KEY (id)
);
INSERT INTO
invoice
VALUES("1", "0");
INSERT INTO
invoice
VALUES("2", "10");
CREATE TABLE t
ext_table
(
INSERT INTO
t1
VALUES("1", "0");
INSERT INTO
t1
VALUES("2", "10");
CREATE TABLE t
2
(
text_id char(3) NOT NULL default '',
language_id char(3) NOT NULL default '',
text_data text,
PRIMARY KEY (text_id,language_id)
);
INSERT INTO t
ext_table
VALUES("0", "EN", "0-EN");
INSERT INTO t
ext_table
VALUES("0", "SV", "0-SV");
INSERT INTO t
ext_table
VALUES("10", "EN", "10-EN");
INSERT INTO t
ext_table
VALUES("10", "SV", "10-SV");
SELECT
invoice.id, invoice.text_id, text_table
.text_data
FROM
invoice LEFT JOIN text_table
ON
invoice.text_id = text_table
.text_id
AND t
ext_table
.language_id = 'SV'
WHERE (
invoice.id LIKE '%' OR text_table
.text_data LIKE '%');
INSERT INTO t
2
VALUES("0", "EN", "0-EN");
INSERT INTO t
2
VALUES("0", "SV", "0-SV");
INSERT INTO t
2
VALUES("10", "EN", "10-EN");
INSERT INTO t
2
VALUES("10", "SV", "10-SV");
SELECT
t1.id, t1.text_id, t2
.text_data
FROM
t1 LEFT JOIN t2
ON
t1.text_id = t2
.text_id
AND t
2
.language_id = 'SV'
WHERE (
t1.id LIKE '%' OR t2
.text_data LIKE '%');
id text_id text_data
1 0 0-SV
2 10 10-SV
DROP TABLE
invoice, text_table
;
DROP TABLE
t1, t2
;
CREATE TABLE t0 (a0 int PRIMARY KEY);
CREATE TABLE t1 (a1 int PRIMARY KEY);
CREATE TABLE t2 (a2 int);
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/join_outer.test
View file @
a27e3d1a
...
...
@@ -554,34 +554,34 @@ SELECT t1.flag_name,t2.flag_value
DROP
TABLE
t1
,
t2
;
CREATE
TABLE
invoice
(
CREATE
TABLE
t1
(
id
int
(
11
)
unsigned
NOT
NULL
auto_increment
,
text_id
int
(
10
)
unsigned
default
NULL
,
PRIMARY
KEY
(
id
)
);
INSERT
INTO
invoice
VALUES
(
"1"
,
"0"
);
INSERT
INTO
invoice
VALUES
(
"2"
,
"10"
);
INSERT
INTO
t1
VALUES
(
"1"
,
"0"
);
INSERT
INTO
t1
VALUES
(
"2"
,
"10"
);
CREATE
TABLE
t
ext_table
(
CREATE
TABLE
t
2
(
text_id
char
(
3
)
NOT
NULL
default
''
,
language_id
char
(
3
)
NOT
NULL
default
''
,
text_data
text
,
PRIMARY
KEY
(
text_id
,
language_id
)
);
INSERT
INTO
t
ext_table
VALUES
(
"0"
,
"EN"
,
"0-EN"
);
INSERT
INTO
t
ext_table
VALUES
(
"0"
,
"SV"
,
"0-SV"
);
INSERT
INTO
t
ext_table
VALUES
(
"10"
,
"EN"
,
"10-EN"
);
INSERT
INTO
t
ext_table
VALUES
(
"10"
,
"SV"
,
"10-SV"
);
INSERT
INTO
t
2
VALUES
(
"0"
,
"EN"
,
"0-EN"
);
INSERT
INTO
t
2
VALUES
(
"0"
,
"SV"
,
"0-SV"
);
INSERT
INTO
t
2
VALUES
(
"10"
,
"EN"
,
"10-EN"
);
INSERT
INTO
t
2
VALUES
(
"10"
,
"SV"
,
"10-SV"
);
SELECT
invoice
.
id
,
invoice
.
text_id
,
text_table
.
text_data
FROM
invoice
LEFT
JOIN
text_table
ON
invoice
.
text_id
=
text_table
.
text_id
AND
t
ext_table
.
language_id
=
'SV'
WHERE
(
invoice
.
id
LIKE
'%'
OR
text_table
.
text_data
LIKE
'%'
);
SELECT
t1
.
id
,
t1
.
text_id
,
t2
.
text_data
FROM
t1
LEFT
JOIN
t2
ON
t1
.
text_id
=
t2
.
text_id
AND
t
2
.
language_id
=
'SV'
WHERE
(
t1
.
id
LIKE
'%'
OR
t2
.
text_data
LIKE
'%'
);
DROP
TABLE
invoice
,
text_table
;
DROP
TABLE
t1
,
t2
;
# Test for bug #5896
...
...
This diff is collapsed.
Click to expand it.
sql/item_cmpfunc.h
View file @
a27e3d1a
...
...
@@ -264,6 +264,7 @@ class Item_func_trig_cond: public Item_bool_func
longlong
val_int
()
{
return
*
trig_var
?
args
[
0
]
->
val_int
()
:
1
;
}
enum
Functype
functype
()
const
{
return
TRIG_COND_FUNC
;
};
const
char
*
func_name
()
const
{
return
"trigcond"
;
};
bool
const_item
()
const
{
return
FALSE
;
}
};
class
Item_func_not_all
:
public
Item_func_not
...
...
This diff is collapsed.
Click to expand it.
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