Cleanup rpl_ddl_high_priority.inc and fix a typo

Summary:
Squash with D5679795.

Slave thread no longer needs to set lock_wait_timeout for high_priority commands.

Reviewed By: abhinav04sharma

Differential Revision: D5682683

fbshipit-source-id: 06ee30b

mysql-test/include/rpl_ddl_high_priority.inc

@@ -25,19 +25,6 @@ sync_slave_with_master;
 connection slave;
 select * from t1;
 
-let $sql_thread=`select id from information_schema.processlist where state
- like 'Slave has read all relay log; waiting for the slave I/O thread%'`;
-let $worker_thread=`select id from information_schema.processlist where state
- like 'Waiting for%'`;
-
---echo # set slave thread's lock_wait_timeout to a small value
-
---replace_regex /session [0-9]*/session sql_thread/
---eval set session $sql_thread lock_wait_timeout = 0.2
-
---replace_regex /session [0-9]*/session sql_thread/
---eval show session $sql_thread variables like 'lock_wait_timeout'
-
 --echo connection slave_block
 connection slave_block;
 
@@ -51,7 +38,7 @@ connection master;
 create high_priority index idx1 on t1 (i);
 show create table t1;
 
-# sync
+# sync. high_priority_lock_wait_timeout is 1 second by default
 sync_slave_with_master;
 
 --echo connection slave;

mysql-test/r/mysqld--help-notwin-profiling.result

@@ -342,7 +342,7 @@ The following options may be given as the first argument:
  --high-priority-lock-wait-timeout=# 
  Timeout in seconds to wait for a lock before returning an
  error. This timeout is specifically for high_priority
- commands (DDLs), when a high_priority keyward is
+ commands (DDLs), when a high_priority keyword is
  specified, or the high_priority_ddl variable is turned
  on. The argument will be treated as a decimal value with
  nanosecond precision.

mysql-test/r/mysqld--help-notwin.result

@@ -342,7 +342,7 @@ The following options may be given as the first argument:
  --high-priority-lock-wait-timeout=# 
  Timeout in seconds to wait for a lock before returning an
  error. This timeout is specifically for high_priority
- commands (DDLs), when a high_priority keyward is
+ commands (DDLs), when a high_priority keyword is
  specified, or the high_priority_ddl variable is turned
  on. The argument will be treated as a decimal value with
  nanosecond precision.

mysql-test/suite/rocksdb_rpl/r/rpl_ddl_high_priority.result

@@ -18,11 +18,6 @@ i
 1
 2
 3
-# set slave thread's lock_wait_timeout to a small value
-set session sql_thread lock_wait_timeout = 0.2;
-show session sql_thread variables like 'lock_wait_timeout';
-Variable_name	Value
-lock_wait_timeout	0.200000
 connection slave_block
 lock tables t1 read;
 connection master;

mysql-test/suite/rpl/r/rpl_ddl_high_priority.result

@@ -18,11 +18,6 @@ i
 1
 2
 3
-# set slave thread's lock_wait_timeout to a small value
-set session sql_thread lock_wait_timeout = 0.2;
-show session sql_thread variables like 'lock_wait_timeout';
-Variable_name	Value
-lock_wait_timeout	0.200000
 connection slave_block
 lock tables t1 read;
 connection master;

sql/sys_vars.cc

@@ -1910,7 +1910,7 @@ static Sys_var_double Sys_high_priority_lock_wait_timeout(
        "high_priority_lock_wait_timeout",
        "Timeout in seconds to wait for a lock before returning an error. "
        "This timeout is specifically for high_priority commands (DDLs), "
-       "when a high_priority keyward is specified, or the high_priority_ddl "
+       "when a high_priority keyword is specified, or the high_priority_ddl "
        "variable is turned on. "
        "The argument will be treated as a decimal value with nanosecond "
        "precision.",