List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:July 15 2009 8:07pm
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:2952)
View as plain text  
#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@strippedrxgbpvk6ku

 2952 Magnus Blåudd	2009-07-15 [merge]
      Merger 6.3->7.0

    modified:
      mysql-test/suite/funcs_1/datadict/charset_collation.inc
      mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
      mysql-test/suite/funcs_1/datadict/is_routines.inc
      mysql-test/suite/funcs_1/datadict/is_schemata.inc
      mysql-test/suite/funcs_1/datadict/is_tables.inc
      mysql-test/suite/funcs_1/datadict/is_triggers.inc
      mysql-test/suite/funcs_1/datadict/is_views.inc
      mysql-test/suite/funcs_1/datadict/statistics.inc
      mysql-test/suite/funcs_1/datadict/table_constraints.inc
      mysql-test/suite/funcs_1/datadict/tables.inc
      mysql-test/suite/funcs_1/datadict/tables1.inc
      mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
      mysql-test/suite/funcs_1/t/is_basics_mixed.test
      mysql-test/suite/funcs_1/t/is_column_privileges.test
      mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test
      mysql-test/suite/funcs_1/t/is_columns.test
      mysql-test/suite/funcs_1/t/is_schema_privileges.test
      mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test
      mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test
      mysql-test/suite/funcs_1/t/is_statistics.test
      mysql-test/suite/funcs_1/t/is_table_constraints.test
      mysql-test/suite/funcs_1/t/is_table_privileges.test
      mysql-test/suite/funcs_1/t/is_user_privileges.test
      mysql-test/suite/funcs_1/t/storedproc.test
      mysql-test/suite/funcs_1/triggers/triggers_03.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc
      mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc
      mysql-test/suite/funcs_1/triggers/triggers_0407.inc
      mysql-test/suite/funcs_1/triggers/triggers_08.inc
=== modified file 'mysql-test/suite/funcs_1/datadict/charset_collation.inc'
--- a/mysql-test/suite/funcs_1/datadict/charset_collation.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/charset_collation.inc	2009-07-14 18:39:11 +0000
@@ -61,7 +61,6 @@ DROP USER dbdict_test@localhost;
 CREATE USER dbdict_test@localhost;
 
 --echo # Establish connection con (user=dbdict_test)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (con,localhost,dbdict_test,,);
 ################################################################################

=== modified file 'mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc'
--- a/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc	2009-07-14 18:39:11 +0000
@@ -126,7 +126,6 @@ ORDER BY constraint_catalog, constraint_
 eval $select;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , db_datadict);
 eval $select;

=== modified file 'mysql-test/suite/funcs_1/datadict/is_routines.inc'
--- a/mysql-test/suite/funcs_1/datadict/is_routines.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/is_routines.inc	2009-07-14 18:39:11 +0000
@@ -178,7 +178,6 @@ GRANT EXECUTE ON db_datadict_2.* TO 'tes
 FLUSH PRIVILEGES;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , db_datadict);
 --replace_column 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"

=== modified file 'mysql-test/suite/funcs_1/datadict/is_schemata.inc'
--- a/mysql-test/suite/funcs_1/datadict/is_schemata.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/is_schemata.inc	2009-07-14 18:39:11 +0000
@@ -104,7 +104,6 @@ eval $my_select;
 eval $my_show;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , db_datadict_1);
 # Shows db_datadict_1

=== modified file 'mysql-test/suite/funcs_1/datadict/is_tables.inc'
--- a/mysql-test/suite/funcs_1/datadict/is_tables.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/is_tables.inc	2009-07-14 18:39:11 +0000
@@ -130,7 +130,6 @@ WHERE table_schema = 'db_datadict' ORDER
 let $my_show = SHOW TABLES FROM db_datadict;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , db_datadict);
 # tb2 is not granted to anyone

