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
3db325cb
Commit
3db325cb
authored
Dec 04, 2003
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
parents
9d85f991
ee52d292
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
61 additions
and
73 deletions
+61
-73
mysql-test/r/bdb.result
mysql-test/r/bdb.result
+11
-0
mysql-test/r/innodb.result
mysql-test/r/innodb.result
+11
-0
mysql-test/r/multi_update.result
mysql-test/r/multi_update.result
+0
-26
mysql-test/t/bdb.test
mysql-test/t/bdb.test
+19
-0
mysql-test/t/innodb.test
mysql-test/t/innodb.test
+19
-0
mysql-test/t/multi_update.test
mysql-test/t/multi_update.test
+0
-46
sql/mysqld.cc
sql/mysqld.cc
+1
-1
No files found.
mysql-test/r/bdb.result
View file @
3db325cb
...
@@ -1154,3 +1154,14 @@ x
...
@@ -1154,3 +1154,14 @@ x
7
7
6
6
drop table t1;
drop table t1;
create table t1 ( c char(8) not null ) type=bdb;
insert into t1 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9');
insert into t1 values ('A'),('B'),('C'),('D'),('E'),('F');
alter table t1 add b char(8) not null;
alter table t1 add a char(8) not null;
alter table t1 add primary key (a,b,c);
update t1 set a=c, b=c;
create table t2 (c char(8) not null, b char(8) not null, a char(8) not null, primary key(a,b,c)) type=bdb;
insert into t2 select * from t1;
delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;
drop table t1,t2;
mysql-test/r/innodb.result
View file @
3db325cb
...
@@ -1222,3 +1222,14 @@ a b
...
@@ -1222,3 +1222,14 @@ a b
111 100
111 100
111 100
111 100
drop table t1;
drop table t1;
create table t1 ( c char(8) not null ) type=innodb;
insert into t1 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9');
insert into t1 values ('A'),('B'),('C'),('D'),('E'),('F');
alter table t1 add b char(8) not null;
alter table t1 add a char(8) not null;
alter table t1 add primary key (a,b,c);
update t1 set a=c, b=c;
create table t2 (c char(8) not null, b char(8) not null, a char(8) not null, primary key(a,b,c)) type=innodb;
insert into t2 select * from t1;
delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;
drop table t1,t2;
mysql-test/r/multi_update.result
View file @
3db325cb
...
@@ -327,29 +327,3 @@ select t1.a, t1.b,t2.a, t2.b from t1 left join t2 on t1.a=t2.a where t1.b=1 and
...
@@ -327,29 +327,3 @@ select t1.a, t1.b,t2.a, t2.b from t1 left join t2 on t1.a=t2.a where t1.b=1 and
a b a b
a b a b
2 2 NULL NULL
2 2 NULL NULL
drop table t1,t2;
drop table t1,t2;
set @ttype_save=@@table_type;
set @@table_type=innodb;
create table t1 ( c char(8) not null );
insert into t1 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9');
insert into t1 values ('A'),('B'),('C'),('D'),('E'),('F');
alter table t1 add b char(8) not null;
alter table t1 add a char(8) not null;
alter table t1 add primary key (a,b,c);
update t1 set a=c, b=c;
create table t2 (c char(8) not null, b char(8) not null, a char(8) not null, primary key(a,b,c));
insert into t2 select * from t1;
delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;
drop table t1,t2;
set @@table_type=bdb;
create table t1 ( c char(8) not null );
insert into t1 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9');
insert into t1 values ('A'),('B'),('C'),('D'),('E'),('F');
alter table t1 add b char(8) not null;
alter table t1 add a char(8) not null;
alter table t1 add primary key (a,b,c);
update t1 set a=c, b=c;
create table t2 (c char(8) not null, b char(8) not null, a char(8) not null, primary key(a,b,c));
insert into t2 select * from t1;
delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;
set @@table_type=@ttype_save;
drop table t1,t2;
mysql-test/t/bdb.test
View file @
3db325cb
...
@@ -796,3 +796,22 @@ select * from t1 where x <= 10 and x >= 7 order by x desc;
...
@@ -796,3 +796,22 @@ select * from t1 where x <= 10 and x >= 7 order by x desc;
select
*
from
t1
where
x
<=
8
and
x
>=
5
order
by
x
desc
;
select
*
from
t1
where
x
<=
8
and
x
>=
5
order
by
x
desc
;
select
*
from
t1
where
x
<
8
and
x
>
5
order
by
x
desc
;
select
*
from
t1
where
x
<
8
and
x
>
5
order
by
x
desc
;
drop
table
t1
;
drop
table
t1
;
#
# Test of multi-table-updates (bug #1980).
#
create
table
t1
(
c
char
(
8
)
not
null
)
type
=
bdb
;
insert
into
t1
values
(
'0'
),(
'1'
),(
'2'
),(
'3'
),(
'4'
),(
'5'
),(
'6'
),(
'7'
),(
'8'
),(
'9'
);
insert
into
t1
values
(
'A'
),(
'B'
),(
'C'
),(
'D'
),(
'E'
),(
'F'
);
alter
table
t1
add
b
char
(
8
)
not
null
;
alter
table
t1
add
a
char
(
8
)
not
null
;
alter
table
t1
add
primary
key
(
a
,
b
,
c
);
update
t1
set
a
=
c
,
b
=
c
;
create
table
t2
(
c
char
(
8
)
not
null
,
b
char
(
8
)
not
null
,
a
char
(
8
)
not
null
,
primary
key
(
a
,
b
,
c
))
type
=
bdb
;
insert
into
t2
select
*
from
t1
;
delete
t1
,
t2
from
t2
,
t1
where
t1
.
a
<
'B'
and
t2
.
b
=
t1
.
b
;
drop
table
t1
,
t2
;
mysql-test/t/innodb.test
View file @
3db325cb
...
@@ -838,3 +838,22 @@ update t1 set b=100 where a=1 order by b desc limit 2;
...
@@ -838,3 +838,22 @@ update t1 set b=100 where a=1 order by b desc limit 2;
update
t1
set
a
=
a
+
10
+
b
where
a
=
1
order
by
b
;
update
t1
set
a
=
a
+
10
+
b
where
a
=
1
order
by
b
;
select
*
from
t1
order
by
a
,
b
;
select
*
from
t1
order
by
a
,
b
;
drop
table
t1
;
drop
table
t1
;
#
# Test of multi-table-updates (bug #1980).
#
create
table
t1
(
c
char
(
8
)
not
null
)
type
=
innodb
;
insert
into
t1
values
(
'0'
),(
'1'
),(
'2'
),(
'3'
),(
'4'
),(
'5'
),(
'6'
),(
'7'
),(
'8'
),(
'9'
);
insert
into
t1
values
(
'A'
),(
'B'
),(
'C'
),(
'D'
),(
'E'
),(
'F'
);
alter
table
t1
add
b
char
(
8
)
not
null
;
alter
table
t1
add
a
char
(
8
)
not
null
;
alter
table
t1
add
primary
key
(
a
,
b
,
c
);
update
t1
set
a
=
c
,
b
=
c
;
create
table
t2
(
c
char
(
8
)
not
null
,
b
char
(
8
)
not
null
,
a
char
(
8
)
not
null
,
primary
key
(
a
,
b
,
c
))
type
=
innodb
;
insert
into
t2
select
*
from
t1
;
delete
t1
,
t2
from
t2
,
t1
where
t1
.
a
<
'B'
and
t2
.
b
=
t1
.
b
;
drop
table
t1
,
t2
;
mysql-test/t/multi_update.test
View file @
3db325cb
...
@@ -267,49 +267,3 @@ insert into t2 values (1,1), (3,1);
...
@@ -267,49 +267,3 @@ insert into t2 values (1,1), (3,1);
update
t1
left
join
t2
on
t1
.
a
=
t2
.
a
set
t1
.
b
=
2
,
t2
.
b
=
2
where
t1
.
b
=
1
and
t2
.
b
=
1
or
t2
.
a
is
NULL
;
update
t1
left
join
t2
on
t1
.
a
=
t2
.
a
set
t1
.
b
=
2
,
t2
.
b
=
2
where
t1
.
b
=
1
and
t2
.
b
=
1
or
t2
.
a
is
NULL
;
select
t1
.
a
,
t1
.
b
,
t2
.
a
,
t2
.
b
from
t1
left
join
t2
on
t1
.
a
=
t2
.
a
where
t1
.
b
=
1
and
t2
.
b
=
1
or
t2
.
a
is
NULL
;
select
t1
.
a
,
t1
.
b
,
t2
.
a
,
t2
.
b
from
t1
left
join
t2
on
t1
.
a
=
t2
.
a
where
t1
.
b
=
1
and
t2
.
b
=
1
or
t2
.
a
is
NULL
;
drop
table
t1
,
t2
;
drop
table
t1
,
t2
;
#
# Test for bug #1980.
#
set
@
ttype_save
=@@
table_type
;
--
disable_warnings
set
@@
table_type
=
innodb
;
create
table
t1
(
c
char
(
8
)
not
null
);
--
enable_warnings
insert
into
t1
values
(
'0'
),(
'1'
),(
'2'
),(
'3'
),(
'4'
),(
'5'
),(
'6'
),(
'7'
),(
'8'
),(
'9'
);
insert
into
t1
values
(
'A'
),(
'B'
),(
'C'
),(
'D'
),(
'E'
),(
'F'
);
alter
table
t1
add
b
char
(
8
)
not
null
;
alter
table
t1
add
a
char
(
8
)
not
null
;
alter
table
t1
add
primary
key
(
a
,
b
,
c
);
update
t1
set
a
=
c
,
b
=
c
;
create
table
t2
(
c
char
(
8
)
not
null
,
b
char
(
8
)
not
null
,
a
char
(
8
)
not
null
,
primary
key
(
a
,
b
,
c
));
insert
into
t2
select
*
from
t1
;
delete
t1
,
t2
from
t2
,
t1
where
t1
.
a
<
'B'
and
t2
.
b
=
t1
.
b
;
drop
table
t1
,
t2
;
--
disable_warnings
set
@@
table_type
=
bdb
;
create
table
t1
(
c
char
(
8
)
not
null
);
--
enable_warnings
insert
into
t1
values
(
'0'
),(
'1'
),(
'2'
),(
'3'
),(
'4'
),(
'5'
),(
'6'
),(
'7'
),(
'8'
),(
'9'
);
insert
into
t1
values
(
'A'
),(
'B'
),(
'C'
),(
'D'
),(
'E'
),(
'F'
);
alter
table
t1
add
b
char
(
8
)
not
null
;
alter
table
t1
add
a
char
(
8
)
not
null
;
alter
table
t1
add
primary
key
(
a
,
b
,
c
);
update
t1
set
a
=
c
,
b
=
c
;
create
table
t2
(
c
char
(
8
)
not
null
,
b
char
(
8
)
not
null
,
a
char
(
8
)
not
null
,
primary
key
(
a
,
b
,
c
));
insert
into
t2
select
*
from
t1
;
delete
t1
,
t2
from
t2
,
t1
where
t1
.
a
<
'B'
and
t2
.
b
=
t1
.
b
;
set
@@
table_type
=@
ttype_save
;
drop
table
t1
,
t2
;
sql/mysqld.cc
View file @
3db325cb
...
@@ -2573,7 +2573,7 @@ default_service_handling(char **argv,
...
@@ -2573,7 +2573,7 @@ default_service_handling(char **argv,
}
}
/* We must have servicename last */
/* We must have servicename last */
*
pos
++=
' '
;
*
pos
++=
' '
;
strmake
(
pos
,
servicename
,
(
uint
)
(
end
+
2
-
pos
)
);
(
void
)
add_quoted_string
(
pos
,
servicename
,
end
);
if
(
Service
.
got_service_option
(
argv
,
"install"
))
if
(
Service
.
got_service_option
(
argv
,
"install"
))
{
{
...
...
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