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
45d7e75c
Commit
45d7e75c
authored
18 years ago
by
stewart@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into mysql.com:/home/stewart/Documents/MySQL/5.1/main
parents
49790e0d
061bdf91
Branches unavailable
Tags unavailable
No related merge requests found
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
171 additions
and
8 deletions
+171
-8
extra/yassl/src/handshake.cpp
extra/yassl/src/handshake.cpp
+4
-4
extra/yassl/src/socket_wrapper.cpp
extra/yassl/src/socket_wrapper.cpp
+11
-2
mysql-test/r/ndb_condition_pushdown.result
mysql-test/r/ndb_condition_pushdown.result
+24
-0
mysql-test/r/type_newdecimal.result
mysql-test/r/type_newdecimal.result
+11
-0
mysql-test/r/view_grant.result
mysql-test/r/view_grant.result
+29
-0
mysql-test/t/ndb_condition_pushdown.test
mysql-test/t/ndb_condition_pushdown.test
+22
-0
mysql-test/t/type_newdecimal.test
mysql-test/t/type_newdecimal.test
+9
-0
mysql-test/t/view_grant.test
mysql-test/t/view_grant.test
+39
-0
mysql-test/valgrind.supp
mysql-test/valgrind.supp
+13
-0
sql/item_buff.cc
sql/item_buff.cc
+1
-1
sql/sql_parse.cc
sql/sql_parse.cc
+8
-1
No files found.
extra/yassl/src/handshake.cpp
View file @
45d7e75c
...
...
@@ -880,7 +880,7 @@ int sendData(SSL& ssl, const void* buffer, int sz)
ssl
.
SetError
(
no_error
);
ssl
.
verfiyHandShakeComplete
();
if
(
ssl
.
GetError
())
return
0
;
if
(
ssl
.
GetError
())
return
-
1
;
int
sent
=
0
;
for
(;;)
{
...
...
@@ -891,7 +891,7 @@ int sendData(SSL& ssl, const void* buffer, int sz)
buildMessage
(
ssl
,
out
,
data
);
ssl
.
Send
(
out
.
get_buffer
(),
out
.
get_size
());
if
(
ssl
.
GetError
())
return
0
;
if
(
ssl
.
GetError
())
return
-
1
;
sent
+=
len
;
if
(
sent
==
sz
)
break
;
}
...
...
@@ -918,14 +918,14 @@ int receiveData(SSL& ssl, Data& data)
ssl
.
SetError
(
no_error
);
ssl
.
verfiyHandShakeComplete
();
if
(
ssl
.
GetError
())
return
0
;
if
(
ssl
.
GetError
())
return
-
1
;
if
(
!
ssl
.
bufferedData
())
processReply
(
ssl
);
ssl
.
fillData
(
data
);
ssl
.
useLog
().
ShowData
(
data
.
get_length
());
if
(
ssl
.
GetError
())
return
0
;
if
(
ssl
.
GetError
())
return
-
1
;
if
(
data
.
get_length
()
==
0
&&
ssl
.
getSocket
().
WouldBlock
())
{
ssl
.
SetError
(
YasslError
(
SSL_ERROR_WANT_READ
));
...
...
This diff is collapsed.
Click to expand it.
extra/yassl/src/socket_wrapper.cpp
View file @
45d7e75c
...
...
@@ -113,13 +113,22 @@ uint Socket::get_ready() const
uint
Socket
::
send
(
const
byte
*
buf
,
unsigned
int
sz
,
int
flags
)
const
{
const
byte
*
pos
=
buf
;
const
byte
*
end
=
pos
+
sz
;
assert
(
socket_
!=
INVALID_SOCKET
);
int
sent
=
::
send
(
socket_
,
reinterpret_cast
<
const
char
*>
(
buf
),
sz
,
flags
);
while
(
pos
!=
end
)
{
int
sent
=
::
send
(
socket_
,
reinterpret_cast
<
const
char
*>
(
pos
),
static_cast
<
int
>
(
end
-
pos
),
flags
);
if
(
sent
==
-
1
)
return
0
;
return
sent
;
pos
+=
sent
;
}
return
sz
;
}
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/ndb_condition_pushdown.result
View file @
45d7e75c
...
...
@@ -1842,5 +1842,29 @@ a b
select * from t1 where b like 'abc' or b like 'abc';
a b
3 abc
drop table t1;
create table t1 ( fname varchar(255), lname varchar(255) )
engine=ndbcluster;
insert into t1 values ("Young","Foo");
set engine_condition_pushdown = 0;
SELECT fname, lname FROM t1 WHERE (fname like 'Y%') or (lname like 'F%');
fname lname
Young Foo
set engine_condition_pushdown = 1;
SELECT fname, lname FROM t1 WHERE (fname like 'Y%') or (lname like 'F%');
fname lname
Young Foo
insert into t1 values ("aaa", "aaa");
insert into t1 values ("bbb", "bbb");
insert into t1 values ("ccc", "ccc");
insert into t1 values ("ddd", "ddd");
set engine_condition_pushdown = 0;
SELECT fname, lname FROM t1 WHERE (fname like 'Y%') or (lname like 'F%');
fname lname
Young Foo
set engine_condition_pushdown = 1;
SELECT fname, lname FROM t1 WHERE (fname like 'Y%') or (lname like 'F%');
fname lname
Young Foo
set engine_condition_pushdown = @old_ecpd;
DROP TABLE t1,t2,t3,t4,t5;
This diff is collapsed.
Click to expand it.
mysql-test/r/type_newdecimal.result
View file @
45d7e75c
...
...
@@ -1397,3 +1397,14 @@ c1
9999999999999999999999999999999999999999999999999999999999999999
9999999999999999999999999999999999999999999999999999999999999999
drop table t1;
create table t1 (i int, j int);
insert into t1 values (1,1), (1,2), (2,3), (2,4);
select i, count(distinct j) from t1 group by i;
i count(distinct j)
1 2
2 2
select i+0.0 as i2, count(distinct j) from t1 group by i2;
i2 count(distinct j)
1.0 2
2.0 2
drop table t1;
This diff is collapsed.
Click to expand it.
mysql-test/r/view_grant.result
View file @
45d7e75c
...
...
@@ -620,3 +620,32 @@ ERROR HY000: There is no 'no-such-user'@'localhost' registered
DROP VIEW v;
DROP TABLE t1;
USE test;
CREATE USER mysqltest_db1@localhost identified by 'PWD';
GRANT ALL ON mysqltest_db1.* TO mysqltest_db1@localhost WITH GRANT OPTION;
CREATE SCHEMA mysqltest_db1 ;
USE mysqltest_db1 ;
CREATE TABLE t1 (f1 INTEGER);
CREATE VIEW view1 AS
SELECT * FROM t1;
SHOW CREATE VIEW view1;
View Create View
view1 CREATE ALGORITHM=UNDEFINED DEFINER=`mysqltest_db1`@`localhost` SQL SECURITY DEFINER VIEW `view1` AS select `t1`.`f1` AS `f1` from `t1`
CREATE VIEW view2 AS
SELECT * FROM view1;
# Here comes a suspicious warning
SHOW CREATE VIEW view2;
View Create View
view2 CREATE ALGORITHM=UNDEFINED DEFINER=`mysqltest_db1`@`localhost` SQL SECURITY DEFINER VIEW `view2` AS select `view1`.`f1` AS `f1` from `view1`
# But the view view2 is usable
SELECT * FROM view2;
f1
CREATE VIEW view3 AS
SELECT * FROM view2;
SELECT * from view3;
f1
DROP VIEW mysqltest_db1.view3;
DROP VIEW mysqltest_db1.view2;
DROP VIEW mysqltest_db1.view1;
DROP TABLE mysqltest_db1.t1;
DROP SCHEMA mysqltest_db1;
DROP USER mysqltest_db1@localhost;
This diff is collapsed.
Click to expand it.
mysql-test/t/ndb_condition_pushdown.test
View file @
45d7e75c
...
...
@@ -1686,5 +1686,27 @@ select * from t1 where b like 'ab' or b like 'ab';
select
*
from
t1
where
b
like
'abc'
;
select
*
from
t1
where
b
like
'abc'
or
b
like
'abc'
;
# bug#20406 (maybe same as bug#17421 -1, not seen on 32-bit x86)
drop
table
t1
;
create
table
t1
(
fname
varchar
(
255
),
lname
varchar
(
255
)
)
engine
=
ndbcluster
;
insert
into
t1
values
(
"Young"
,
"Foo"
);
set
engine_condition_pushdown
=
0
;
SELECT
fname
,
lname
FROM
t1
WHERE
(
fname
like
'Y%'
)
or
(
lname
like
'F%'
);
set
engine_condition_pushdown
=
1
;
SELECT
fname
,
lname
FROM
t1
WHERE
(
fname
like
'Y%'
)
or
(
lname
like
'F%'
);
# make sure optimizer does not do some crazy shortcut
insert
into
t1
values
(
"aaa"
,
"aaa"
);
insert
into
t1
values
(
"bbb"
,
"bbb"
);
insert
into
t1
values
(
"ccc"
,
"ccc"
);
insert
into
t1
values
(
"ddd"
,
"ddd"
);
set
engine_condition_pushdown
=
0
;
SELECT
fname
,
lname
FROM
t1
WHERE
(
fname
like
'Y%'
)
or
(
lname
like
'F%'
);
set
engine_condition_pushdown
=
1
;
SELECT
fname
,
lname
FROM
t1
WHERE
(
fname
like
'Y%'
)
or
(
lname
like
'F%'
);
set
engine_condition_pushdown
=
@
old_ecpd
;
DROP
TABLE
t1
,
t2
,
t3
,
t4
,
t5
;
This diff is collapsed.
Click to expand it.
mysql-test/t/type_newdecimal.test
View file @
45d7e75c
...
...
@@ -1095,3 +1095,12 @@ insert into t1 values(
insert
into
t1
values
(
1
e100
);
select
*
from
t1
;
drop
table
t1
;
#
# Bug#19667 group by a decimal expression yields wrong result
#
create
table
t1
(
i
int
,
j
int
);
insert
into
t1
values
(
1
,
1
),
(
1
,
2
),
(
2
,
3
),
(
2
,
4
);
select
i
,
count
(
distinct
j
)
from
t1
group
by
i
;
select
i
+
0.0
as
i2
,
count
(
distinct
j
)
from
t1
group
by
i2
;
drop
table
t1
;
This diff is collapsed.
Click to expand it.
mysql-test/t/view_grant.test
View file @
45d7e75c
...
...
@@ -813,3 +813,42 @@ SELECT * FROM v;
DROP
VIEW
v
;
DROP
TABLE
t1
;
USE
test
;
#
# Bug#20363: Create view on just created view is now denied
#
eval
CREATE
USER
mysqltest_db1
@
localhost
identified
by
'PWD'
;
eval
GRANT
ALL
ON
mysqltest_db1
.*
TO
mysqltest_db1
@
localhost
WITH
GRANT
OPTION
;
# The session with the non root user is needed.
--
replace_result
$MASTER_MYPORT
MYSQL_PORT
$MASTER_MYSOCK
MYSQL_SOCK
connect
(
session1
,
localhost
,
mysqltest_db1
,
PWD
,
test
);
CREATE
SCHEMA
mysqltest_db1
;
USE
mysqltest_db1
;
CREATE
TABLE
t1
(
f1
INTEGER
);
CREATE
VIEW
view1
AS
SELECT
*
FROM
t1
;
SHOW
CREATE
VIEW
view1
;
CREATE
VIEW
view2
AS
SELECT
*
FROM
view1
;
--
echo
# Here comes a suspicious warning
SHOW
CREATE
VIEW
view2
;
--
echo
# But the view view2 is usable
SELECT
*
FROM
view2
;
CREATE
VIEW
view3
AS
SELECT
*
FROM
view2
;
SELECT
*
from
view3
;
connection
default
;
DROP
VIEW
mysqltest_db1
.
view3
;
DROP
VIEW
mysqltest_db1
.
view2
;
DROP
VIEW
mysqltest_db1
.
view1
;
DROP
TABLE
mysqltest_db1
.
t1
;
DROP
SCHEMA
mysqltest_db1
;
DROP
USER
mysqltest_db1
@
localhost
;
This diff is collapsed.
Click to expand it.
mysql-test/valgrind.supp
View file @
45d7e75c
...
...
@@ -408,6 +408,19 @@
}
#
# BUG#19940: NDB sends uninitialized parts of field buffers across the wire.
# This is "works as designed"; the uninitialized part is not used at the
# other end (but Valgrind cannot see this).
#
{
bug19940
Memcheck:Param
socketcall.sendto(msg)
fun:send
fun:_ZN15TCP_Transporter6doSendEv
fun:_ZN19TransporterRegistry11performSendEv
fun:_ZN19TransporterRegistry14forceSendCheckEi
}
# Warning when printing stack trace (to suppress some not needed warnings)
#
...
...
This diff is collapsed.
Click to expand it.
sql/item_buff.cc
View file @
45d7e75c
...
...
@@ -132,7 +132,7 @@ bool Cached_item_decimal::cmp()
{
my_decimal
tmp
;
my_decimal
*
ptmp
=
item
->
val_decimal
(
&
tmp
);
if
(
null_value
!=
item
->
null_value
||
my_decimal_cmp
(
&
value
,
ptmp
)
==
0
)
if
(
null_value
!=
item
->
null_value
||
my_decimal_cmp
(
&
value
,
ptmp
))
{
null_value
=
item
->
null_value
;
my_decimal2decimal
(
ptmp
,
&
value
);
...
...
This diff is collapsed.
Click to expand it.
sql/sql_parse.cc
View file @
45d7e75c
...
...
@@ -5201,7 +5201,14 @@ bool check_one_table_access(THD *thd, ulong privilege, TABLE_LIST *all_tables)
if
(
all_tables
->
security_ctx
)
thd
->
security_ctx
=
all_tables
->
security_ctx
;
if
(
check_access
(
thd
,
privilege
,
all_tables
->
db
,
const
char
*
db_name
;
if
((
all_tables
->
view
||
all_tables
->
field_translation
)
&&
!
all_tables
->
schema_table
)
db_name
=
all_tables
->
view_db
.
str
;
else
db_name
=
all_tables
->
db
;
if
(
check_access
(
thd
,
privilege
,
db_name
,
&
all_tables
->
grant
.
privilege
,
0
,
0
,
test
(
all_tables
->
schema_table
)))
goto
deny
;
...
...
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