=== modified file 'mysql-test/suite/funcs_1/datadict/is_triggers.inc'
--- a/mysql-test/suite/funcs_1/datadict/is_triggers.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/is_triggers.inc	2009-07-14 18:39:11 +0000
@@ -122,7 +122,6 @@ let $my_select = SELECT * FROM informati
 WHERE trigger_name = 'trg1';
 let $my_show =   SHOW TRIGGERS FROM db_datadict;
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , db_datadict);
 --replace_result $engine_type <engine_type>

=== modified file 'mysql-test/suite/funcs_1/datadict/is_views.inc'
--- a/mysql-test/suite/funcs_1/datadict/is_views.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/is_views.inc	2009-07-14 18:39:11 +0000
@@ -108,7 +108,6 @@ WHERE table_schema = 'db_datadict' ORDER
 eval $select;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , test);
 eval $select;

=== modified file 'mysql-test/suite/funcs_1/datadict/statistics.inc'
--- a/mysql-test/suite/funcs_1/datadict/statistics.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/statistics.inc	2009-07-14 18:39:11 +0000
@@ -42,7 +42,6 @@ ORDER BY table_schema, table_name, index
 eval $my_select;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1,localhost,testuser1,,db_datadict);
 --replace_column 10 #CARD#

=== modified file 'mysql-test/suite/funcs_1/datadict/table_constraints.inc'
--- a/mysql-test/suite/funcs_1/datadict/table_constraints.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/table_constraints.inc	2009-07-14 18:39:11 +0000
@@ -33,7 +33,6 @@ ORDER BY table_schema,table_name,constra
 eval $my_select;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1,localhost,testuser1,,db_datadict);
 eval $my_select;

=== modified file 'mysql-test/suite/funcs_1/datadict/tables.inc'
--- a/mysql-test/suite/funcs_1/datadict/tables.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/tables.inc	2009-07-14 18:39:11 +0000
@@ -37,7 +37,6 @@ CREATE USER testuser1@localhost;
 GRANT SELECT ON test1.* TO testuser1@localhost;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1,localhost,testuser1,,test1);
 --source suite/funcs_1/datadict/tables2.inc

=== modified file 'mysql-test/suite/funcs_1/datadict/tables1.inc'
--- a/mysql-test/suite/funcs_1/datadict/tables1.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/tables1.inc	2009-07-14 18:39:11 +0000
@@ -27,7 +27,6 @@ CREATE USER testuser1@localhost;
 GRANT SELECT ON test1.* TO testuser1@localhost;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1,localhost,testuser1,,test1);
 --source suite/funcs_1/datadict/tables2.inc

=== modified file 'mysql-test/suite/funcs_1/storedproc/storedproc_10.inc'
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc	2009-07-14 18:39:11 +0000
@@ -58,7 +58,6 @@ GRANT CREATE ROUTINE ON db_storedproc.* 
 GRANT SELECT         ON db_storedproc.* TO 'user_2'@'localhost';
 FLUSH PRIVILEGES;
 
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (user2_1, localhost, user_1, , db_storedproc);
 --source suite/funcs_1/include/show_connection.inc

=== modified file 'mysql-test/suite/funcs_1/t/is_basics_mixed.test'
--- a/mysql-test/suite/funcs_1/t/is_basics_mixed.test	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/t/is_basics_mixed.test	2009-07-14 18:39:11 +0000
@@ -55,7 +55,6 @@ DROP   USER 'testuser1'@'localhost';
 CREATE USER 'testuser1'@'localhost';
 # Low privileged user
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , test);
 SELECT DATABASE();

=== modified file 'mysql-test/suite/funcs_1/t/is_column_privileges.test'
--- a/mysql-test/suite/funcs_1/t/is_column_privileges.test	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/t/is_column_privileges.test	2009-07-14 18:39:11 +0000
@@ -132,7 +132,6 @@ WITH GRANT OPTION;
 eval $select;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , db_datadict);
 eval $select;

