mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge mysql.com:/home/kent/bk/mysql-5.0-release-merge
into mysql.com:/home/kent/bk/mysql-5.1 BUILD/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/std_data/funcs_1/innodb_tb1.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb2.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb3.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb4.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb1.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb2.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb3.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb4.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb1.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb2.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb3.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb4.txt: Auto merged mysql-test/std_data/funcs_1/t3.txt: Auto merged mysql-test/std_data/funcs_1/t4.txt: Auto merged mysql-test/std_data/funcs_1/t7.txt: Auto merged mysql-test/std_data/funcs_1/t9.txt: Auto merged mysql-test/suite/funcs_1/README.txt: Auto merged mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc: Auto merged mysql-test/suite/funcs_1/datadict/datadict_load.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/sp_tb.inc: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_03.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_frkey.result: Auto merged mysql-test/suite/funcs_1/r/innodb_views.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_innodb.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_memory.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_myisam.result: Auto merged mysql-test/suite/funcs_1/r/is_tables_ndb.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_03.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/r/memory_views.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_03.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc: Auto merged mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_02.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_03.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_06.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_10.inc: Auto merged mysql-test/suite/funcs_1/t/innodb_trig_0407.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_02.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_03.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_06.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_07.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_08.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_10.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_02.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_03.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_06.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_07.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_08.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_10.test: Auto merged mysql-test/suite/funcs_1/triggers/trig_frkey2.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_0102.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_03.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_0407.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_08.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_09.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc: Auto merged mysql-test/suite/funcs_1/views/func_view.inc: Auto merged mysql-test/suite/funcs_1/views/views_master.inc: Auto merged
This commit is contained in:
unknown
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -4410,23 +4410,23 @@ CREATE TABLE t1 (f1 BIGINT);
|
|||||||
INSERT INTO t1 VALUES(1);
|
INSERT INTO t1 VALUES(1);
|
||||||
CREATE VIEW test.v1 AS SELECT * FROM t1 limit 2;
|
CREATE VIEW test.v1 AS SELECT * FROM t1 limit 2;
|
||||||
SHOW CREATE VIEW test.v1;
|
SHOW CREATE VIEW test.v1;
|
||||||
View Create View character_set_client collation_connection
|
View Create View
|
||||||
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` limit 2 latin1 latin1_swedish_ci
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` limit 2
|
||||||
SELECT * FROM test.v1;
|
SELECT * FROM test.v1;
|
||||||
f1
|
f1
|
||||||
1
|
1
|
||||||
CREATE OR REPLACE ALGORITHM = TEMPTABLE VIEW test.v1
|
CREATE OR REPLACE ALGORITHM = TEMPTABLE VIEW test.v1
|
||||||
AS SELECT * FROM t1 limit 2;
|
AS SELECT * FROM t1 limit 2;
|
||||||
SHOW CREATE VIEW test.v1;
|
SHOW CREATE VIEW test.v1;
|
||||||
View Create View character_set_client collation_connection
|
View Create View
|
||||||
v1 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` limit 2 latin1 latin1_swedish_ci
|
v1 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` limit 2
|
||||||
SELECT * FROM test.v1;
|
SELECT * FROM test.v1;
|
||||||
f1
|
f1
|
||||||
1
|
1
|
||||||
CREATE OR REPLACE VIEW test.v1 AS SELECT * FROM tb2 order by f59 limit 2;
|
CREATE OR REPLACE VIEW test.v1 AS SELECT * FROM tb2 order by f59 limit 2;
|
||||||
SHOW CREATE VIEW test.v1;
|
SHOW CREATE VIEW test.v1;
|
||||||
View Create View character_set_client collation_connection
|
View Create View
|
||||||
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `f59`,`tb2`.`f60` AS `f60`,`tb2`.`f61` AS `f61`,`tb2`.`f62` AS `f62`,`tb2`.`f63` AS `f63`,`tb2`.`f64` AS `f64`,`tb2`.`f65` AS `f65`,`tb2`.`f66` AS `f66`,`tb2`.`f67` AS `f67`,`tb2`.`f68` AS `f68`,`tb2`.`f69` AS `f69`,`tb2`.`f70` AS `f70`,`tb2`.`f71` AS `f71`,`tb2`.`f72` AS `f72`,`tb2`.`f73` AS `f73`,`tb2`.`f74` AS `f74`,`tb2`.`f75` AS `f75`,`tb2`.`f76` AS `f76`,`tb2`.`f77` AS `f77`,`tb2`.`f78` AS `f78`,`tb2`.`f79` AS `f79`,`tb2`.`f80` AS `f80`,`tb2`.`f81` AS `f81`,`tb2`.`f82` AS `f82`,`tb2`.`f83` AS `f83`,`tb2`.`f84` AS `f84`,`tb2`.`f85` AS `f85`,`tb2`.`f86` AS `f86`,`tb2`.`f87` AS `f87`,`tb2`.`f88` AS `f88`,`tb2`.`f89` AS `f89`,`tb2`.`f90` AS `f90`,`tb2`.`f91` AS `f91`,`tb2`.`f92` AS `f92`,`tb2`.`f93` AS `f93`,`tb2`.`f94` AS `f94`,`tb2`.`f95` AS `f95`,`tb2`.`f96` AS `f96`,`tb2`.`f97` AS `f97`,`tb2`.`f98` AS `f98`,`tb2`.`f99` AS `f99`,`tb2`.`f100` AS `f100`,`tb2`.`f101` AS `f101`,`tb2`.`f102` AS `f102`,`tb2`.`f103` AS `f103`,`tb2`.`f104` AS `f104`,`tb2`.`f105` AS `f105`,`tb2`.`f106` AS `f106`,`tb2`.`f107` AS `f107`,`tb2`.`f108` AS `f108`,`tb2`.`f109` AS `f109`,`tb2`.`f110` AS `f110`,`tb2`.`f111` AS `f111`,`tb2`.`f112` AS `f112`,`tb2`.`f113` AS `f113`,`tb2`.`f114` AS `f114`,`tb2`.`f115` AS `f115`,`tb2`.`f116` AS `f116`,`tb2`.`f117` AS `f117` from `tb2` order by `tb2`.`f59` limit 2 latin1 latin1_swedish_ci
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `f59`,`tb2`.`f60` AS `f60`,`tb2`.`f61` AS `f61`,`tb2`.`f62` AS `f62`,`tb2`.`f63` AS `f63`,`tb2`.`f64` AS `f64`,`tb2`.`f65` AS `f65`,`tb2`.`f66` AS `f66`,`tb2`.`f67` AS `f67`,`tb2`.`f68` AS `f68`,`tb2`.`f69` AS `f69`,`tb2`.`f70` AS `f70`,`tb2`.`f71` AS `f71`,`tb2`.`f72` AS `f72`,`tb2`.`f73` AS `f73`,`tb2`.`f74` AS `f74`,`tb2`.`f75` AS `f75`,`tb2`.`f76` AS `f76`,`tb2`.`f77` AS `f77`,`tb2`.`f78` AS `f78`,`tb2`.`f79` AS `f79`,`tb2`.`f80` AS `f80`,`tb2`.`f81` AS `f81`,`tb2`.`f82` AS `f82`,`tb2`.`f83` AS `f83`,`tb2`.`f84` AS `f84`,`tb2`.`f85` AS `f85`,`tb2`.`f86` AS `f86`,`tb2`.`f87` AS `f87`,`tb2`.`f88` AS `f88`,`tb2`.`f89` AS `f89`,`tb2`.`f90` AS `f90`,`tb2`.`f91` AS `f91`,`tb2`.`f92` AS `f92`,`tb2`.`f93` AS `f93`,`tb2`.`f94` AS `f94`,`tb2`.`f95` AS `f95`,`tb2`.`f96` AS `f96`,`tb2`.`f97` AS `f97`,`tb2`.`f98` AS `f98`,`tb2`.`f99` AS `f99`,`tb2`.`f100` AS `f100`,`tb2`.`f101` AS `f101`,`tb2`.`f102` AS `f102`,`tb2`.`f103` AS `f103`,`tb2`.`f104` AS `f104`,`tb2`.`f105` AS `f105`,`tb2`.`f106` AS `f106`,`tb2`.`f107` AS `f107`,`tb2`.`f108` AS `f108`,`tb2`.`f109` AS `f109`,`tb2`.`f110` AS `f110`,`tb2`.`f111` AS `f111`,`tb2`.`f112` AS `f112`,`tb2`.`f113` AS `f113`,`tb2`.`f114` AS `f114`,`tb2`.`f115` AS `f115`,`tb2`.`f116` AS `f116`,`tb2`.`f117` AS `f117` from `tb2` order by `tb2`.`f59` limit 2
|
||||||
SELECT * FROM test.v1 order by f59,f60,f61,f62,f63,f64,f65;
|
SELECT * FROM test.v1 order by f59,f60,f61,f62,f63,f64,f65;
|
||||||
f59 1
|
f59 1
|
||||||
f60 1
|
f60 1
|
||||||
@ -4548,8 +4548,8 @@ f116 <00> <00> @ @ @ @
|
|||||||
f117 <00> <00> 4@ <00> 4@ 4@ <00> 4@ <00> <00> @ @ @ @ @ @ @ @ @ @
|
f117 <00> <00> 4@ <00> 4@ 4@ <00> 4@ <00> <00> @ @ @ @ @ @ @ @ @ @
|
||||||
CREATE OR REPLACE VIEW test.v1 AS SELECT F59 FROM tb2;
|
CREATE OR REPLACE VIEW test.v1 AS SELECT F59 FROM tb2;
|
||||||
SHOW CREATE VIEW test.v1;
|
SHOW CREATE VIEW test.v1;
|
||||||
View Create View character_set_client collation_connection
|
View Create View
|
||||||
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `F59` from `tb2` latin1 latin1_swedish_ci
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `F59` from `tb2`
|
||||||
SELECT * FROM test.v1 order by F59 limit 10,100;
|
SELECT * FROM test.v1 order by F59 limit 10,100;
|
||||||
F59
|
F59
|
||||||
10
|
10
|
||||||
@ -4626,38 +4626,38 @@ CREATE TABLE t1 (f1 NUMERIC(15,3));
|
|||||||
INSERT INTO t1 VALUES(8.8);
|
INSERT INTO t1 VALUES(8.8);
|
||||||
CREATE VIEW v1 AS SELECT * FROM t1;
|
CREATE VIEW v1 AS SELECT * FROM t1;
|
||||||
SHOW CREATE VIEW v1;
|
SHOW CREATE VIEW v1;
|
||||||
View Create View character_set_client collation_connection
|
View Create View
|
||||||
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` latin1 latin1_swedish_ci
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`
|
||||||
SELECT * FROM v1;
|
SELECT * FROM v1;
|
||||||
f1
|
f1
|
||||||
8.800
|
8.800
|
||||||
CREATE OR REPLACE VIEW v1 AS SELECT f1 FROM t1;
|
CREATE OR REPLACE VIEW v1 AS SELECT f1 FROM t1;
|
||||||
SHOW CREATE VIEW v1;
|
SHOW CREATE VIEW v1;
|
||||||
View Create View character_set_client collation_connection
|
View Create View
|
||||||
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` latin1 latin1_swedish_ci
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`
|
||||||
SELECT * FROM v1;
|
SELECT * FROM v1;
|
||||||
f1
|
f1
|
||||||
8.800
|
8.800
|
||||||
CREATE OR REPLACE VIEW v1 AS SELECT f1 As my_column FROM t1;
|
CREATE OR REPLACE VIEW v1 AS SELECT f1 As my_column FROM t1;
|
||||||
SHOW CREATE VIEW v1;
|
SHOW CREATE VIEW v1;
|
||||||
View Create View character_set_client collation_connection
|
View Create View
|
||||||
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `my_column` from `t1` latin1 latin1_swedish_ci
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `my_column` from `t1`
|
||||||
SELECT * FROM v1;
|
SELECT * FROM v1;
|
||||||
my_column
|
my_column
|
||||||
8.800
|
8.800
|
||||||
CREATE OR REPLACE VIEW v1(column1,column2)
|
CREATE OR REPLACE VIEW v1(column1,column2)
|
||||||
AS SELECT f1 As my_column, f1 FROM t1;
|
AS SELECT f1 As my_column, f1 FROM t1;
|
||||||
SHOW CREATE VIEW v1;
|
SHOW CREATE VIEW v1;
|
||||||
View Create View character_set_client collation_connection
|
View Create View
|
||||||
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `column1`,`t1`.`f1` AS `column2` from `t1` latin1 latin1_swedish_ci
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `column1`,`t1`.`f1` AS `column2` from `t1`
|
||||||
SELECT * FROM v1;
|
SELECT * FROM v1;
|
||||||
column1 column2
|
column1 column2
|
||||||
8.800 8.800
|
8.800 8.800
|
||||||
CREATE OR REPLACE VIEW test.v1(column1,column2)
|
CREATE OR REPLACE VIEW test.v1(column1,column2)
|
||||||
AS SELECT f1 As my_column, f1 FROM test.t1;
|
AS SELECT f1 As my_column, f1 FROM test.t1;
|
||||||
SHOW CREATE VIEW v1;
|
SHOW CREATE VIEW v1;
|
||||||
View Create View character_set_client collation_connection
|
View Create View
|
||||||
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `column1`,`t1`.`f1` AS `column2` from `t1` latin1 latin1_swedish_ci
|
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `column1`,`t1`.`f1` AS `column2` from `t1`
|
||||||
SELECT * FROM v1;
|
SELECT * FROM v1;
|
||||||
column1 column2
|
column1 column2
|
||||||
8.800 8.800
|
8.800 8.800
|
||||||
@ -8829,7 +8829,7 @@ f1 f2
|
|||||||
2 two
|
2 two
|
||||||
4 four
|
4 four
|
||||||
INSERT INTO v1 VALUES(2,'two');
|
INSERT INTO v1 VALUES(2,'two');
|
||||||
ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
|
ERROR 23000: Duplicate entry '2' for key 1
|
||||||
INSERT INTO v1 VALUES(3,'three');
|
INSERT INTO v1 VALUES(3,'three');
|
||||||
affected rows: 1
|
affected rows: 1
|
||||||
INSERT INTO v1 VALUES(6,'six');
|
INSERT INTO v1 VALUES(6,'six');
|
||||||
@ -8848,7 +8848,7 @@ f1 f2
|
|||||||
3 three
|
3 three
|
||||||
4 four
|
4 four
|
||||||
UPDATE v1 SET f1 = 2 WHERE f1 = 3;
|
UPDATE v1 SET f1 = 2 WHERE f1 = 3;
|
||||||
ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
|
ERROR 23000: Duplicate entry '2' for key 1
|
||||||
UPDATE v1 SET f2 = 'number' WHERE f1 = 3;
|
UPDATE v1 SET f2 = 'number' WHERE f1 = 3;
|
||||||
affected rows: 1
|
affected rows: 1
|
||||||
info: Rows matched: 1 Changed: 1 Warnings: 0
|
info: Rows matched: 1 Changed: 1 Warnings: 0
|
||||||
@ -23090,8 +23090,8 @@ CREATE VIEW test3.v30 AS SELECT * FROM test3.v29;
|
|||||||
CREATE VIEW test3.v31 AS SELECT * FROM test3.v30;
|
CREATE VIEW test3.v31 AS SELECT * FROM test3.v30;
|
||||||
CREATE VIEW test3.v32 AS SELECT * FROM test3.v31;
|
CREATE VIEW test3.v32 AS SELECT * FROM test3.v31;
|
||||||
SHOW CREATE VIEW test3.v32;
|
SHOW CREATE VIEW test3.v32;
|
||||||
View Create View character_set_client collation_connection
|
View Create View
|
||||||
v32 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test3`.`v32` AS select `v31`.`f1` AS `f1` from `test3`.`v31` latin1 latin1_swedish_ci
|
v32 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test3`.`v32` AS select `v31`.`f1` AS `f1` from `test3`.`v31`
|
||||||
SELECT * FROM test3.v32;
|
SELECT * FROM test3.v32;
|
||||||
f1
|
f1
|
||||||
1.000
|
1.000
|
||||||
@ -23100,8 +23100,8 @@ id select_type table type possible_keys key key_len ref rows Extra
|
|||||||
1 SIMPLE t1 system NULL NULL NULL NULL 1
|
1 SIMPLE t1 system NULL NULL NULL NULL 1
|
||||||
DROP VIEW test3.v0;
|
DROP VIEW test3.v0;
|
||||||
SHOW CREATE VIEW test3.v32;
|
SHOW CREATE VIEW test3.v32;
|
||||||
View Create View character_set_client collation_connection
|
View Create View
|
||||||
v32 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test3`.`v32` AS select `v31`.`f1` AS `f1` from `test3`.`v31` latin1 latin1_swedish_ci
|
v32 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test3`.`v32` AS select `v31`.`f1` AS `f1` from `test3`.`v31`
|
||||||
Warnings:
|
Warnings:
|
||||||
Warning 1356 View 'test3.v32' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
|
Warning 1356 View 'test3.v32' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
|
||||||
SELECT * FROM test3.v32;
|
SELECT * FROM test3.v32;
|
||||||
@ -23209,8 +23209,8 @@ FROM test2.t1 tab1 NATURAL JOIN test1.v18 tab2;
|
|||||||
CREATE OR REPLACE VIEW test1.v20 AS SELECT f1, f2
|
CREATE OR REPLACE VIEW test1.v20 AS SELECT f1, f2
|
||||||
FROM test3.t1 tab1 NATURAL JOIN test1.v19 tab2;
|
FROM test3.t1 tab1 NATURAL JOIN test1.v19 tab2;
|
||||||
SHOW CREATE VIEW test1.v20;
|
SHOW CREATE VIEW test1.v20;
|
||||||
View Create View character_set_client collation_connection
|
View Create View
|
||||||
v20 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v20` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v19` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`)))) latin1 latin1_swedish_ci
|
v20 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v20` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v19` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`))))
|
||||||
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
||||||
CAST(f2 AS CHAR) AS f2 FROM test1.v20;
|
CAST(f2 AS CHAR) AS f2 FROM test1.v20;
|
||||||
f1 f2
|
f1 f2
|
||||||
@ -23225,8 +23225,8 @@ CAST(f2 AS CHAR) AS f2 FROM test1.v20;
|
|||||||
CREATE VIEW test1.v21 AS SELECT f1, f2
|
CREATE VIEW test1.v21 AS SELECT f1, f2
|
||||||
FROM test3.t1 tab1 NATURAL JOIN test1.v20 tab2;
|
FROM test3.t1 tab1 NATURAL JOIN test1.v20 tab2;
|
||||||
SHOW CREATE VIEW test1.v21;
|
SHOW CREATE VIEW test1.v21;
|
||||||
View Create View character_set_client collation_connection
|
View Create View
|
||||||
v21 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v21` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v20` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`)))) latin1 latin1_swedish_ci
|
v21 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v21` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v20` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`))))
|
||||||
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
|
||||||
CAST(f2 AS CHAR) AS f2 FROM test1.v21;
|
CAST(f2 AS CHAR) AS f2 FROM test1.v21;
|
||||||
f1 f2
|
f1 f2
|
||||||
@ -23737,7 +23737,7 @@ f1 f2 f3 f4
|
|||||||
DELETE FROM t1;
|
DELETE FROM t1;
|
||||||
INSERT INTO v1 SET f2 = 'ABC';
|
INSERT INTO v1 SET f2 = 'ABC';
|
||||||
INSERT INTO v1 SET f2 = 'ABC';
|
INSERT INTO v1 SET f2 = 'ABC';
|
||||||
ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
|
ERROR 23000: Duplicate entry '0' for key 1
|
||||||
SELECT * from t1;
|
SELECT * from t1;
|
||||||
f1 f2 f3 f4
|
f1 f2 f3 f4
|
||||||
0 ABC NULL NULL
|
0 ABC NULL NULL
|
||||||
@ -23806,7 +23806,7 @@ DROP VIEW v1;
|
|||||||
CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
|
CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
|
||||||
INSERT INTO v1 SET f2 = 'ABC';
|
INSERT INTO v1 SET f2 = 'ABC';
|
||||||
INSERT INTO v1 SET f2 = 'ABC';
|
INSERT INTO v1 SET f2 = 'ABC';
|
||||||
ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
|
ERROR 23000: Duplicate entry '0' for key 1
|
||||||
SELECT * from t1;
|
SELECT * from t1;
|
||||||
f1 f2 f3 f4
|
f1 f2 f3 f4
|
||||||
0 ABC NULL NULL
|
0 ABC NULL NULL
|
||||||
|
|||||||
@ -14,61 +14,36 @@
|
|||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
|
||||||
##############################################################################
|
# This is a script to create a TAR or ZIP binary distribution out of a
|
||||||
|
# built source tree. The output file will be put at the top level of
|
||||||
|
# the source tree, as "mysql-<vsn>....{tar.gz,zip}"
|
||||||
#
|
#
|
||||||
# This is a script to create a TAR or ZIP binary distribution out of a
|
# The temporary directory path given to "--tmp=<path>" has to be
|
||||||
# built source tree. The output file will be put at the top level of
|
# absolute and with no spaces.
|
||||||
# the source tree, as "mysql-<vsn>....{tar.gz,zip}"
|
|
||||||
#
|
|
||||||
# Note that the structure created by this script is slightly different from
|
|
||||||
# what a normal "make install" would produce. No extra "mysql" sub directory
|
|
||||||
# will be created, i.e. no "$prefix/include/mysql", "$prefix/lib/mysql" or
|
|
||||||
# "$prefix/share/mysql". This is because the build system explicitly calls
|
|
||||||
# make with pkgdatadir=<datadir>, etc.
|
|
||||||
#
|
|
||||||
# In GNU make/automake terms
|
|
||||||
#
|
|
||||||
# "pkglibdir" is set to the same as "libdir"
|
|
||||||
# "pkgincludedir" is set to the same as "includedir"
|
|
||||||
# "pkgdatadir" is set to the same as "datadir"
|
|
||||||
# "pkgplugindir" is set to "$pkglibdir/plugin"
|
|
||||||
# "pkgsuppdir" is set to "@prefix@/support-files",
|
|
||||||
# normally the same as "datadir"
|
|
||||||
#
|
|
||||||
# The temporary directory path given to "--tmp=<path>" has to be
|
|
||||||
# absolute and with no spaces.
|
|
||||||
#
|
|
||||||
# Note that for best result, the original "make" should be done with
|
|
||||||
# the same arguments as used for "make install" below, especially the
|
|
||||||
# 'pkglibdir', as the RPATH should to be set correctly.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# Read the command line arguments that control this script
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
machine=@MACHINE_TYPE@
|
machine=@MACHINE_TYPE@
|
||||||
system=@SYSTEM_TYPE@
|
system=@SYSTEM_TYPE@
|
||||||
|
version=@VERSION@
|
||||||
SOURCE=`pwd`
|
SOURCE=`pwd`
|
||||||
CP="cp -p"
|
CP="cp -p"
|
||||||
MV="mv"
|
MV="mv"
|
||||||
|
|
||||||
STRIP=1 # Option ignored
|
STRIP=1
|
||||||
|
DEBUG=0
|
||||||
SILENT=0
|
SILENT=0
|
||||||
|
MACHINE=""
|
||||||
PLATFORM=""
|
PLATFORM=""
|
||||||
TMP=/tmp
|
TMP=/tmp
|
||||||
SUFFIX=""
|
SUFFIX=""
|
||||||
NDBCLUSTER="" # Option ignored
|
NDBCLUSTER=""
|
||||||
|
|
||||||
for arg do
|
for arg do
|
||||||
case "$arg" in
|
case "$arg" in
|
||||||
|
--debug) DEBUG=1;;
|
||||||
--tmp=*) TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
|
--tmp=*) TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
|
||||||
--suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
|
--suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
|
||||||
--no-strip) STRIP=0 ;;
|
--no-strip) STRIP=0 ;;
|
||||||
--machine=*) machine=`echo "$arg" | sed -e "s;--machine=;;"` ;;
|
--machine=*) MACHINE=`echo "$arg" | sed -e "s;--machine=;;"` ;;
|
||||||
--platform=*) PLATFORM=`echo "$arg" | sed -e "s;--platform=;;"` ;;
|
--platform=*) PLATFORM=`echo "$arg" | sed -e "s;--platform=;;"` ;;
|
||||||
--silent) SILENT=1 ;;
|
--silent) SILENT=1 ;;
|
||||||
--with-ndbcluster) NDBCLUSTER=1 ;;
|
--with-ndbcluster) NDBCLUSTER=1 ;;
|
||||||
@ -79,52 +54,53 @@ for arg do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
# Remove vendor from $system
|
||||||
# Adjust "system" output from "uname" to be more human readable
|
system=`echo $system | sed -e 's/[a-z]*-\(.*\)/\1/g'`
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
if [ x"$PLATFORM" = x"" ] ; then
|
# Map OS names to "our" OS names (eg. darwin6.8 -> osx10.2)
|
||||||
# FIXME move this to the build tools
|
system=`echo $system | sed -e 's/darwin6.*/osx10.2/g'`
|
||||||
# Remove vendor from $system
|
system=`echo $system | sed -e 's/darwin7.*/osx10.3/g'`
|
||||||
system=`echo $system | sed -e 's/[a-z]*-\(.*\)/\1/g'`
|
system=`echo $system | sed -e 's/darwin8.*/osx10.4/g'`
|
||||||
|
system=`echo $system | sed -e 's/\(aix4.3\).*/\1/g'`
|
||||||
|
system=`echo $system | sed -e 's/\(aix5.1\).*/\1/g'`
|
||||||
|
system=`echo $system | sed -e 's/\(aix5.2\).*/\1/g'`
|
||||||
|
system=`echo $system | sed -e 's/\(aix5.3\).*/\1/g'`
|
||||||
|
system=`echo $system | sed -e 's/osf5.1b/tru64/g'`
|
||||||
|
system=`echo $system | sed -e 's/linux-gnu/linux/g'`
|
||||||
|
system=`echo $system | sed -e 's/solaris2.\([0-9]*\)/solaris\1/g'`
|
||||||
|
system=`echo $system | sed -e 's/sco3.2v\(.*\)/openserver\1/g'`
|
||||||
|
|
||||||
# Map OS names to "our" OS names (eg. darwin6.8 -> osx10.2)
|
if [ x"$MACHINE" != x"" ] ; then
|
||||||
system=`echo $system | sed -e 's/darwin6.*/osx10.2/g'`
|
machine=$MACHINE
|
||||||
system=`echo $system | sed -e 's/darwin7.*/osx10.3/g'`
|
|
||||||
system=`echo $system | sed -e 's/darwin8.*/osx10.4/g'`
|
|
||||||
system=`echo $system | sed -e 's/\(aix4.3\).*/\1/g'`
|
|
||||||
system=`echo $system | sed -e 's/\(aix5.1\).*/\1/g'`
|
|
||||||
system=`echo $system | sed -e 's/\(aix5.2\).*/\1/g'`
|
|
||||||
system=`echo $system | sed -e 's/\(aix5.3\).*/\1/g'`
|
|
||||||
system=`echo $system | sed -e 's/osf5.1b/tru64/g'`
|
|
||||||
system=`echo $system | sed -e 's/linux-gnu/linux/g'`
|
|
||||||
system=`echo $system | sed -e 's/solaris2.\([0-9]*\)/solaris\1/g'`
|
|
||||||
system=`echo $system | sed -e 's/sco3.2v\(.*\)/openserver\1/g'`
|
|
||||||
|
|
||||||
PLATFORM="$system-$machine"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Print the platform name for build logs
|
if [ x"$PLATFORM" != x"" ] ; then
|
||||||
echo "PLATFORM NAME: $PLATFORM"
|
platform="$PLATFORM"
|
||||||
|
else
|
||||||
|
platform="$system-$machine"
|
||||||
|
fi
|
||||||
|
|
||||||
case $PLATFORM in
|
# FIXME This should really be integrated with automake and not duplicate the
|
||||||
*netware*) BASE_SYSTEM="netware" ;;
|
# installation list.
|
||||||
esac
|
|
||||||
|
|
||||||
# Change the distribution to a long descriptive name
|
|
||||||
NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-@VERSION@-$PLATFORM$SUFFIX
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# Define BASE, and remove the old BASE directory if any
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
BASE=$TMP/my_dist$SUFFIX
|
BASE=$TMP/my_dist$SUFFIX
|
||||||
|
|
||||||
if [ -d $BASE ] ; then
|
if [ -d $BASE ] ; then
|
||||||
rm -rf $BASE
|
rm -rf $BASE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
BS=""
|
||||||
# Find the TAR to use
|
BIN_FILES=""
|
||||||
# ----------------------------------------------------------------------
|
BASE_SYSTEM="any"
|
||||||
|
MYSQL_SHARE=$BASE/share/mysql
|
||||||
|
|
||||||
|
case $system in
|
||||||
|
*netware*)
|
||||||
|
BASE_SYSTEM="netware"
|
||||||
|
BS=".nlm"
|
||||||
|
MYSQL_SHARE=$BASE/share
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
# This is needed to prefer GNU tar over platform tar because that can't
|
# This is needed to prefer GNU tar over platform tar because that can't
|
||||||
# always handle long filenames
|
# always handle long filenames
|
||||||
@ -151,149 +127,24 @@ which_1 ()
|
|||||||
}
|
}
|
||||||
|
|
||||||
tar=`which_1 gnutar gtar`
|
tar=`which_1 gnutar gtar`
|
||||||
if [ $? -ne 0 -o x"$tar" = x"" ] ; then
|
if [ "$?" = "1" -o x"$tar" = x"" ] ; then
|
||||||
tar=tar
|
tar=tar
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# Handle the Unix/Linux packaging using "make install"
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
if [ x"$BASE_SYSTEM" != x"netware" ] ; then
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# Terminate on any base level error
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# Really ugly, one script, "mysql_install_db", needs prefix set to ".",
|
|
||||||
# i.e. makes access relative the current directory. This matches
|
|
||||||
# the documentation, so better not change this. And for another script,
|
|
||||||
# "mysql.server", we make some relative, others not.
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
cd scripts
|
|
||||||
rm -f mysql_install_db
|
|
||||||
@MAKE@ mysql_install_db \
|
|
||||||
prefix=. \
|
|
||||||
bindir=./bin \
|
|
||||||
sbindir=./bin \
|
|
||||||
scriptdir=./bin \
|
|
||||||
libexecdir=./bin \
|
|
||||||
pkgdatadir=./share \
|
|
||||||
localstatedir=./data
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
cd support-files
|
|
||||||
rm -f mysql.server
|
|
||||||
@MAKE@ mysql.server \
|
|
||||||
bindir=./bin \
|
|
||||||
sbindir=./bin \
|
|
||||||
scriptdir=./bin \
|
|
||||||
libexecdir=./bin \
|
|
||||||
pkgdatadir=@pkgdatadir@
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# Do a install that we later are to pack. Use the same paths as in
|
|
||||||
# the build for the relevant directories.
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
@MAKE@ DESTDIR=$BASE install \
|
|
||||||
pkglibdir=@pkglibdir@ \
|
|
||||||
pkgincludedir=@pkgincludedir@ \
|
|
||||||
pkgdatadir=@pkgdatadir@ \
|
|
||||||
pkgplugindir=@pkgplugindir@ \
|
|
||||||
pkgsuppdir=@pkgsuppdir@ \
|
|
||||||
mandir=@mandir@ \
|
|
||||||
infodir=@infodir@
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# Rename top directory, and set DEST to the new directory
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
mv $BASE@prefix@ $BASE/$NEW_NAME
|
|
||||||
DEST=$BASE/$NEW_NAME
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# If we compiled with gcc, copy libgcc.a to the dist as libmygcc.a
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
if [ x"@GXX@" = x"yes" ] ; then
|
|
||||||
gcclib=`@CC@ @CFLAGS@ --print-libgcc-file 2>/dev/null` || true
|
|
||||||
if [ -z "$gcclib" ] ; then
|
|
||||||
echo "Warning: Compiler doesn't tell libgcc.a!"
|
|
||||||
elif [ -f "$gcclib" ] ; then
|
|
||||||
$CP $gcclib $DEST/lib/libmygcc.a
|
|
||||||
else
|
|
||||||
echo "Warning: Compiler result '$gcclib' not found / no file!"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# FIXME let this script be in "bin/", where it is in the RPMs?
|
|
||||||
# http://dev.mysql.com/doc/refman/5.1/en/mysql-install-db-problems.html
|
|
||||||
mkdir $DEST/scripts
|
|
||||||
mv $DEST/bin/mysql_install_db $DEST/scripts/
|
|
||||||
|
|
||||||
# Note, no legacy "safe_mysqld" link to "mysqld_safe" in 5.1
|
|
||||||
|
|
||||||
# Copy readme and license files
|
|
||||||
cp README Docs/INSTALL-BINARY $DEST/
|
|
||||||
if [ -f COPYING -a -f EXCEPTIONS-CLIENT ] ; then
|
|
||||||
cp COPYING EXCEPTIONS-CLIENT $DEST/
|
|
||||||
elif [ -f LICENSE.mysql ] ; then
|
|
||||||
cp LICENSE.mysql $DEST/
|
|
||||||
else
|
|
||||||
echo "ERROR: no license files found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# FIXME should be handled by make file, and to other dir
|
|
||||||
mkdir -p $DEST/bin $DEST/support-files
|
|
||||||
cp scripts/mysqlaccess.conf $DEST/bin/
|
|
||||||
cp support-files/magic $DEST/support-files/
|
|
||||||
|
|
||||||
# Create empty data directories, set permission (FIXME why?)
|
|
||||||
mkdir $DEST/data $DEST/data/mysql $DEST/data/test
|
|
||||||
chmod o-rwx $DEST/data $DEST/data/mysql $DEST/data/test
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# Create the result tar file
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
echo "Using $tar to create archive"
|
|
||||||
OPT=cvf
|
|
||||||
if [ x$SILENT = x1 ] ; then
|
|
||||||
OPT=cf
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Creating and compressing archive"
|
|
||||||
rm -f $NEW_NAME.tar.gz
|
|
||||||
(cd $BASE ; $tar $OPT - $NEW_NAME) | gzip -9 > $NEW_NAME.tar.gz
|
|
||||||
echo "$NEW_NAME.tar.gz created"
|
|
||||||
|
|
||||||
echo "Removing temporary directory"
|
|
||||||
rm -rf $BASE
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# Handle the Netware case, until integrated above
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
BS=".nlm"
|
|
||||||
MYSQL_SHARE=$BASE/share
|
|
||||||
|
|
||||||
mkdir $BASE $BASE/bin $BASE/docs \
|
mkdir $BASE $BASE/bin $BASE/docs \
|
||||||
$BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/scripts \
|
$BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/scripts \
|
||||||
$BASE/mysql-test $BASE/mysql-test/t $BASE/mysql-test/r \
|
$BASE/mysql-test $BASE/mysql-test/t $BASE/mysql-test/r \
|
||||||
$BASE/mysql-test/include $BASE/mysql-test/std_data $BASE/mysql-test/lib \
|
$BASE/mysql-test/include $BASE/mysql-test/std_data $BASE/mysql-test/lib \
|
||||||
$BASE/mysql-test/suite
|
$BASE/mysql-test/suite
|
||||||
|
|
||||||
|
if [ $BASE_SYSTEM != "netware" ] ; then
|
||||||
|
mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \
|
||||||
|
$BASE/man/man1 $BASE/man/man8 $BASE/data $BASE/data/mysql $BASE/data/test
|
||||||
|
|
||||||
|
chmod o-rwx $BASE/data $BASE/data/*
|
||||||
|
fi
|
||||||
|
|
||||||
# Copy files if they exists, warn for those that don't.
|
# Copy files if they exists, warn for those that don't.
|
||||||
# Note that when listing files to copy, we might list the file name
|
# Note that when listing files to copy, we might list the file name
|
||||||
# twice, once in the directory location where it is built, and a
|
# twice, once in the directory location where it is built, and a
|
||||||
@ -325,13 +176,12 @@ copyfileto $BASE COPYING COPYING.LIB README Docs/INSTALL-BINARY \
|
|||||||
BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
|
BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
|
||||||
extra/resolveip$BS extra/my_print_defaults$BS \
|
extra/resolveip$BS extra/my_print_defaults$BS \
|
||||||
extra/resolve_stack_dump$BS extra/mysql_waitpid$BS \
|
extra/resolve_stack_dump$BS extra/mysql_waitpid$BS \
|
||||||
storage/myisam/myisamchk$BS storage/myisam/myisampack$BS \
|
myisam/myisamchk$BS myisam/myisampack$BS myisam/myisamlog$BS \
|
||||||
storage/myisam/myisamlog$BS storage/myisam/myisam_ftdump$BS \
|
myisam/myisam_ftdump$BS \
|
||||||
sql/mysqld$BS sql/mysqld-debug$BS \
|
sql/mysqld$BS sql/mysqld-debug$BS \
|
||||||
sql/mysql_tzinfo_to_sql$BS \
|
sql/mysql_tzinfo_to_sql$BS \
|
||||||
server-tools/instance-manager/mysqlmanager$BS \
|
server-tools/instance-manager/mysqlmanager$BS \
|
||||||
client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \
|
client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \
|
||||||
client/mysqlslap$BS \
|
|
||||||
client/mysqldump$BS client/mysqlimport$BS \
|
client/mysqldump$BS client/mysqlimport$BS \
|
||||||
client/mysqltest$BS client/mysqlcheck$BS \
|
client/mysqltest$BS client/mysqlcheck$BS \
|
||||||
client/mysqlbinlog$BS client/mysql_upgrade$BS \
|
client/mysqlbinlog$BS client/mysql_upgrade$BS \
|
||||||
@ -341,16 +191,42 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
|
|||||||
";
|
";
|
||||||
|
|
||||||
# Platform-specific bin dir files:
|
# Platform-specific bin dir files:
|
||||||
BIN_FILES="$BIN_FILES \
|
if [ $BASE_SYSTEM = "netware" ] ; then
|
||||||
|
BIN_FILES="$BIN_FILES \
|
||||||
netware/mysqld_safe$BS netware/mysql_install_db$BS \
|
netware/mysqld_safe$BS netware/mysql_install_db$BS \
|
||||||
netware/init_db.sql netware/test_db.sql \
|
netware/init_db.sql netware/test_db.sql netware/mysql_explain_log$BS \
|
||||||
netware/mysqlhotcopy$BS netware/libmysql$BS netware/init_secure_db.sql \
|
netware/mysqlhotcopy$BS netware/libmysql$BS netware/init_secure_db.sql \
|
||||||
";
|
";
|
||||||
|
# For all other platforms:
|
||||||
|
else
|
||||||
|
BIN_FILES="$BIN_FILES \
|
||||||
|
server-tools/instance-manager/.libs/mysqlmanager \
|
||||||
|
client/mysqltestmanagerc \
|
||||||
|
client/mysqltestmanager-pwgen tools/mysqltestmanager \
|
||||||
|
client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \
|
||||||
|
client/.libs/mysqldump client/.libs/mysqlimport \
|
||||||
|
client/.libs/mysqltest client/.libs/mysqlcheck \
|
||||||
|
client/.libs/mysqlbinlog client/.libs/mysqltestmanagerc \
|
||||||
|
client/.libs/mysqltestmanager-pwgen tools/.libs/mysqltestmanager \
|
||||||
|
tests/.libs/mysql_client_test \
|
||||||
|
libmysqld/examples/.libs/mysql_client_test_embedded \
|
||||||
|
libmysqld/examples/.libs/mysqltest_embedded \
|
||||||
|
";
|
||||||
|
fi
|
||||||
|
|
||||||
copyfileto $BASE/bin $BIN_FILES
|
copyfileto $BASE/bin $BIN_FILES
|
||||||
|
|
||||||
$CP netware/*.pl $BASE/scripts
|
if [ x$STRIP = x1 ] ; then
|
||||||
$CP scripts/mysqlhotcopy $BASE/scripts/mysqlhotcopy.pl
|
strip $BASE/bin/*
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Copy not binary files
|
||||||
|
copyfileto $BASE/bin sql/mysqld.sym.gz
|
||||||
|
|
||||||
|
if [ $BASE_SYSTEM = "netware" ] ; then
|
||||||
|
$CP netware/*.pl $BASE/scripts
|
||||||
|
$CP scripts/mysqlhotcopy $BASE/scripts/mysqlhotcopy.pl
|
||||||
|
fi
|
||||||
|
|
||||||
copyfileto $BASE/lib \
|
copyfileto $BASE/lib \
|
||||||
libmysql/.libs/libmysqlclient.a \
|
libmysql/.libs/libmysqlclient.a \
|
||||||
@ -372,17 +248,31 @@ copyfileto $BASE/lib \
|
|||||||
zlib/.libs/libz.a
|
zlib/.libs/libz.a
|
||||||
|
|
||||||
# convert the .a to .lib for NetWare
|
# convert the .a to .lib for NetWare
|
||||||
for i in $BASE/lib/*.a
|
if [ $BASE_SYSTEM = "netware" ] ; then
|
||||||
do
|
for i in $BASE/lib/*.a
|
||||||
libname=`basename $i .a`
|
do
|
||||||
$MV $i $BASE/lib/$libname.lib
|
libname=`basename $i .a`
|
||||||
done
|
$MV $i $BASE/lib/$libname.lib
|
||||||
rm -f $BASE/lib/*.la
|
done
|
||||||
|
rm -f $BASE/lib/*.la
|
||||||
|
fi
|
||||||
|
|
||||||
|
copyfileto $BASE/include include/*
|
||||||
copyfileto $BASE/include config.h include/*
|
|
||||||
|
|
||||||
rm -f $BASE/include/Makefile* $BASE/include/*.in $BASE/include/config-win.h
|
rm -f $BASE/include/Makefile* $BASE/include/*.in $BASE/include/config-win.h
|
||||||
|
if [ $BASE_SYSTEM != "netware" ] ; then
|
||||||
|
rm -f $BASE/include/config-netware.h
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $BASE_SYSTEM != "netware" ] ; then
|
||||||
|
if [ -d tests ] ; then
|
||||||
|
$CP tests/*.res tests/*.tst tests/*.pl $BASE/tests
|
||||||
|
fi
|
||||||
|
if [ -d man ] ; then
|
||||||
|
$CP man/*.1 $BASE/man/man1
|
||||||
|
$CP man/*.8 $BASE/man/man8
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
copyfileto $BASE/support-files support-files/*
|
copyfileto $BASE/support-files support-files/*
|
||||||
|
|
||||||
@ -401,29 +291,43 @@ copyfileto $BASE/mysql-test \
|
|||||||
$CP mysql-test/lib/*.pl $BASE/mysql-test/lib
|
$CP mysql-test/lib/*.pl $BASE/mysql-test/lib
|
||||||
$CP mysql-test/t/*.def $BASE/mysql-test/t
|
$CP mysql-test/t/*.def $BASE/mysql-test/t
|
||||||
$CP mysql-test/include/*.inc $BASE/mysql-test/include
|
$CP mysql-test/include/*.inc $BASE/mysql-test/include
|
||||||
$CP mysql-test/include/*.sql $BASE/mysql-test/include
|
|
||||||
$CP mysql-test/include/*.test $BASE/mysql-test/include
|
$CP mysql-test/include/*.test $BASE/mysql-test/include
|
||||||
$CP mysql-test/t/*.def $BASE/mysql-test/t
|
$CP mysql-test/t/*.def $BASE/mysql-test/t
|
||||||
$CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
|
|
||||||
mysql-test/std_data/*.MYD mysql-test/std_data/*.MYI \
|
|
||||||
mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \
|
|
||||||
mysql-test/std_data/Index.xml \
|
|
||||||
mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
|
|
||||||
mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \
|
|
||||||
$BASE/mysql-test/std_data
|
|
||||||
$CP mysql-test/t/*.test mysql-test/t/*.imtest \
|
$CP mysql-test/t/*.test mysql-test/t/*.imtest \
|
||||||
mysql-test/t/*.disabled mysql-test/t/*.opt \
|
mysql-test/t/*.disabled mysql-test/t/*.opt \
|
||||||
mysql-test/t/*.slave-mi mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t
|
mysql-test/t/*.slave-mi mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t
|
||||||
$CP mysql-test/r/*.result mysql-test/r/*.require \
|
$CP mysql-test/r/*.result mysql-test/r/*.require \
|
||||||
$BASE/mysql-test/r
|
$BASE/mysql-test/r
|
||||||
|
|
||||||
# Copy the additional suites "as is", they are in flux
|
# Copy the additional suites and data "as is", they are in flux
|
||||||
$tar cf - mysql-test/suite | ( cd $BASE ; $tar xf - )
|
$tar cf - mysql-test/suite | ( cd $BASE ; $tar xf - )
|
||||||
|
$tar cf - mysql-test/std_data | ( cd $BASE ; $tar xf - )
|
||||||
# Clean up if we did this from a bk tree
|
# Clean up if we did this from a bk tree
|
||||||
if [ -d mysql-test/SCCS ] ; then
|
if [ -d mysql-test/SCCS ] ; then
|
||||||
find $BASE/mysql-test -name SCCS -print | xargs rm -rf
|
find $BASE/mysql-test -name SCCS -print | xargs rm -rf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ $BASE_SYSTEM != "netware" ] ; then
|
||||||
|
chmod a+x $BASE/bin/*
|
||||||
|
copyfileto $BASE/bin scripts/*
|
||||||
|
$BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ \
|
||||||
|
./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ \
|
||||||
|
@HOSTNAME@ \@pkgdatadir\@ ./share \
|
||||||
|
< scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db
|
||||||
|
$BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \
|
||||||
|
\@sbindir\@ ./bin \@libexecdir\@ ./bin \
|
||||||
|
\@MYSQLD_USER\@ @MYSQLD_USER@ \@localstatedir\@ /usr/local/mysql/data \
|
||||||
|
\@HOSTNAME\@ @HOSTNAME@ \
|
||||||
|
< support-files/mysql.server.sh > $BASE/support-files/mysql.server
|
||||||
|
$BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/mysqld_safe
|
||||||
|
mv $BASE/support-files/binary-configure $BASE/configure
|
||||||
|
chmod a+x $BASE/bin/* $BASE/scripts/* $BASE/support-files/mysql-log-rotate \
|
||||||
|
$BASE/support-files/*.server $BASE/configure
|
||||||
|
$CP -r sql-bench/* $BASE/sql-bench
|
||||||
|
rm -f $BASE/sql-bench/*.sh $BASE/sql-bench/Makefile* $BASE/lib/*.la
|
||||||
|
rm -f $BASE/bin/*.sql
|
||||||
|
fi
|
||||||
|
|
||||||
rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh \
|
rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh \
|
||||||
$BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution \
|
$BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution \
|
||||||
$BASE/bin/setsomevars $BASE/support-files/Makefile* \
|
$BASE/bin/setsomevars $BASE/support-files/Makefile* \
|
||||||
@ -432,19 +336,29 @@ rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh \
|
|||||||
#
|
#
|
||||||
# Copy system dependent files
|
# Copy system dependent files
|
||||||
#
|
#
|
||||||
./scripts/fill_help_tables < ./Docs/manual.texi >> ./netware/init_db.sql
|
if [ $BASE_SYSTEM = "netware" ] ; then
|
||||||
|
./scripts/fill_help_tables < ./Docs/manual.texi >> ./netware/init_db.sql
|
||||||
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
# Remove system dependent files
|
# Remove system dependent files
|
||||||
#
|
#
|
||||||
rm -f $BASE/support-files/magic \
|
if [ $BASE_SYSTEM = "netware" ] ; then
|
||||||
|
rm -f $BASE/support-files/magic \
|
||||||
$BASE/support-files/mysql.server \
|
$BASE/support-files/mysql.server \
|
||||||
$BASE/support-files/mysql*.spec \
|
$BASE/support-files/mysql*.spec \
|
||||||
$BASE/support-files/mysql-log-rotate \
|
$BASE/support-files/mysql-log-rotate \
|
||||||
$BASE/support-files/binary-configure \
|
$BASE/support-files/binary-configure \
|
||||||
$BASE/support-files/build-tags \
|
$BASE/support-files/build-tags \
|
||||||
$BASE/support-files/MySQL-shared-compat.spec \
|
$BASE/support-files/MySQL-shared-compat.spec \
|
||||||
|
$BASE/support-files/ndb-config-2-node.ini \
|
||||||
$BASE/INSTALL-BINARY
|
$BASE/INSTALL-BINARY
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Make safe_mysqld a symlink to mysqld_safe for backwards portability
|
||||||
|
if [ $BASE_SYSTEM != "netware" ] ; then
|
||||||
|
(cd $BASE/bin ; ln -s mysqld_safe safe_mysqld )
|
||||||
|
fi
|
||||||
|
|
||||||
# Clean up if we did this from a bk tree
|
# Clean up if we did this from a bk tree
|
||||||
if [ -d $BASE/sql-bench/SCCS ] ; then
|
if [ -d $BASE/sql-bench/SCCS ] ; then
|
||||||
@ -452,17 +366,78 @@ if [ -d $BASE/sql-bench/SCCS ] ; then
|
|||||||
find $BASE/sql-bench -name SCCS -print | xargs rm -rf
|
find $BASE/sql-bench -name SCCS -print | xargs rm -rf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# NDB Cluster
|
||||||
|
if [ x$NDBCLUSTER = x1 ]; then
|
||||||
|
( cd ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
|
||||||
|
( cd mysql-test/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
|
||||||
|
$CP $BASE/ndb-stage@bindir@/* $BASE/bin/.
|
||||||
|
$CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.
|
||||||
|
$CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/.
|
||||||
|
$CP $BASE/ndb-stage@pkgdatadir@/* $BASE/share/mysql/.
|
||||||
|
$CP -r $BASE/ndb-stage@pkgincludedir@/ndb $BASE/include
|
||||||
|
$CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. || exit 1
|
||||||
|
rm -rf $BASE/ndb-stage
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Change the distribution to a long descriptive name
|
||||||
|
NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version-$platform$SUFFIX
|
||||||
|
|
||||||
|
# Print the platform name for build logs
|
||||||
|
echo "PLATFORM NAME: $platform"
|
||||||
|
|
||||||
BASE2=$TMP/$NEW_NAME
|
BASE2=$TMP/$NEW_NAME
|
||||||
rm -rf $BASE2
|
rm -rf $BASE2
|
||||||
mv $BASE $BASE2
|
mv $BASE $BASE2
|
||||||
BASE=$BASE2
|
BASE=$BASE2
|
||||||
|
#
|
||||||
|
# If we are compiling with gcc, copy libgcc.a to the distribution as libmygcc.a
|
||||||
|
#
|
||||||
|
|
||||||
#
|
if [ x"@GXX@" = x"yes" ] ; then
|
||||||
# Create a zip file for NetWare users
|
gcclib=`@CC@ @CFLAGS@ --print-libgcc-file 2>/dev/null` || true
|
||||||
#
|
if [ -z "$gcclib" ] ; then
|
||||||
rm -f $NEW_NAME.zip
|
echo "Warning: Compiler doesn't tell libgcc.a!"
|
||||||
(cd $TMP; zip -r "$SOURCE/$NEW_NAME.zip" $NEW_NAME)
|
elif [ -f "$gcclib" ] ; then
|
||||||
echo "$NEW_NAME.zip created"
|
$CP $gcclib $BASE/lib/libmygcc.a
|
||||||
|
else
|
||||||
|
echo "Warning: Compiler result '$gcclib' not found / no file!"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
#if we are debugging, do not do tar/gz
|
||||||
|
if [ x$DEBUG = x1 ] ; then
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $BASE_SYSTEM != "netware" ] ; then
|
||||||
|
|
||||||
|
#
|
||||||
|
# Create the result tar file
|
||||||
|
#
|
||||||
|
|
||||||
|
echo "Using $tar to create archive"
|
||||||
|
|
||||||
|
OPT=cvf
|
||||||
|
if [ x$SILENT = x1 ] ; then
|
||||||
|
OPT=cf
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Creating and compressing archive"
|
||||||
|
rm -f $NEW_NAME.tar.gz
|
||||||
|
(cd $TMP ; $tar $OPT - $NEW_NAME) | gzip -9 > $NEW_NAME.tar.gz
|
||||||
|
echo "$NEW_NAME.tar.gz created"
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
#
|
||||||
|
# Create a zip file for NetWare users
|
||||||
|
#
|
||||||
|
|
||||||
|
rm -f $NEW_NAME.zip
|
||||||
|
(cd $TMP; zip -r "$SOURCE/$NEW_NAME.zip" $NEW_NAME)
|
||||||
|
echo "$NEW_NAME.zip created"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Removing temporary directory"
|
echo "Removing temporary directory"
|
||||||
rm -rf $BASE
|
rm -rf $BASE
|
||||||
|
|||||||
Reference in New Issue
Block a user