Skip to content

M
MariaDB
Commit 5c6dec8d authored by unknown's avatar unknown
Browse files
Options

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

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
parents d8b693a3 70d440ac
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5477 additions and 5276 deletions
client/Makefile.am
View file @ 5c6dec8d
...@@ -109,13 +109,13 @@ link_sources: ...@@ -109,13 +109,13 @@ link_sources:
for f in $(sql_src) ; do \ for f in $(sql_src) ; do \
rm -f $$f; \ rm -f $$f; \
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
done; \ done; \
for f in $(strings_src) ; do \ for f in $(strings_src) ; do \
rm -f $(srcdir)/$$f; \ rm -f $(srcdir)/$$f; \
@LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \ @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
done; \ done; \
rm -f $(srcdir)/my_user.c; \ rm -f $(srcdir)/my_user.c; \
@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c; @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
echo timestamp > link_sources; echo timestamp > link_sources;
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
......
libmysqld/Makefile.am
View file @ 5c6dec8d
...@@ -190,11 +190,11 @@ link_sources: ...@@ -190,11 +190,11 @@ link_sources:
for f in $(sqlsources); do \ for f in $(sqlsources); do \
rm -f $$f; \ rm -f $$f; \
if test -e $(top_srcdir)/sql/$$f ; \ if test -e $(top_srcdir)/sql/$$f ; \
then \ then \
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
else \ else \
@LN_CP_F@ $(top_builddir)/sql/$$f $$f; \ @LN_CP_F@ $(top_builddir)/sql/$$f $$f; \
fi ; \ fi ; \
done; \ done; \
for f in $(libmysqlsources); do \ for f in $(libmysqlsources); do \
rm -f $$f; \ rm -f $$f; \
......
mysql-test/suite/funcs_1/datadict/datadict_load.inc
View file @ 5c6dec8d
...@@ -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_show_schema.inc
View file @ 5c6dec8d
...@@ -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 @ d8b693a3
. 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.1.17
Warnings:
Warning 1548 Leading spaces are removed from name ' '
mysql-test/suite/funcs_1/r/innodb__datadict.result
View file @ 5c6dec8d
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_0102.result
View file @ 5c6dec8d
...@@ -199,6 +199,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1 ...@@ -199,6 +199,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
for each row set new.f3 = '14'; for each row set new.f3 = '14';
CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
BEFORE UPDATE on test.t1 for each row set new.f3 = '42'; BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
insert into t1 (f2) values ('insert 3.5.1.7'); insert into t1 (f2) values ('insert 3.5.1.7');
select * from t1; select * from t1;
f1 f2 f3 f1 f2 f3
...@@ -213,6 +216,8 @@ trg5_1 ...@@ -213,6 +216,8 @@ trg5_1
trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
drop trigger trg5_1; drop trigger trg5_1;
drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ; drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
drop table t1; drop table t1;
Testcase 3.5.1.8: Testcase 3.5.1.8:
......
mysql-test/suite/funcs_1/r/innodb_trig_08.result
View file @ 5c6dec8d
...@@ -492,8 +492,9 @@ BEGIN ...@@ -492,8 +492,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 @ 5c6dec8d
...@@ -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 @ d8b693a3
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 @ 5c6dec8d
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_0102.result
View file @ 5c6dec8d
...@@ -195,6 +195,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1 ...@@ -195,6 +195,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
for each row set new.f3 = '14'; for each row set new.f3 = '14';
CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
BEFORE UPDATE on test.t1 for each row set new.f3 = '42'; BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
insert into t1 (f2) values ('insert 3.5.1.7'); insert into t1 (f2) values ('insert 3.5.1.7');
select * from t1; select * from t1;
f1 f2 f3 f1 f2 f3
...@@ -209,6 +212,8 @@ trg5_1 ...@@ -209,6 +212,8 @@ trg5_1
trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
drop trigger trg5_1; drop trigger trg5_1;
drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ; drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
drop table t1; drop table t1;
Testcase 3.5.1.8: Testcase 3.5.1.8:
......
mysql-test/suite/funcs_1/r/memory_trig_08.result
View file @ 5c6dec8d
...@@ -488,8 +488,9 @@ BEGIN ...@@ -488,8 +488,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 @ 5c6dec8d
...@@ -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 @ d8b693a3
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 @ 5c6dec8d
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_0102.result
View file @ 5c6dec8d
...@@ -199,6 +199,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1 ...@@ -199,6 +199,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
for each row set new.f3 = '14'; for each row set new.f3 = '14';
CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
BEFORE UPDATE on test.t1 for each row set new.f3 = '42'; BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
insert into t1 (f2) values ('insert 3.5.1.7'); insert into t1 (f2) values ('insert 3.5.1.7');
select * from t1; select * from t1;
f1 f2 f3 f1 f2 f3
...@@ -213,6 +216,8 @@ trg5_1 ...@@ -213,6 +216,8 @@ trg5_1
trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
drop trigger trg5_1; drop trigger trg5_1;
drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ; drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
drop table t1; drop table t1;
Testcase 3.5.1.8: Testcase 3.5.1.8:
......
mysql-test/suite/funcs_1/r/myisam_trig_08.result
View file @ 5c6dec8d
...@@ -492,8 +492,9 @@ BEGIN ...@@ -492,8 +492,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 @ d8b693a3
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/ndb__datadict.result
View file @ 5c6dec8d
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/r/ndb_trig_0102.result
View file @ 5c6dec8d
...@@ -132,7 +132,7 @@ f121 f122 f142 f144 f134 ...@@ -132,7 +132,7 @@ f121 f122 f142 f144 f134
Test 3.5.1.1 Before Update Trigger 27 0000000008 1 Test 3.5.1.1 Before Update Trigger 27 0000000008 1
select @test_before, @test_after; select @test_before, @test_after;
@test_before @test_after @test_before @test_after
2 2 2 1
drop trigger trg1_1; drop trigger trg1_1;
drop trigger trg1_2; drop trigger trg1_2;
drop trigger trg1_3; drop trigger trg1_3;
...@@ -200,6 +200,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1 ...@@ -200,6 +200,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
for each row set new.f3 = '14'; for each row set new.f3 = '14';
CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
BEFORE UPDATE on test.t1 for each row set new.f3 = '42'; BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
insert into t1 (f2) values ('insert 3.5.1.7'); insert into t1 (f2) values ('insert 3.5.1.7');
select * from t1; select * from t1;
f1 f2 f3 f1 f2 f3
...@@ -214,6 +217,8 @@ trg5_1 ...@@ -214,6 +217,8 @@ trg5_1
trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
drop trigger trg5_1; drop trigger trg5_1;
drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ; drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
drop table t1; drop table t1;
Testcase 3.5.1.8: Testcase 3.5.1.8:
......
mysql-test/suite/funcs_1/r/ndb_trig_08.result
View file @ 5c6dec8d
...@@ -493,8 +493,9 @@ BEGIN ...@@ -493,8 +493,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/ndb_views.result
View file @ 5c6dec8d
...@@ -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/t/a_version_check.test deleted 100644 → 0
View file @ d8b693a3
#### 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 @ 5c6dec8d
...@@ -10,7 +10,6 @@ ...@@ -10,7 +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/triggers/triggers_0102.inc
View file @ 5c6dec8d
...@@ -214,8 +214,14 @@ let $message= Testcase 3.5.1.7: - need to fix; ...@@ -214,8 +214,14 @@ let $message= Testcase 3.5.1.7: - need to fix;
eval create table t1 (f1 int, f2 char(25),f3 int) engine=$engine_type; eval create table t1 (f1 int, f2 char(25),f3 int) engine=$engine_type;
CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1 CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
for each row set new.f3 = '14'; for each row set new.f3 = '14';
# In 5.0 names to long (more than 64 chars) were trimed without an error
# In 5.1 an error is returned. So adding a call with the expected error
# and one with a shorter name to validate proper execution
--error 1059
CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
BEFORE UPDATE on test.t1 for each row set new.f3 = '42'; BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
insert into t1 (f2) values ('insert 3.5.1.7'); insert into t1 (f2) values ('insert 3.5.1.7');
select * from t1; select * from t1;
...@@ -227,8 +233,10 @@ let $message= Testcase 3.5.1.7: - need to fix; ...@@ -227,8 +233,10 @@ let $message= Testcase 3.5.1.7: - need to fix;
--disable_warnings --disable_warnings
--error 0, 1360 --error 0, 1360
drop trigger trg5_1; drop trigger trg5_1;
# The above trigger should be dropped since the name was trimmed. # In 5.1 the long name should generate an error that is to long
--error 1059
drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ; drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
drop table t1; drop table t1;
#Section 3.5.1.8 #Section 3.5.1.8
......
mysql-test/suite/funcs_1/views/views_master.inc
View file @ 5c6dec8d
...@@ -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)
......
netware/Makefile.am
View file @ 5c6dec8d
...@@ -98,20 +98,20 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def install_test_db.ncf \ ...@@ -98,20 +98,20 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def install_test_db.ncf \
# Build init_db.sql from the files that contain # Build init_db.sql from the files that contain
# the system tables for this version of MySQL plus any commands # the system tables for this version of MySQL plus any commands
init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \ init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \
$(top_srcdir)/scripts/mysql_system_tables_data.sql $(top_srcdir)/scripts/mysql_system_tables_data.sql
@echo "Building $@"; @echo "Building $@";
@echo "CREATE DATABASE mysql;" > $@; @echo "CREATE DATABASE mysql;" > $@;
@echo "CREATE DATABASE test;" >> $@; @echo "CREATE DATABASE test;" >> $@;
@echo "use mysql;" >> $@; @echo "use mysql;" >> $@;
@cat $(top_srcdir)/scripts/mysql_system_tables.sql \ @cat $(top_srcdir)/scripts/mysql_system_tables.sql \
$(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@; $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@;
# Build test_db.sql from init_db.sql plus # Build test_db.sql from init_db.sql plus
# some test data # some test data
test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql
@echo "Building $@"; @echo "Building $@";
@cat init_db.sql \ @cat init_db.sql \
$(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@; $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@;
endif endif
......
scripts/Makefile.am
View file @ 5c6dec8d
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
## Process this file with automake to create Makefile.in ## Process this file with automake to create Makefile.in
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 \
...@@ -62,6 +62,7 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \ ...@@ -62,6 +62,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
...@@ -87,13 +88,11 @@ CLEANFILES = @server_scripts@ \ ...@@ -87,13 +88,11 @@ CLEANFILES = @server_scripts@ \
mysqlhotcopy \ mysqlhotcopy \
mysqldumpslow \ mysqldumpslow \
mysql_tableinfo \ mysql_tableinfo \
mysqld_multi \ mysqld_multi
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
...@@ -109,11 +108,14 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \ ...@@ -109,11 +108,14 @@ 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 @ 5c6dec8d
...@@ -544,7 +544,7 @@ fi ...@@ -544,7 +544,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*
...@@ -650,7 +650,6 @@ fi ...@@ -650,7 +650,6 @@ fi
%attr(755, root, root) %{_bindir}/ndb_size.pl %attr(755, root, root) %{_bindir}/ndb_size.pl
%attr(755, root, root) %{_bindir}/ndb_test_platform %attr(755, root, root) %{_bindir}/ndb_test_platform
%attr(755, root, root) %{_bindir}/ndb_waiter %attr(755, root, root) %{_bindir}/ndb_waiter
%attr(-, root, root) %{_datadir}/mysql/ndb_size.tmpl
%doc %attr(644, root, man) %{_mandir}/man1/ndb_config.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_config.1*
%doc %attr(644, root, man) %{_mandir}/man1/ndb_desc.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_desc.1*
%doc %attr(644, root, man) %{_mandir}/man1/ndb_error_reporter.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_error_reporter.1*
...@@ -726,6 +725,11 @@ fi ...@@ -726,6 +725,11 @@ fi
# itself - note that they must be ordered by date (important when # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %changelog
* Wed May 02 2007 Joerg Bruehe <joerg@mysql.com>
- "ndb_size.tmpl" is not needed any more,
"man1/mysql_install_db.1" lacked the trailing '*'.
* Sat Apr 07 2007 Kent Boortz <kent@mysql.com> * Sat Apr 07 2007 Kent Boortz <kent@mysql.com>
- Removed man page for "mysql_create_system_tables" - Removed man page for "mysql_create_system_tables"
......
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