=== modified file 'mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test'
--- a/mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test	2009-07-14 18:39:11 +0000
@@ -46,7 +46,6 @@ eval $my_show2;
 eval $my_show3;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , db_datadict);
 eval $my_select;

=== modified file 'mysql-test/suite/funcs_1/t/is_columns.test'
--- a/mysql-test/suite/funcs_1/t/is_columns.test	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/t/is_columns.test	2009-07-14 18:39:11 +0000
@@ -148,7 +148,6 @@ eval $my_show2;
 eval $my_show3;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , db_datadict);
 --source suite/funcs_1/datadict/datadict_bug_12777.inc

=== modified file 'mysql-test/suite/funcs_1/t/is_schema_privileges.test'
--- a/mysql-test/suite/funcs_1/t/is_schema_privileges.test	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/t/is_schema_privileges.test	2009-07-14 18:39:11 +0000
@@ -116,7 +116,6 @@ let $show_testuser1 = SHOW GRANTS FOR 't
 let $show_testuser2 = SHOW GRANTS FOR 'testuser2'@'localhost';
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , test);
 GRANT SELECT ON db_datadict_4.*  TO 'testuser2'@'localhost';
@@ -134,7 +133,6 @@ eval $show_testuser1;
 eval $show_testuser2;
 
 --echo # Establish connection testuser2 (user=testuser2)
---replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser2, localhost, testuser2, , test);
 --echo # Root granted SELECT db_datadict_1 to me     -> visible
 --echo # Root granted INSERT db_datadict_1 to testuser1 -> invisible

=== modified file 'mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test'
--- a/mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test	2009-07-14 18:39:11 +0000
@@ -46,7 +46,6 @@ eval $my_show2;
 eval $my_show3;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , db_datadict);
 eval $my_select;

=== modified file 'mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test'
--- a/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test	2009-07-14 18:39:11 +0000
@@ -46,7 +46,6 @@ eval $my_show2;
 eval $my_show3;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , db_datadict);
 eval $my_select;

=== modified file 'mysql-test/suite/funcs_1/t/is_statistics.test'
--- a/mysql-test/suite/funcs_1/t/is_statistics.test	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/t/is_statistics.test	2009-07-14 18:39:11 +0000
@@ -140,7 +140,6 @@ eval $my_show1;
 eval $my_show2;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , test);
 # nothing visible for testuser1

=== modified file 'mysql-test/suite/funcs_1/t/is_table_constraints.test'
--- a/mysql-test/suite/funcs_1/t/is_table_constraints.test	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/t/is_table_constraints.test	2009-07-14 18:39:11 +0000
@@ -132,7 +132,6 @@ eval $my_show1;
 eval $my_show2;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , db_datadict);
 SHOW GRANTS FOR 'testuser1'@'localhost';

=== modified file 'mysql-test/suite/funcs_1/t/is_table_privileges.test'
--- a/mysql-test/suite/funcs_1/t/is_table_privileges.test	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/t/is_table_privileges.test	2009-07-14 18:39:11 +0000
@@ -116,7 +116,6 @@ WHERE table_name LIKE 'tb%'
 ORDER BY grantee,table_schema,table_name,privilege_type;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , db_datadict);
 --replace_result $other_engine_type <other_engine_type>

=== modified file 'mysql-test/suite/funcs_1/t/is_user_privileges.test'
--- a/mysql-test/suite/funcs_1/t/is_user_privileges.test	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/t/is_user_privileges.test	2009-07-14 18:39:11 +0000
@@ -114,7 +114,6 @@ eval $my_select1;
 eval $my_select2;
 
 --echo # Establish connection testuser1 (user=testuser1)
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser1, localhost, testuser1, , db_datadict);
 eval $my_select1;

=== modified file 'mysql-test/suite/funcs_1/t/storedproc.test'
--- a/mysql-test/suite/funcs_1/t/storedproc.test	2009-02-13 18:07:56 +0000
+++ b/mysql-test/suite/funcs_1/t/storedproc.test	2009-07-14 18:39:11 +0000
@@ -817,7 +817,6 @@ CREATE PROCEDURE sp11() insert into mysq
 --replace_column 13 created 14 modified
 SELECT security_type from mysql.proc where specific_name='sp11';
 
