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
2a6ea13d
Commit
2a6ea13d
authored
Feb 06, 2008
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/Users/davi/mysql/bugs/21801-5.1
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
parents
ff8651c4
c6099bac
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
124 additions
and
9 deletions
+124
-9
mysql-test/r/create.result
mysql-test/r/create.result
+46
-0
mysql-test/r/grant.result
mysql-test/r/grant.result
+3
-2
mysql-test/r/show_check.result
mysql-test/r/show_check.result
+5
-0
mysql-test/t/create.test
mysql-test/t/create.test
+44
-0
mysql-test/t/grant.test
mysql-test/t/grant.test
+3
-2
mysql-test/t/lock_multi.test
mysql-test/t/lock_multi.test
+0
-1
mysql-test/t/show_check.test
mysql-test/t/show_check.test
+19
-0
mysql-test/t/variables.test
mysql-test/t/variables.test
+2
-2
sql/sql_parse.cc
sql/sql_parse.cc
+2
-2
No files found.
mysql-test/r/create.result
View file @
2a6ea13d
...
...
@@ -1743,4 +1743,50 @@ t1 CREATE TABLE `t1` (
`MAXLEN` bigint(3) NOT NULL DEFAULT '0'
) ENGINE=MEMORY DEFAULT CHARSET=utf8
drop table t1;
# --
# -- Bug#21380: DEFAULT definition not always transfered by CREATE
# -- TABLE/SELECT to the new table.
# --
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
CREATE TABLE t1(
c1 INT DEFAULT 12 COMMENT 'column1',
c2 INT NULL COMMENT 'column2',
c3 INT NOT NULL COMMENT 'column3',
c4 VARCHAR(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
c5 VARCHAR(255) COLLATE utf8_unicode_ci NULL DEFAULT 'b',
c6 VARCHAR(255))
COLLATE ucs2_unicode_ci;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) DEFAULT '12' COMMENT 'column1',
`c2` int(11) DEFAULT NULL COMMENT 'column2',
`c3` int(11) NOT NULL COMMENT 'column3',
`c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
`c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b',
`c6` varchar(255) COLLATE ucs2_unicode_ci DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_unicode_ci
CREATE TABLE t2 AS SELECT * FROM t1;
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
`c1` int(11) DEFAULT '12' COMMENT 'column1',
`c2` int(11) DEFAULT NULL COMMENT 'column2',
`c3` int(11) NOT NULL COMMENT 'column3',
`c4` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT 'a',
`c5` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'b',
`c6` varchar(255) CHARACTER SET ucs2 COLLATE ucs2_unicode_ci DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t2;
# -- End of test case for Bug#21380.
End of 5.1 tests
mysql-test/r/grant.result
View file @
2a6ea13d
...
...
@@ -1235,8 +1235,8 @@ select col1 from test limit 1 into tmp;
return '1';
end|
create view v1 as select test.* from test where test.col1=test_function();
grant update (col1) on v1 to 'greg';
revoke all privileges on v1 from 'greg
';
grant update (col1) on v1 to 'greg'
@'localhost'
;
drop user 'greg'@'localhost
';
drop view v1;
drop table test;
drop function test_function;
...
...
@@ -1304,5 +1304,6 @@ CALL mysqltest1.test();
1
DROP DATABASE mysqltest1;
RENAME TABLE mysql.procs_gone TO mysql.procs_priv;
DROP USER mysqltest_1@localhost;
FLUSH PRIVILEGES;
End of 5.1 tests
mysql-test/r/show_check.result
View file @
2a6ea13d
...
...
@@ -1427,4 +1427,9 @@ DROP FUNCTION f1;
DROP TABLE t1;
DROP EVENT ev1;
SHOW TABLE TYPES;
CREATE USER test_u@localhost;
GRANT PROCESS ON *.* TO test_u@localhost;
SHOW ENGINE MYISAM MUTEX;
SHOW ENGINE MYISAM STATUS;
DROP USER test_u@localhost;
End of 5.1 tests
mysql-test/t/create.test
View file @
2a6ea13d
...
...
@@ -1341,4 +1341,48 @@ create table t1 like information_schema.character_sets;
show
create
table
t1
;
drop
table
t1
;
--
echo
--
echo
# --
--
echo
# -- Bug#21380: DEFAULT definition not always transfered by CREATE
--
echo
# -- TABLE/SELECT to the new table.
--
echo
# --
--
echo
--
disable_warnings
DROP
TABLE
IF
EXISTS
t1
;
DROP
TABLE
IF
EXISTS
t2
;
--
enable_warnings
--
echo
CREATE
TABLE
t1
(
c1
INT
DEFAULT
12
COMMENT
'column1'
,
c2
INT
NULL
COMMENT
'column2'
,
c3
INT
NOT
NULL
COMMENT
'column3'
,
c4
VARCHAR
(
255
)
CHARACTER
SET
utf8
NOT
NULL
DEFAULT
'a'
,
c5
VARCHAR
(
255
)
COLLATE
utf8_unicode_ci
NULL
DEFAULT
'b'
,
c6
VARCHAR
(
255
))
COLLATE
ucs2_unicode_ci
;
--
echo
SHOW
CREATE
TABLE
t1
;
--
echo
CREATE
TABLE
t2
AS
SELECT
*
FROM
t1
;
--
echo
SHOW
CREATE
TABLE
t2
;
--
echo
DROP
TABLE
t2
;
--
echo
--
echo
# -- End of test case for Bug#21380.
--
echo
--
echo
End
of
5.1
tests
mysql-test/t/grant.test
View file @
2a6ea13d
...
...
@@ -1282,8 +1282,8 @@ begin
end
|
delimiter
;
|
create
view
v1
as
select
test
.*
from
test
where
test
.
col1
=
test_function
();
grant
update
(
col1
)
on
v1
to
'greg'
;
revoke
all
privileges
on
v1
from
'greg
'
;
grant
update
(
col1
)
on
v1
to
'greg'
@
'localhost'
;
drop
user
'greg'
@
'localhost
'
;
drop
view
v1
;
drop
table
test
;
drop
function
test_function
;
...
...
@@ -1396,6 +1396,7 @@ GRANT ALL PRIVILEGES ON test.* TO mysqltest_1@localhost;
CALL
mysqltest1
.
test
();
DROP
DATABASE
mysqltest1
;
RENAME
TABLE
mysql
.
procs_gone
TO
mysql
.
procs_priv
;
DROP
USER
mysqltest_1
@
localhost
;
FLUSH
PRIVILEGES
;
...
...
mysql-test/t/lock_multi.test
View file @
2a6ea13d
...
...
@@ -446,7 +446,6 @@ drop table t1;
--
disable_warnings
drop
table
if
exists
t1
,
t2
;
--
enable_warnings
create
table
t1
(
a
int
);
flush
status
;
lock
tables
t1
read
;
...
...
mysql-test/t/show_check.test
View file @
2a6ea13d
...
...
@@ -1115,5 +1115,24 @@ DROP EVENT ev1;
SHOW
TABLE
TYPES
;
--
enable_result_log
#
# Bug #32710: SHOW INNODB STATUS requires SUPER
#
CREATE
USER
test_u
@
localhost
;
GRANT
PROCESS
ON
*.*
TO
test_u
@
localhost
;
connect
(
conn1
,
localhost
,
test_u
,,);
--
disable_result_log
SHOW
ENGINE
MYISAM
MUTEX
;
SHOW
ENGINE
MYISAM
STATUS
;
--
enable_result_log
disconnect
conn1
;
connection
default
;
DROP
USER
test_u
@
localhost
;
--
echo
End
of
5.1
tests
mysql-test/t/variables.test
View file @
2a6ea13d
...
...
@@ -141,9 +141,9 @@ set GLOBAL myisam_max_sort_file_size=2000000;
show
global
variables
like
'myisam_max_sort_file_size'
;
select
*
from
information_schema
.
global_variables
where
variable_name
like
'myisam_max_sort_file_size'
;
set
GLOBAL
myisam_max_sort_file_size
=
default
;
--
replace_result
2147483647
FILE_SIZE
922337203685372723
2
FILE_SIZE
--
replace_result
9223372036853727232
FILE_SIZE
214643507
2
FILE_SIZE
show
global
variables
like
'myisam_max_sort_file_size'
;
--
replace_result
2147483647
FILE_SIZE
922337203685372723
2
FILE_SIZE
--
replace_result
9223372036853727232
FILE_SIZE
214643507
2
FILE_SIZE
select
*
from
information_schema
.
global_variables
where
variable_name
like
'myisam_max_sort_file_size'
;
set
global
net_retry_count
=
10
,
session
net_retry_count
=
10
;
...
...
sql/sql_parse.cc
View file @
2a6ea13d
...
...
@@ -2271,14 +2271,14 @@ mysql_execute_command(THD *thd)
#endif
/* HAVE_REPLICATION */
case
SQLCOM_SHOW_ENGINE_STATUS
:
{
if
(
check_global_access
(
thd
,
SUPER
_ACL
))
if
(
check_global_access
(
thd
,
PROCESS
_ACL
))
goto
error
;
res
=
ha_show_status
(
thd
,
lex
->
create_info
.
db_type
,
HA_ENGINE_STATUS
);
break
;
}
case
SQLCOM_SHOW_ENGINE_MUTEX
:
{
if
(
check_global_access
(
thd
,
SUPER
_ACL
))
if
(
check_global_access
(
thd
,
PROCESS
_ACL
))
goto
error
;
res
=
ha_show_status
(
thd
,
lex
->
create_info
.
db_type
,
HA_ENGINE_MUTEX
);
break
;
...
...
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