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
742af45d
Commit
742af45d
authored
Mar 13, 2005
by
joerg@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
parents
7f43cf21
536728c5
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
172 additions
and
11 deletions
+172
-11
innobase/row/row0sel.c
innobase/row/row0sel.c
+0
-6
mysql-test/include/system_db_struct.inc
mysql-test/include/system_db_struct.inc
+1
-0
mysql-test/r/information_schema.result
mysql-test/r/information_schema.result
+1
-1
mysql-test/r/join_outer.result
mysql-test/r/join_outer.result
+22
-0
mysql-test/r/query_cache.result
mysql-test/r/query_cache.result
+22
-0
mysql-test/r/system_mysql_db.result
mysql-test/r/system_mysql_db.result
+21
-0
mysql-test/t/join_outer.test
mysql-test/t/join_outer.test
+19
-0
mysql-test/t/query_cache.test
mysql-test/t/query_cache.test
+14
-0
scripts/mysql_create_system_tables.sh
scripts/mysql_create_system_tables.sh
+11
-1
scripts/mysql_fix_privilege_tables.sql
scripts/mysql_fix_privilege_tables.sql
+44
-2
scripts/mysqld_safe.sh
scripts/mysqld_safe.sh
+9
-0
sql/item_cmpfunc.h
sql/item_cmpfunc.h
+1
-0
sql/mysql_priv.h
sql/mysql_priv.h
+4
-0
sql/sql_table.cc
sql/sql_table.cc
+3
-1
No files found.
innobase/row/row0sel.c
View file @
742af45d
...
@@ -2352,16 +2352,10 @@ row_sel_store_mysql_rec(
...
@@ -2352,16 +2352,10 @@ row_sel_store_mysql_rec(
byte
*
blob_buf
;
byte
*
blob_buf
;
int
pad_char
;
int
pad_char
;
ulint
i
;
ulint
i
;
dict_index_t
*
index
;
ut_ad
(
prebuilt
->
mysql_template
);
ut_ad
(
prebuilt
->
mysql_template
);
ut_ad
(
rec_offs_validate
(
rec
,
NULL
,
offsets
));
ut_ad
(
rec_offs_validate
(
rec
,
NULL
,
offsets
));
index
=
prebuilt
->
index
;
if
(
prebuilt
->
need_to_access_clustered
)
{
index
=
dict_table_get_first_index
(
index
->
table
);
}
if
(
prebuilt
->
blob_heap
!=
NULL
)
{
if
(
prebuilt
->
blob_heap
!=
NULL
)
{
mem_heap_free
(
prebuilt
->
blob_heap
);
mem_heap_free
(
prebuilt
->
blob_heap
);
prebuilt
->
blob_heap
=
NULL
;
prebuilt
->
blob_heap
=
NULL
;
...
...
mysql-test/include/system_db_struct.inc
View file @
742af45d
...
@@ -11,3 +11,4 @@ show create table func;
...
@@ -11,3 +11,4 @@ show create table func;
show
create
table
tables_priv
;
show
create
table
tables_priv
;
show
create
table
columns_priv
;
show
create
table
columns_priv
;
show
create
table
procs_priv
;
show
create
table
procs_priv
;
show
create
table
proc
;
mysql-test/r/information_schema.result
View file @
742af45d
...
@@ -505,7 +505,7 @@ proc body blob
...
@@ -505,7 +505,7 @@ proc body blob
proc definer char(77)
proc definer char(77)
proc created timestamp
proc created timestamp
proc modified timestamp
proc modified timestamp
proc sql_mode set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO')
proc sql_mode set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO'
,'NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE'
)
proc comment char(64)
proc comment char(64)
drop table t115;
drop table t115;
create procedure p108 () begin declare c cursor for select data_type
create procedure p108 () begin declare c cursor for select data_type
...
...
mysql-test/r/join_outer.result
View file @
742af45d
...
@@ -889,3 +889,25 @@ a b a b
...
@@ -889,3 +889,25 @@ a b a b
2 2 2 2
2 2 2 2
NULL NULL 3 3
NULL NULL 3 3
DROP TABLE t0,t1,t2,t3;
DROP TABLE t0,t1,t2,t3;
CREATE TABLE t1 (a int PRIMARY KEY, b int);
CREATE TABLE t2 (a int PRIMARY KEY, b int);
INSERT INTO t1 VALUES (1,1), (2,1), (3,1), (4,2);
INSERT INTO t2 VALUES (1,2), (2,2);
SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a;
a b a b
1 1 1 2
2 1 2 2
3 1 NULL NULL
4 2 NULL NULL
SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a WHERE t1.b=1;
a b a b
1 1 1 2
2 1 2 2
3 1 NULL NULL
SELECT * FROM t1 LEFT JOIN t2 ON t1.a=t2.a
WHERE t1.b=1 XOR (NOT ISNULL(t2.a) AND t2.b=1);
a b a b
1 1 1 2
2 1 2 2
3 1 NULL NULL
DROP TABLE t1,t2;
mysql-test/r/query_cache.result
View file @
742af45d
...
@@ -957,3 +957,25 @@ drop table t1;
...
@@ -957,3 +957,25 @@ drop table t1;
select table_name from information_schema.tables
select table_name from information_schema.tables
where table_schema="test";
where table_schema="test";
table_name
table_name
SET SESSION query_cache_type = 1;
set global query_cache_size=1024*1024;
flush query cache;
create table t1 ( a int );
insert into t1 values (1);
select a from t1;
a
1
select a from t1;
a
1
show status like 'qcache_queries_in_cache';
Variable_name Value
Qcache_queries_in_cache 1
repair table t1;
Table Op Msg_type Msg_text
test.t1 repair status OK
show status like 'qcache_queries_in_cache';
Variable_name Value
Qcache_queries_in_cache 0
drop table t1;
set GLOBAL query_cache_size=0;
mysql-test/r/system_mysql_db.result
View file @
742af45d
...
@@ -154,5 +154,26 @@ procs_priv CREATE TABLE `procs_priv` (
...
@@ -154,5 +154,26 @@ procs_priv CREATE TABLE `procs_priv` (
PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`),
PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`),
KEY `Grantor` (`Grantor`)
KEY `Grantor` (`Grantor`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Procedure privileges'
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Procedure privileges'
show create table proc;
Table Create Table
proc CREATE TABLE `proc` (
`db` char(64) character set latin1 collate latin1_bin NOT NULL default '',
`name` char(64) NOT NULL default '',
`type` enum('FUNCTION','PROCEDURE') NOT NULL default 'FUNCTION',
`specific_name` char(64) NOT NULL default '',
`language` enum('SQL') NOT NULL default 'SQL',
`sql_data_access` enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA') NOT NULL default 'CONTAINS_SQL',
`is_deterministic` enum('YES','NO') NOT NULL default 'NO',
`security_type` enum('INVOKER','DEFINER') NOT NULL default 'DEFINER',
`param_list` blob NOT NULL,
`returns` char(64) NOT NULL default '',
`body` blob NOT NULL,
`definer` char(77) character set latin1 collate latin1_bin NOT NULL default '',
`created` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
`modified` timestamp NOT NULL default '0000-00-00 00:00:00',
`sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') NOT NULL default '',
`comment` char(64) character set latin1 collate latin1_bin NOT NULL default '',
PRIMARY KEY (`db`,`name`,`type`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Stored Procedures'
show tables;
show tables;
Tables_in_test
Tables_in_test
mysql-test/t/join_outer.test
View file @
742af45d
...
@@ -630,3 +630,22 @@ select * from t2 right join t1 on t2.a=t1.a;
...
@@ -630,3 +630,22 @@ select * from t2 right join t1 on t2.a=t1.a;
select
straight_join
*
from
t2
right
join
t1
on
t2
.
a
=
t1
.
a
;
select
straight_join
*
from
t2
right
join
t1
on
t2
.
a
=
t1
.
a
;
DROP
TABLE
t0
,
t1
,
t2
,
t3
;
DROP
TABLE
t0
,
t1
,
t2
,
t3
;
#
# Test for bug #9017: left join mistakingly converted to inner join
#
CREATE
TABLE
t1
(
a
int
PRIMARY
KEY
,
b
int
);
CREATE
TABLE
t2
(
a
int
PRIMARY
KEY
,
b
int
);
INSERT
INTO
t1
VALUES
(
1
,
1
),
(
2
,
1
),
(
3
,
1
),
(
4
,
2
);
INSERT
INTO
t2
VALUES
(
1
,
2
),
(
2
,
2
);
SELECT
*
FROM
t1
LEFT
JOIN
t2
ON
t1
.
a
=
t2
.
a
;
SELECT
*
FROM
t1
LEFT
JOIN
t2
ON
t1
.
a
=
t2
.
a
WHERE
t1
.
b
=
1
;
SELECT
*
FROM
t1
LEFT
JOIN
t2
ON
t1
.
a
=
t2
.
a
WHERE
t1
.
b
=
1
XOR
(
NOT
ISNULL
(
t2
.
a
)
AND
t2
.
b
=
1
);
DROP
TABLE
t1
,
t2
;
mysql-test/t/query_cache.test
View file @
742af45d
...
@@ -697,3 +697,17 @@ where table_schema="test";
...
@@ -697,3 +697,17 @@ where table_schema="test";
drop
table
t1
;
drop
table
t1
;
select
table_name
from
information_schema
.
tables
select
table_name
from
information_schema
.
tables
where
table_schema
=
"test"
;
where
table_schema
=
"test"
;
# Bug #8480: REPAIR TABLE needs to flush the table from the query cache
SET
SESSION
query_cache_type
=
1
;
set
global
query_cache_size
=
1024
*
1024
;
flush
query
cache
;
create
table
t1
(
a
int
);
insert
into
t1
values
(
1
);
select
a
from
t1
;
select
a
from
t1
;
show
status
like
'qcache_queries_in_cache'
;
repair
table
t1
;
show
status
like
'qcache_queries_in_cache'
;
drop
table
t1
;
set
GLOBAL
query_cache_size
=
0
;
scripts/mysql_create_system_tables.sh
View file @
742af45d
...
@@ -702,7 +702,17 @@ then
...
@@ -702,7 +702,17 @@ then
c_p
=
"
$c_p
'MYSQL323',"
c_p
=
"
$c_p
'MYSQL323',"
c_p
=
"
$c_p
'MYSQL40',"
c_p
=
"
$c_p
'MYSQL40',"
c_p
=
"
$c_p
'ANSI',"
c_p
=
"
$c_p
'ANSI',"
c_p
=
"
$c_p
'NO_AUTO_VALUE_ON_ZERO'"
c_p
=
"
$c_p
'NO_AUTO_VALUE_ON_ZERO',"
c_p
=
"
$c_p
'NO_BACKSLASH_ESCAPES',"
c_p
=
"
$c_p
'STRICT_TRANS_TABLES',"
c_p
=
"
$c_p
'STRICT_ALL_TABLES',"
c_p
=
"
$c_p
'NO_ZERO_IN_DATE',"
c_p
=
"
$c_p
'NO_ZERO_DATE',"
c_p
=
"
$c_p
'INVALID_DATES',"
c_p
=
"
$c_p
'ERROR_FOR_DIVISION_BY_ZERO',"
c_p
=
"
$c_p
'TRADITIONAL',"
c_p
=
"
$c_p
'NO_AUTO_CREATE_USER',"
c_p
=
"
$c_p
'HIGH_NOT_PRECEDENCE'"
c_p
=
"
$c_p
) DEFAULT 0 NOT NULL,"
c_p
=
"
$c_p
) DEFAULT 0 NOT NULL,"
c_p
=
"
$c_p
comment char(64) binary DEFAULT '' NOT NULL,"
c_p
=
"
$c_p
comment char(64) binary DEFAULT '' NOT NULL,"
c_p
=
"
$c_p
PRIMARY KEY (db,name,type)"
c_p
=
"
$c_p
PRIMARY KEY (db,name,type)"
...
...
scripts/mysql_fix_privilege_tables.sql
View file @
742af45d
...
@@ -422,7 +422,17 @@ CREATE TABLE IF NOT EXISTS proc (
...
@@ -422,7 +422,17 @@ CREATE TABLE IF NOT EXISTS proc (
'
MYSQL323
',
'
MYSQL323
',
'
MYSQL40
',
'
MYSQL40
',
'
ANSI
',
'
ANSI
',
'
NO_AUTO_VALUE_ON_ZERO
'
'
NO_AUTO_VALUE_ON_ZERO
',
'
NO_BACKSLASH_ESCAPES
',
'
STRICT_TRANS_TABLES
',
'
STRICT_ALL_TABLES
',
'
NO_ZERO_IN_DATE
',
'
NO_ZERO_DATE
',
'
INVALID_DATES
',
'
ERROR_FOR_DIVISION_BY_ZERO
',
'
TRADITIONAL
',
'
NO_AUTO_CREATE_USER
',
'
HIGH_NOT_PRECEDENCE
'
) DEFAULT 0 NOT NULL,
) DEFAULT 0 NOT NULL,
comment char(64) binary DEFAULT
''
NOT NULL,
comment char(64) binary DEFAULT
''
NOT NULL,
PRIMARY KEY (db,name,type)
PRIMARY KEY (db,name,type)
...
@@ -436,4 +446,36 @@ ALTER TABLE proc MODIFY name char(64) DEFAULT '' NOT NULL,
...
@@ -436,4 +446,36 @@ ALTER TABLE proc MODIFY name char(64) DEFAULT '' NOT NULL,
'
NO_SQL
',
'
NO_SQL
',
'
READS_SQL_DATA
',
'
READS_SQL_DATA
',
'
MODIFIES_SQL_DATA
'
'
MODIFIES_SQL_DATA
'
) DEFAULT '
CONTAINS_SQL
' NOT NULL;
) DEFAULT '
CONTAINS_SQL
' NOT NULL,
MODIFY sql_mode
set('
REAL_AS_FLOAT
',
'
PIPES_AS_CONCAT
',
'
ANSI_QUOTES
',
'
IGNORE_SPACE
',
'
NOT_USED
',
'
ONLY_FULL_GROUP_BY
',
'
NO_UNSIGNED_SUBTRACTION
',
'
NO_DIR_IN_CREATE
',
'
POSTGRESQL
',
'
ORACLE
',
'
MSSQL
',
'
DB2
',
'
MAXDB
',
'
NO_KEY_OPTIONS
',
'
NO_TABLE_OPTIONS
',
'
NO_FIELD_OPTIONS
',
'
MYSQL323
',
'
MYSQL40
',
'
ANSI
',
'
NO_AUTO_VALUE_ON_ZERO
',
'
NO_BACKSLASH_ESCAPES
',
'
STRICT_TRANS_TABLES
',
'
STRICT_ALL_TABLES
',
'
NO_ZERO_IN_DATE
',
'
NO_ZERO_DATE
',
'
INVALID_DATES
',
'
ERROR_FOR_DIVISION_BY_ZERO
',
'
TRADITIONAL
',
'
NO_AUTO_CREATE_USER
',
'
HIGH_NOT_PRECEDENCE
'
) DEFAULT 0 NOT NULL;
scripts/mysqld_safe.sh
View file @
742af45d
...
@@ -194,6 +194,15 @@ parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysq
...
@@ -194,6 +194,15 @@ parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysq
parse_arguments PICK-ARGS-FROM-ARGV
"
$@
"
parse_arguments PICK-ARGS-FROM-ARGV
"
$@
"
safe_mysql_unix_port
=
${
mysql_unix_port
:-${
MYSQL_UNIX_PORT
:-
@MYSQL_UNIX_ADDR@
}}
safe_mysql_unix_port
=
${
mysql_unix_port
:-${
MYSQL_UNIX_PORT
:-
@MYSQL_UNIX_ADDR@
}}
# Make sure that directory for $safe_mysql_unix_port exists
mysql_unix_port_dir
=
`
dirname
$safe_mysql_unix_port
`
if
[
!
-d
$mysql_unix_port_dir
]
then
mkdir
$mysql_unix_port_dir
chown
$user
$mysql_unix_port_dir
fi
if
test
!
-x
$ledir
/
$MYSQLD
if
test
!
-x
$ledir
/
$MYSQLD
then
then
echo
"The file
$ledir
/
$MYSQLD
doesn't exist or is not executable"
echo
"The file
$ledir
/
$MYSQLD
doesn't exist or is not executable"
...
...
sql/item_cmpfunc.h
View file @
742af45d
...
@@ -1234,6 +1234,7 @@ class Item_cond_xor :public Item_cond
...
@@ -1234,6 +1234,7 @@ class Item_cond_xor :public Item_cond
enum
Type
type
()
const
{
return
FUNC_ITEM
;
}
enum
Type
type
()
const
{
return
FUNC_ITEM
;
}
longlong
val_int
();
longlong
val_int
();
const
char
*
func_name
()
const
{
return
"xor"
;
}
const
char
*
func_name
()
const
{
return
"xor"
;
}
table_map
not_null_tables
()
const
{
return
and_tables_cache
;
}
};
};
...
...
sql/mysql_priv.h
View file @
742af45d
...
@@ -299,6 +299,10 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset;
...
@@ -299,6 +299,10 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset;
use strictly more than 64 bits by adding one more define above, you should
use strictly more than 64 bits by adding one more define above, you should
contact the replication team because the replication code should then be
contact the replication team because the replication code should then be
updated (to store more bytes on disk).
updated (to store more bytes on disk).
NOTE: When adding new SQL_MODE types, make sure to also add them to
../scripts/mysql_create_system_tables.sh and
../scripts/mysql_fix_privilege_tables.sql
*/
*/
#define RAID_BLOCK_SIZE 1024
#define RAID_BLOCK_SIZE 1024
...
...
sql/sql_table.cc
View file @
742af45d
...
@@ -2144,7 +2144,9 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
...
@@ -2144,7 +2144,9 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
thd
->
exit_cond
(
old_message
);
thd
->
exit_cond
(
old_message
);
if
(
thd
->
killed
)
if
(
thd
->
killed
)
goto
err
;
goto
err
;
open_for_modify
=
0
;
/* Flush entries in the query cache involving this table. */
query_cache_invalidate3
(
thd
,
table
->
table
,
0
);
open_for_modify
=
0
;
}
}
result_code
=
(
table
->
table
->
file
->*
operator_func
)(
thd
,
check_opt
);
result_code
=
(
table
->
table
->
file
->*
operator_func
)(
thd
,
check_opt
);
...
...
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