-let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (u_1, localhost, user_1, , db_storedproc);
 --source suite/funcs_1/include/show_connection.inc

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_03.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_03.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03.inc	2009-07-14 18:39:11 +0000
@@ -62,7 +62,6 @@ let $message= Testcase 3.5.3.2/6:;
 	grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
-        let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
 	connect (no_privs,localhost,test_noprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc	2009-07-14 18:39:11 +0000
@@ -36,7 +36,6 @@ let $message= ####### Testcase for colum
         grant SELECT,UPDATE on priv_db.* to test_noprivs@localhost;
         show grants for test_noprivs@localhost;
 
-	let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
 	connect (yes_privs,localhost,test_yesprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc	2009-07-14 18:39:11 +0000
@@ -37,7 +37,6 @@ let $message= Testcase for db level:;
         show grants for test_noprivs@localhost;
 
 # no trigger privilege->create trigger must fail:
-        let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
 	connect (yes_privs,localhost,test_yesprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 let $message= no trigger privilege on db level for create:;

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc	2009-07-14 18:39:11 +0000
@@ -41,7 +41,6 @@ let $message= ####### Testcase for mix o
         grant SELECT,INSERT on priv2_db.* to test_noprivs@localhost;
         show grants for test_noprivs@localhost;
 
-        let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
 	connect (yes_privs,localhost,test_yesprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 	use priv1_db;

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc	2009-07-14 18:39:11 +0000
@@ -27,7 +27,6 @@ let $message= #########      Testcase fo
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 
-        let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
 	connect (yes_privs,localhost,test_yesprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc	2009-07-14 18:39:11 +0000
@@ -38,7 +38,6 @@ let $message= #### Testcase for mix of u
         grant SELECT,INSERT  on *.* to test_noprivs@localhost;
         show grants for test_noprivs@localhost;
 
-        let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
 	connect (yes_privs,localhost,test_yesprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc	2009-07-14 18:39:11 +0000
@@ -32,7 +32,6 @@ let $message= #### Testcase for trigger 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
         revoke ALL PRIVILEGES, GRANT OPTION FROM test_useprivs@localhost;
 
-	let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
 	connect (yes_privs,localhost,test_yesprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc	2009-07-14 18:39:11 +0000
@@ -30,7 +30,6 @@ let $message= #########      Testcase fo
         set password for test_noprivs@localhost = password('PWD');
         revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
 
-        let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
 	connect (yes_privs,localhost,test_yesprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc	2009-07-14 18:39:11 +0000
@@ -27,7 +27,6 @@ let $message= #########      Testcase fo
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
 
-        let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
 	connect (yes_privs,localhost,test_yesprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_0407.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_0407.inc	2009-02-13 18:07:56 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_0407.inc	2009-07-14 18:39:11 +0000
@@ -22,7 +22,6 @@ let $message= Testcase: 3.5:;
 	create User test_super@localhost;
 	set password for test_super@localhost = password('PWD');
 	grant ALL on *.* to test_super@localhost with grant OPTION;
-        let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
 	connect (con1_general,localhost,test_general,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_08.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_08.inc	2009-02-01 17:15:58 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_08.inc	2009-07-14 18:39:11 +0000
@@ -23,7 +23,6 @@ let $message= Testcase: 3.5:;
 	create User test_super@localhost;
 	set password for test_super@localhost = password('PWD');
 	grant ALL on *.* to test_super@localhost with grant OPTION;
-        let $MASTER_MYSOCK= query_get_value(SHOW VARIABLES LIKE 'socket', Value, 1);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
 	connect (con2_general,localhost,test_general,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20090715200643-kggb6e73hsm7sc91.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:2952)Magnus Blåudd15 Jul