Skip to content

M
MariaDB
Commit 35a0af31 authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files
Options

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
parents c2e71d18 6511b280
Show whitespace changes
Inline Side-by-side
Showing with 2540 additions and 2598 deletions
CMakeLists.txt
View file @ 35a0af31
...@@ -120,6 +120,9 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR ...@@ -120,6 +120,9 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG
${CMAKE_CXX_FLAGS_DEBUG}) ${CMAKE_CXX_FLAGS_DEBUG})
# generate map files
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
# remove support for Exception handling # remove support for Exception handling
STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
......
mysql-test/suite/funcs_1/datadict/datadict_load.inc
View file @ 35a0af31
...@@ -44,7 +44,8 @@ if (0) ...@@ -44,7 +44,8 @@ if (0)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# prepare a variable to be able to suppress machine dependant diffs # prepare a variable to be able to suppress machine dependant diffs
# this can be used in: --replace_result $SERVER_NAME <SERVER_NAME> # this can be used in: --replace_result $SERVER_NAME <SERVER_NAME>
let $SERVER_NAME= `SELECT DISTINCT host FROM mysql.user WHERE host LIKE "%\%" AND host NOT In ("localhost", "127.0.0.1", "%")`; # let $SERVER_NAME= `SELECT DISTINCT host FROM mysql.user WHERE host LIKE "%\%" AND host NOT In ("localhost", "127.0.0.1", "%")`;
let $SERVER_NAME= `SELECT DISTINCT host FROM mysql.user WHERE host NOT In ("localhost", "127.0.0.1", "%")`;
################################################################################ ################################################################################
......
mysql-test/suite/funcs_1/datadict/datadict_master.inc
View file @ 35a0af31
...@@ -105,7 +105,7 @@ SELECT DISTINCT u, ...@@ -105,7 +105,7 @@ SELECT DISTINCT u,
AS Server_Clean AS Server_Clean
FROM db_datadict.vu1; FROM db_datadict.vu1;
--replace_result $SERVER_NAME <SERVER_NAME> --replace_result $SERVER_NAME <SERVER_NAME>
SELECT * FROM db_datadict.vu; SELECT * FROM db_datadict.vu order by u;
delimiter //; delimiter //;
CREATE PROCEDURE db_datadict.sp_1() CREATE PROCEDURE db_datadict.sp_1()
...@@ -141,8 +141,9 @@ if ($have_bug_11589) ...@@ -141,8 +141,9 @@ if ($have_bug_11589)
# 13 DATA_FREE # 13 DATA_FREE
# 15 CREATE_TIME # 15 CREATE_TIME
# 16 UPDATE_TIME # 16 UPDATE_TIME
# 17 CHECK_TIME
# 20 CREATE_OPTIONS # 20 CREATE_OPTIONS
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 20 "#CO#" --replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss" 20 "#CO#"
SELECT * FROM tables SELECT * FROM tables
WHERE table_schema = 'information_schema'; WHERE table_schema = 'information_schema';
# 9 AVG_ROW_LENGTH # 9 AVG_ROW_LENGTH
...@@ -152,7 +153,8 @@ SELECT * FROM tables ...@@ -152,7 +153,8 @@ SELECT * FROM tables
# 13 DATA_FREE # 13 DATA_FREE
# 15 CREATE_TIME # 15 CREATE_TIME
# 16 UPDATE_TIME # 16 UPDATE_TIME
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" # 17 CHECK_TIME
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
SELECT * FROM tables SELECT * FROM tables
WHERE NOT( table_schema = 'information_schema'); WHERE NOT( table_schema = 'information_schema');
--horizontal_results --horizontal_results
...@@ -177,7 +179,7 @@ select count(*) from routines; ...@@ -177,7 +179,7 @@ select count(*) from routines;
select * from statistics; select * from statistics;
select * from views; select * from views;
--replace_result $SERVER_NAME <SERVER_NAME> --replace_result $SERVER_NAME <SERVER_NAME>
select * from user_privileges; select * from user_privileges order by grantee, privilege_type;
select * from schema_privileges; select * from schema_privileges;
select * from table_privileges; select * from table_privileges;
select * from column_privileges; select * from column_privileges;
...@@ -199,7 +201,8 @@ select concat("Table or view '", table_name, ...@@ -199,7 +201,8 @@ select concat("Table or view '", table_name,
--replace_result $SERVER_NAME <SERVER_NAME> --replace_result $SERVER_NAME <SERVER_NAME>
select grantee as "user's having select privilege", select grantee as "user's having select privilege",
substring( grantee, length(SUBSTRING_INDEX(grantee,_utf8'@',1))+2 ) substring( grantee, length(SUBSTRING_INDEX(grantee,_utf8'@',1))+2 )
from user_privileges where privilege_type = 'select'; from user_privileges where privilege_type = 'select'
order by grantee;
select all table_schema from schema_privileges limit 0,5; select all table_schema from schema_privileges limit 0,5;
...@@ -293,13 +296,14 @@ select * from information_schema.schemata ORDER BY 2 DESC; ...@@ -293,13 +296,14 @@ select * from information_schema.schemata ORDER BY 2 DESC;
# 13 DATA_FREE # 13 DATA_FREE
# 15 CREATE_TIME # 15 CREATE_TIME
# 16 UPDATE_TIME # 16 UPDATE_TIME
# 17 CHRCK_TIME
# 20 CREATE_OPTIONS # 20 CREATE_OPTIONS
if ($have_bug_11589) if ($have_bug_11589)
{ {
--disable_ps_protocol --disable_ps_protocol
} }
--vertical_results --vertical_results
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 20 "#CO#" --replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss" 20 "#CO#"
SELECT * FROM information_schema.tables SELECT * FROM information_schema.tables
WHERE table_schema = 'information_schema'; WHERE table_schema = 'information_schema';
# 9 AVG_ROW_LENGTH # 9 AVG_ROW_LENGTH
...@@ -309,7 +313,8 @@ SELECT * FROM information_schema.tables ...@@ -309,7 +313,8 @@ SELECT * FROM information_schema.tables
# 13 DATA_FREE # 13 DATA_FREE
# 15 CREATE_TIME # 15 CREATE_TIME
# 16 UPDATE_TIME # 16 UPDATE_TIME
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" # 17 CHRCK_TIME
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
SELECT * FROM information_schema.tables SELECT * FROM information_schema.tables
WHERE NOT( table_schema = 'information_schema'); WHERE NOT( table_schema = 'information_schema');
--horizontal_results --horizontal_results
...@@ -385,7 +390,7 @@ select concat(table_schema, ', ', table_name) "Table_info" ...@@ -385,7 +390,7 @@ select concat(table_schema, ', ', table_name) "Table_info"
from tables ORDER BY 1; from tables ORDER BY 1;
--replace_result $SERVER_NAME <SERVER_NAME> --replace_result $SERVER_NAME <SERVER_NAME>
select distinct grantee from user_privileges; select distinct grantee from user_privileges order by grantee, privilege_type;
select * from schema_privileges where table_catalog is null limit 0, 5; select * from schema_privileges where table_catalog is null limit 0, 5;
select * from table_privileges where grantee like '%r%' limit 0, 5; select * from table_privileges where grantee like '%r%' limit 0, 5;
...@@ -399,7 +404,7 @@ select * from schemata limit 0,5; ...@@ -399,7 +404,7 @@ select * from schemata limit 0,5;
--replace_result $SERVER_NAME <SERVER_NAME> --replace_result $SERVER_NAME <SERVER_NAME>
select distinct grantee from user_privileges; select distinct grantee from user_privileges;
--replace_result $SERVER_NAME <SERVER_NAME> --replace_result $SERVER_NAME <SERVER_NAME>
select all grantee from user_privileges; select all grantee from user_privileges order by grantee, privilege_type;
select id , character_set_name from collations order by id asc limit 10; select id , character_set_name from collations order by id asc limit 10;
...@@ -455,8 +460,9 @@ eval SELECT * ...@@ -455,8 +460,9 @@ eval SELECT *
LINES TERMINATED BY '\n' LINES TERMINATED BY '\n'
FROM information_schema.schemata FROM information_schema.schemata
WHERE schema_name LIKE 'db_%'; WHERE schema_name LIKE 'db_%';
# FIXME: why do we get different error numbers with and without OUTFILE ? # The above will fail with access error as long as
#FIXME this should fail! --error 1146 # BUBG#28181 - a regression introduced in 5.0.42 is not fixed
eval SELECT * eval SELECT *
FROM information_schema.schemata FROM information_schema.schemata
WHERE schema_name LIKE 'db_%'; WHERE schema_name LIKE 'db_%';
...@@ -469,7 +475,9 @@ eval SELECT * ...@@ -469,7 +475,9 @@ eval SELECT *
FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"'
LINES TERMINATED BY '\n' LINES TERMINATED BY '\n'
FROM schemata LIMIT 0, 5; FROM schemata LIMIT 0, 5;
# FIXME 3.2.1.2: why do we get different error numbers with and without OUTFILE ? # The above will fail with access error as long as
# BUBG#28181 - a regression introduced in 5.0.42 is not fixed
eval SELECT * eval SELECT *
FROM schemata LIMIT 0, 5; FROM schemata LIMIT 0, 5;
...@@ -479,8 +487,9 @@ eval SELECT * ...@@ -479,8 +487,9 @@ eval SELECT *
LINES TERMINATED BY '\n' LINES TERMINATED BY '\n'
FROM information_schema.schemata FROM information_schema.schemata
WHERE schema_name LIKE 'db_%'; WHERE schema_name LIKE 'db_%';
# FIXME: why do we get different error numbers with and without OUTFILE ? # The above will fail with access error as long as
#FIXME this should fail! --error 1146 # BUBG#28181 - a regression introduced in 5.0.42 is not fixed
eval SELECT * eval SELECT *
FROM information_schema.schemata FROM information_schema.schemata
WHERE schema_name LIKE 'db_%'; WHERE schema_name LIKE 'db_%';
...@@ -3014,12 +3023,13 @@ GRANT SELECT ON db_datadict.v3 to 'user_3'@'localhost'; ...@@ -3014,12 +3023,13 @@ GRANT SELECT ON db_datadict.v3 to 'user_3'@'localhost';
# 13 DATA_FREE # 13 DATA_FREE
# 15 CREATE_TIME # 15 CREATE_TIME
# 16 UPDATE_TIME # 16 UPDATE_TIME
# 17 CHECK_TIME
# 20 CREATE_OPTIONS # 20 CREATE_OPTIONS
if ($have_bug_11589) if ($have_bug_11589)
{ {
--disable_ps_protocol --disable_ps_protocol
} }
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 20 "#CO#" --replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss" 20 "#CO#"
SELECT * FROM information_schema.tables SELECT * FROM information_schema.tables
WHERE table_schema = 'information_schema'; WHERE table_schema = 'information_schema';
# 9 AVG_ROW_LENGTH # 9 AVG_ROW_LENGTH
...@@ -3029,7 +3039,8 @@ SELECT * FROM information_schema.tables ...@@ -3029,7 +3039,8 @@ SELECT * FROM information_schema.tables
# 13 DATA_FREE # 13 DATA_FREE
# 15 CREATE_TIME # 15 CREATE_TIME
# 16 UPDATE_TIME # 16 UPDATE_TIME
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" # 17 CHECK_TIME
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
SELECT * FROM information_schema.tables SELECT * FROM information_schema.tables
WHERE NOT( table_schema = 'information_schema'); WHERE NOT( table_schema = 'information_schema');
--enable_ps_protocol --enable_ps_protocol
...@@ -3049,12 +3060,13 @@ connect (user_12_2, localhost, user_2, , db_datadict); ...@@ -3049,12 +3060,13 @@ connect (user_12_2, localhost, user_2, , db_datadict);
# 13 DATA_FREE # 13 DATA_FREE
# 15 CREATE_TIME # 15 CREATE_TIME
# 16 UPDATE_TIME # 16 UPDATE_TIME
# 17 CHECK_TIME
# 20 CREATE_OPTIONS # 20 CREATE_OPTIONS
if ($have_bug_11589) if ($have_bug_11589)
{ {
--disable_ps_protocol --disable_ps_protocol
} }
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 20 "#CO#" --replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss" 20 "#CO#"
SELECT * FROM information_schema.tables SELECT * FROM information_schema.tables
WHERE table_schema = 'information_schema'; WHERE table_schema = 'information_schema';
# 9 AVG_ROW_LENGTH # 9 AVG_ROW_LENGTH
...@@ -3064,7 +3076,8 @@ SELECT * FROM information_schema.tables ...@@ -3064,7 +3076,8 @@ SELECT * FROM information_schema.tables
# 13 DATA_FREE # 13 DATA_FREE
# 15 CREATE_TIME # 15 CREATE_TIME
# 16 UPDATE_TIME # 16 UPDATE_TIME
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" # 17 CHECK_TIME
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
SELECT * FROM information_schema.tables SELECT * FROM information_schema.tables
WHERE NOT( table_schema = 'information_schema'); WHERE NOT( table_schema = 'information_schema');
--enable_ps_protocol --enable_ps_protocol
...@@ -3085,12 +3098,13 @@ connect (user_12_3, localhost, user_3, , db_datadict); ...@@ -3085,12 +3098,13 @@ connect (user_12_3, localhost, user_3, , db_datadict);
# 13 DATA_FREE # 13 DATA_FREE
# 15 CREATE_TIME # 15 CREATE_TIME
# 16 UPDATE_TIME # 16 UPDATE_TIME
# 17 CHECK_TIME
# 20 CREATE_OPTIONS # 20 CREATE_OPTIONS
if ($have_bug_11589) if ($have_bug_11589)
{ {
--disable_ps_protocol --disable_ps_protocol
} }
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 20 "#CO#" --replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss" 20 "#CO#"
SELECT * FROM information_schema.tables SELECT * FROM information_schema.tables
WHERE table_schema = 'information_schema'; WHERE table_schema = 'information_schema';
# 9 AVG_ROW_LENGTH # 9 AVG_ROW_LENGTH
...@@ -3100,7 +3114,8 @@ SELECT * FROM information_schema.tables ...@@ -3100,7 +3114,8 @@ SELECT * FROM information_schema.tables
# 13 DATA_FREE # 13 DATA_FREE
# 15 CREATE_TIME # 15 CREATE_TIME
# 16 UPDATE_TIME # 16 UPDATE_TIME
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" # 17 CHECK_TIME
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
SELECT * FROM information_schema.tables SELECT * FROM information_schema.tables
WHERE NOT( table_schema = 'information_schema'); WHERE NOT( table_schema = 'information_schema');
--enable_ps_protocol --enable_ps_protocol
...@@ -3121,12 +3136,13 @@ connection default; ...@@ -3121,12 +3136,13 @@ connection default;
# 13 DATA_FREE # 13 DATA_FREE
# 15 CREATE_TIME # 15 CREATE_TIME
# 16 UPDATE_TIME # 16 UPDATE_TIME
# 17 CHECK_TIME
# 20 CREATE_OPTIONS # 20 CREATE_OPTIONS
if ($have_bug_11589) if ($have_bug_11589)
{ {
--disable_ps_protocol --disable_ps_protocol
} }
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 20 "#CO#" --replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss" 20 "#CO#"
SELECT * FROM information_schema.tables SELECT * FROM information_schema.tables
WHERE table_schema = 'information_schema'; WHERE table_schema = 'information_schema';
# 9 AVG_ROW_LENGTH # 9 AVG_ROW_LENGTH
...@@ -3136,7 +3152,8 @@ SELECT * FROM information_schema.tables ...@@ -3136,7 +3152,8 @@ SELECT * FROM information_schema.tables
# 13 DATA_FREE # 13 DATA_FREE
# 15 CREATE_TIME # 15 CREATE_TIME
# 16 UPDATE_TIME # 16 UPDATE_TIME
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" # 17 CHECK_TIME
--replace_column 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "YYYY-MM-DD hh:mm:ss" 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
SELECT * FROM information_schema.tables SELECT * FROM information_schema.tables
WHERE NOT( table_schema = 'information_schema'); WHERE NOT( table_schema = 'information_schema');
--enable_ps_protocol --enable_ps_protocol
......
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
View file @ 35a0af31
...@@ -36,7 +36,7 @@ eval select table_name, index_schema, index_name, index_type ...@@ -36,7 +36,7 @@ eval select table_name, index_schema, index_name, index_type
--replace_result $SERVER_NAME <SERVER_NAME> --replace_result $SERVER_NAME <SERVER_NAME>
eval select * eval select *
from information_schema.user_privileges; from information_schema.user_privileges order by grantee, privilege_type;
# where grantee="'u_6_401013'@'%'"; # where grantee="'u_6_401013'@'%'";
eval select * eval select *
......
mysql-test/suite/funcs_1/r/a_version_check.result deleted 100644 → 0
View file @ c2e71d18
. Just show the version string for which the results in suite
. funcs_1 have been checked.
.
. I know that the .result file of this check needs to
. updated with each new version --- THIS IS INTENDED!
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
funcs_1 checked with version: 5.0.36
Warnings:
Warning 1466 Leading spaces are removed from name ' '
mysql-test/suite/funcs_1/r/innodb__datadict.result
View file @ 35a0af31
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/r/innodb_trig_08.result
View file @ 35a0af31
...@@ -484,8 +484,9 @@ BEGIN ...@@ -484,8 +484,9 @@ BEGIN
WHILE @counter1 < new.f136 WHILE @counter1 < new.f136
SET @counter1 = @counter1 + 1; SET @counter1 = @counter1 + 1;
END// END//
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHILE @counter1 < new.f136
END' at line 4 SET @counter1 = @counter1 + 1;
END' at line 3
delete from tb3 where f122='Test 3.5.8.5-while'; delete from tb3 where f122='Test 3.5.8.5-while';
drop trigger trg7; drop trigger trg7;
......
mysql-test/suite/funcs_1/r/innodb_views.result
View file @ 35a0af31
...@@ -448,7 +448,8 @@ SET @x=0; ...@@ -448,7 +448,8 @@ SET @x=0;
CREATE or REPLACE VIEW v1 AS Select 1 INTO @x; CREATE or REPLACE VIEW v1 AS Select 1 INTO @x;
ERROR HY000: View's SELECT contains a 'INTO' clause ERROR HY000: View's SELECT contains a 'INTO' clause
Select @x; Select @x;
ERROR HY000: View's SELECT contains a variable or parameter @x
0
CREATE or REPLACE VIEW v1 AS Select 1 CREATE or REPLACE VIEW v1 AS Select 1
FROM (SELECT 1 FROM t1) my_table; FROM (SELECT 1 FROM t1) my_table;
ERROR HY000: View's SELECT contains a subquery in the FROM clause ERROR HY000: View's SELECT contains a subquery in the FROM clause
...@@ -585,7 +586,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp ...@@ -585,7 +586,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
CREATE or REPLACE view v1 as Select f59, f60 CREATE or REPLACE view v1 as Select f59, f60
from tb2 by group f59 ; from tb2 by group f59 ;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by group f59' at line 2 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by group f59' at line 2
ERROR HY000: View's SELECT contains a variable or parameter
Testcase 3.3.1.5
--------------------------------------------------------------------------------
DROP VIEW IF EXISTS v1 ; DROP VIEW IF EXISTS v1 ;
CREATE VIEW v1 SELECT * FROM tb2 limit 100 ; CREATE VIEW v1 SELECT * FROM tb2 limit 100 ;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT * FROM tb2 limit 100' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT * FROM tb2 limit 100' at line 1
...@@ -605,7 +608,9 @@ CREATE VIEW v1 SELECT 1; ...@@ -605,7 +608,9 @@ CREATE VIEW v1 SELECT 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1' at line 1
CREATE VIEW v1 AS ; CREATE VIEW v1 AS ;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
ERROR HY000: View's SELECT contains a variable or parameter
Testcase 3.3.1.6
--------------------------------------------------------------------------------
DROP VIEW IF EXISTS v1 ; DROP VIEW IF EXISTS v1 ;
CREATE or REPLACE VIEW v1 CREATE or REPLACE VIEW v1
as SELECT * from tb2 limit 100 ; as SELECT * from tb2 limit 100 ;
...@@ -1790,7 +1795,9 @@ ERROR HY000: View's SELECT contains a subquery in the FROM clause ...@@ -1790,7 +1795,9 @@ ERROR HY000: View's SELECT contains a subquery in the FROM clause
SELECT * FROM test.v1 ; SELECT * FROM test.v1 ;
ERROR 42S02: Table 'test.v1' doesn't exist ERROR 42S02: Table 'test.v1' doesn't exist
Drop view if exists test.v1 ; Drop view if exists test.v1 ;
ERROR HY000: View's SELECT contains a variable or parameter
Testcase 3.3.1.40
--------------------------------------------------------------------------------
Drop view if exists test.v1 ; Drop view if exists test.v1 ;
Set @var1 = 'ABC' ; Set @var1 = 'ABC' ;
Set @var2 = 'XYZ' ; Set @var2 = 'XYZ' ;
...@@ -1799,7 +1806,9 @@ ERROR HY000: View's SELECT contains a variable or parameter ...@@ -1799,7 +1806,9 @@ ERROR HY000: View's SELECT contains a variable or parameter
CREATE VIEW test.v1 AS SELECT @@global.sort_buffer_size; CREATE VIEW test.v1 AS SELECT @@global.sort_buffer_size;
ERROR HY000: View's SELECT contains a variable or parameter ERROR HY000: View's SELECT contains a variable or parameter
Drop view if exists test.v1 ; Drop view if exists test.v1 ;
ERROR HY000: View's SELECT contains a variable or parameter
Testcase 3.3.1.41
--------------------------------------------------------------------------------
Drop view if exists test.v1 ; Drop view if exists test.v1 ;
Drop procedure if exists sp1 ; Drop procedure if exists sp1 ;
Create procedure sp1() DETERMINISTIC Create procedure sp1() DETERMINISTIC
...@@ -1816,7 +1825,9 @@ Warnings: ...@@ -1816,7 +1825,9 @@ Warnings:
Note 1051 Unknown table 'test.v1' Note 1051 Unknown table 'test.v1'
Drop procedure sp1 ; Drop procedure sp1 ;
ERROR 42000: PROCEDURE test.sp1 does not exist ERROR 42000: PROCEDURE test.sp1 does not exist
ERROR HY000: View's SELECT contains a variable or parameter
Testcase 3.3.1.42
--------------------------------------------------------------------------------
Drop VIEW if exists test.v1 ; Drop VIEW if exists test.v1 ;
CREATE TEMPORARY VIEW test.v1 AS CREATE TEMPORARY VIEW test.v1 AS
SELECT * FROM test.tb2 limit 2 ; SELECT * FROM test.tb2 limit 2 ;
...@@ -1828,7 +1839,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp ...@@ -1828,7 +1839,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
SELECT * FROM test.tb2 limit 2' at line 1 SELECT * FROM test.tb2 limit 2' at line 1
Drop view if exists test.v1 ; Drop view if exists test.v1 ;
Use test; Use test;
ERROR HY000: View's SELECT contains a variable or parameter
Testcase 3.3.1.43
--------------------------------------------------------------------------------
Drop view if exists test.v1 ; Drop view if exists test.v1 ;
CREATE VIEW test.v1 AS SELECT f59,f60 FROM test.tb2; CREATE VIEW test.v1 AS SELECT f59,f60 FROM test.tb2;
INSERT INTO test.v1 values(122,432); INSERT INTO test.v1 values(122,432);
......
mysql-test/suite/funcs_1/r/innodb_views.warnings deleted 100644 → 0
View file @ c2e71d18
mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3039: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3050: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
mysql-test/suite/funcs_1/r/memory__datadict.result
View file @ 35a0af31
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/r/memory_trig_08.result
View file @ 35a0af31
...@@ -480,8 +480,9 @@ BEGIN ...@@ -480,8 +480,9 @@ BEGIN
WHILE @counter1 < new.f136 WHILE @counter1 < new.f136
SET @counter1 = @counter1 + 1; SET @counter1 = @counter1 + 1;
END// END//
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHILE @counter1 < new.f136
END' at line 4 SET @counter1 = @counter1 + 1;
END' at line 3
delete from tb3 where f122='Test 3.5.8.5-while'; delete from tb3 where f122='Test 3.5.8.5-while';
drop trigger trg7; drop trigger trg7;
......
mysql-test/suite/funcs_1/r/memory_views.result
View file @ 35a0af31
...@@ -452,7 +452,8 @@ SET @x=0; ...@@ -452,7 +452,8 @@ SET @x=0;
CREATE or REPLACE VIEW v1 AS Select 1 INTO @x; CREATE or REPLACE VIEW v1 AS Select 1 INTO @x;
ERROR HY000: View's SELECT contains a 'INTO' clause ERROR HY000: View's SELECT contains a 'INTO' clause
Select @x; Select @x;
ERROR HY000: View's SELECT contains a variable or parameter @x
0
CREATE or REPLACE VIEW v1 AS Select 1 CREATE or REPLACE VIEW v1 AS Select 1
FROM (SELECT 1 FROM t1) my_table; FROM (SELECT 1 FROM t1) my_table;
ERROR HY000: View's SELECT contains a subquery in the FROM clause ERROR HY000: View's SELECT contains a subquery in the FROM clause
...@@ -589,7 +590,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp ...@@ -589,7 +590,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
CREATE or REPLACE view v1 as Select f59, f60 CREATE or REPLACE view v1 as Select f59, f60
from tb2 by group f59 ; from tb2 by group f59 ;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by group f59' at line 2 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by group f59' at line 2
ERROR HY000: View's SELECT contains a variable or parameter
Testcase 3.3.1.5
--------------------------------------------------------------------------------
DROP VIEW IF EXISTS v1 ; DROP VIEW IF EXISTS v1 ;
CREATE VIEW v1 SELECT * FROM tb2 limit 100 ; CREATE VIEW v1 SELECT * FROM tb2 limit 100 ;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT * FROM tb2 limit 100' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT * FROM tb2 limit 100' at line 1
...@@ -609,7 +612,9 @@ CREATE VIEW v1 SELECT 1; ...@@ -609,7 +612,9 @@ CREATE VIEW v1 SELECT 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1' at line 1
CREATE VIEW v1 AS ; CREATE VIEW v1 AS ;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
ERROR HY000: View's SELECT contains a variable or parameter
Testcase 3.3.1.6
--------------------------------------------------------------------------------
DROP VIEW IF EXISTS v1 ; DROP VIEW IF EXISTS v1 ;
CREATE or REPLACE VIEW v1 CREATE or REPLACE VIEW v1
as SELECT * from tb2 limit 100 ; as SELECT * from tb2 limit 100 ;
...@@ -1794,7 +1799,9 @@ ERROR HY000: View's SELECT contains a subquery in the FROM clause ...@@ -1794,7 +1799,9 @@ ERROR HY000: View's SELECT contains a subquery in the FROM clause
SELECT * FROM test.v1 ; SELECT * FROM test.v1 ;
ERROR 42S02: Table 'test.v1' doesn't exist ERROR 42S02: Table 'test.v1' doesn't exist
Drop view if exists test.v1 ; Drop view if exists test.v1 ;
ERROR HY000: View's SELECT contains a variable or parameter
Testcase 3.3.1.40
--------------------------------------------------------------------------------
Drop view if exists test.v1 ; Drop view if exists test.v1 ;
Set @var1 = 'ABC' ; Set @var1 = 'ABC' ;
Set @var2 = 'XYZ' ; Set @var2 = 'XYZ' ;
...@@ -1803,7 +1810,9 @@ ERROR HY000: View's SELECT contains a variable or parameter ...@@ -1803,7 +1810,9 @@ ERROR HY000: View's SELECT contains a variable or parameter
CREATE VIEW test.v1 AS SELECT @@global.sort_buffer_size; CREATE VIEW test.v1 AS SELECT @@global.sort_buffer_size;
ERROR HY000: View's SELECT contains a variable or parameter ERROR HY000: View's SELECT contains a variable or parameter
Drop view if exists test.v1 ; Drop view if exists test.v1 ;
ERROR HY000: View's SELECT contains a variable or parameter
Testcase 3.3.1.41
--------------------------------------------------------------------------------
Drop view if exists test.v1 ; Drop view if exists test.v1 ;
Drop procedure if exists sp1 ; Drop procedure if exists sp1 ;
Create procedure sp1() DETERMINISTIC Create procedure sp1() DETERMINISTIC
...@@ -1820,7 +1829,9 @@ Warnings: ...@@ -1820,7 +1829,9 @@ Warnings:
Note 1051 Unknown table 'test.v1' Note 1051 Unknown table 'test.v1'
Drop procedure sp1 ; Drop procedure sp1 ;
ERROR 42000: PROCEDURE test.sp1 does not exist ERROR 42000: PROCEDURE test.sp1 does not exist
ERROR HY000: View's SELECT contains a variable or parameter
Testcase 3.3.1.42
--------------------------------------------------------------------------------
Drop VIEW if exists test.v1 ; Drop VIEW if exists test.v1 ;
CREATE TEMPORARY VIEW test.v1 AS CREATE TEMPORARY VIEW test.v1 AS
SELECT * FROM test.tb2 limit 2 ; SELECT * FROM test.tb2 limit 2 ;
...@@ -1832,7 +1843,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp ...@@ -1832,7 +1843,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
SELECT * FROM test.tb2 limit 2' at line 1 SELECT * FROM test.tb2 limit 2' at line 1
Drop view if exists test.v1 ; Drop view if exists test.v1 ;
Use test; Use test;
ERROR HY000: View's SELECT contains a variable or parameter
Testcase 3.3.1.43
--------------------------------------------------------------------------------
Drop view if exists test.v1 ; Drop view if exists test.v1 ;
CREATE VIEW test.v1 AS SELECT f59,f60 FROM test.tb2; CREATE VIEW test.v1 AS SELECT f59,f60 FROM test.tb2;
INSERT INTO test.v1 values(122,432); INSERT INTO test.v1 values(122,432);
......
mysql-test/suite/funcs_1/r/memory_views.warnings deleted 100644 → 0
View file @ c2e71d18
mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3039: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3050: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
mysql-test/suite/funcs_1/r/myisam__datadict.result
View file @ 35a0af31
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/r/myisam_trig_08.result
View file @ 35a0af31
...@@ -484,8 +484,9 @@ BEGIN ...@@ -484,8 +484,9 @@ BEGIN
WHILE @counter1 < new.f136 WHILE @counter1 < new.f136
SET @counter1 = @counter1 + 1; SET @counter1 = @counter1 + 1;
END// END//
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHILE @counter1 < new.f136
END' at line 4 SET @counter1 = @counter1 + 1;
END' at line 3
delete from tb3 where f122='Test 3.5.8.5-while'; delete from tb3 where f122='Test 3.5.8.5-while';
drop trigger trg7; drop trigger trg7;
......
mysql-test/suite/funcs_1/r/myisam_views.warnings deleted 100644 → 0
View file @ c2e71d18
mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3039: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
mysqltest: Warning detected in included file ./suite/funcs_1/views/views_master.inc at line 3050: Suspicious command '--eror 1116' detected, was this intentional? Use # instead of -- to avoid this warning
mysql-test/suite/funcs_1/t/a_version_check.test deleted 100755 → 0
View file @ c2e71d18
#### suite/funcs_1/t/a_version_check.test
#
# just a simple check of the version to be sure the correct server version is
# checked against the funcs_1 tests.
# just show machine and version to be sure we are testing the correct files
#
let $message= . Just show the version string for which the results in suite
. funcs_1 have been checked.
.
. I know that the .result file of this check needs to
. updated with each new version --- THIS IS INTENDED!;
--source include/show_msg.inc
--disable_query_log
SELECT CONCAT('funcs_1 checked with version: ', SUBSTR(version(), 1, 6 ) ) AS " ";
#SELECT CONCAT('aa = ', 'bb');
#SELECT CONCAT('aa = ', 'bb') AS " ";
if (0)
{
# these more detailed results create differences between the OS.
# mioght be used later when we enable OS dependent .result files
--vertical_results
SELECT @@version_compile_os AS 'vers_comp_os', current_date;
SHOW VARIABLES LIKE 'vers%';
--horizontal_results
}
mysql-test/suite/funcs_1/t/disabled.def
View file @ 35a0af31
...@@ -10,6 +10,6 @@ ...@@ -10,6 +10,6 @@
# #
############################################################################## ##############################################################################
innodb_storedproc: switched off (too much changed output from WL#2984, needs to be checked) innodb_storedproc: (changes of WL#2984, using storeproc_nn instead)
memory_storedproc: switched off (too much changed output from WL#2984, needs to be checked) memory_storedproc: (changes of WL#2984, using storeproc_nn instead)
myisam_storedproc: switched off (too much changed output from WL#2984, needs to be checked) myisam_storedproc: (changes of WL#2984, using storeproc_nn instead)
mysql-test/suite/funcs_1/views/views_master.inc
View file @ 35a0af31
...@@ -3036,7 +3036,9 @@ let $sublevel= `SELECT @max_level`; ...@@ -3036,7 +3036,9 @@ let $sublevel= `SELECT @max_level`;
eval CREATE VIEW test1.v$level AS SELECT f1, f2 eval CREATE VIEW test1.v$level AS SELECT f1, f2
FROM test3.t1 tab1 NATURAL JOIN test1.v$sublevel tab2; FROM test3.t1 tab1 NATURAL JOIN test1.v$sublevel tab2;
eval SHOW CREATE VIEW test1.v$level; eval SHOW CREATE VIEW test1.v$level;
--eror 1116 # the following line as written as '--eror 1116' and the command
# is successful so assuming no expected error was intended
# --error 1116
eval SELECT CAST(f1 AS SIGNED INTEGER) AS f1, eval SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
CAST(f2 AS CHAR) AS f2 FROM test1.v$level; CAST(f2 AS CHAR) AS f2 FROM test1.v$level;
let $message= The output of following EXPLAIN is deactivated, because the result let $message= The output of following EXPLAIN is deactivated, because the result
...@@ -3047,7 +3049,9 @@ if (1) ...@@ -3047,7 +3049,9 @@ if (1)
{ {
--disable_result_log --disable_result_log
} }
--eror 1116 # the following line as written as '--eror 1116' and the command
# is successful so assuming no expected error was intended
# --error 1116
eval EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1, eval EXPLAIN SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
CAST(f2 AS CHAR) AS f2 FROM test1.v$level; CAST(f2 AS CHAR) AS f2 FROM test1.v$level;
if (1) if (1)
......
scripts/Makefile.am
View file @ 35a0af31
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
BUILT_SOURCES = mysql_fix_privilege_tables.sql \ BUILT_SOURCES = mysql_fix_privilege_tables.sql \
mysql_fix_privilege_tables_sql.c mysql_fix_privilege_tables_sql.c
noinst_PROGRAMS = comp_sql EXTRA_PROGRAMS = comp_sql
bin_SCRIPTS = @server_scripts@ \ bin_SCRIPTS = @server_scripts@ \
msql2mysql \ msql2mysql \
...@@ -70,6 +70,7 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \ ...@@ -70,6 +70,7 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \
mysqlaccess.conf \ mysqlaccess.conf \
mysqlbug \ mysqlbug \
make_win_bin_dist \ make_win_bin_dist \
mysql_fix_privilege_tables_sql.c \
mysql_system_tables_fix.sql \ mysql_system_tables_fix.sql \
CMakeLists.txt CMakeLists.txt
...@@ -98,13 +99,11 @@ CLEANFILES = @server_scripts@ \ ...@@ -98,13 +99,11 @@ CLEANFILES = @server_scripts@ \
mysql_tableinfo \ mysql_tableinfo \
mysql_upgrade_shell \ mysql_upgrade_shell \
mysqld_multi \ mysqld_multi \
make_win_src_distribution \ make_win_src_distribution
mysql_fix_privilege_tables.sql \
mysql_fix_privilege_tables_sql.c
# mysqlbug should be distributed built so that people can report build # mysqlbug should be distributed built so that people can report build
# failures with it. # failures with it.
DISTCLEANFILES = mysqlbug DISTCLEANFILES = $(BUILT_SOURCES) mysqlbug
# We want the right version and configure comand line in mysqlbug # We want the right version and configure comand line in mysqlbug
mysqlbug: ${top_builddir}/config.status mysqlbug.sh mysqlbug: ${top_builddir}/config.status mysqlbug.sh
...@@ -120,9 +119,12 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \ ...@@ -120,9 +119,12 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
# #
# Build mysql_fix_privilege_tables_sql.c from # Build mysql_fix_privilege_tables_sql.c from
# mysql_fix_privileges_tables.sql using comp_sql # mysql_fix_privileges_tables.sql using comp_sql
# The "sleep" ensures the generated file has a younger timestamp than its source
# (which may have been generated in this very same "make" run).
# #
mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT) $(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
sleep 2
$(top_builddir)/scripts/comp_sql$(EXEEXT) \ $(top_builddir)/scripts/comp_sql$(EXEEXT) \
mysql_fix_privilege_tables \ mysql_fix_privilege_tables \
$(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
......
support-files/mysql.spec.sh
View file @ 35a0af31
...@@ -534,7 +534,7 @@ fi ...@@ -534,7 +534,7 @@ fi
%doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_install_db.1 %doc %attr(644, root, man) %{_mandir}/man1/mysql_install_db.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7