From 5df61c3cdc4499197e420a76b25b942dce0f3ccc Mon Sep 17 00:00:00 2001
From: unknown <sasha@mysql.sashanet.com>
Date: Sat, 19 Jan 2002 19:16:52 -0700
Subject: Here comes a nasty patch, although I am not ready to push it yet. I
 will first pull, merge,test, and get it to work.

The main change is the new replication code - now we have two slave threads
SQL thread and I/O thread. I have also re-written a lot of the code to
prepare for multi-master implementation.

I also documented IO_CACHE quite extensively and to some extend, THD class.


Makefile.am:
  moved tags target script into a separate file
include/my_sys.h:
  fixes in IO_CACHE for SEQ_READ_APPEND + some documentation
libmysqld/lib_sql.cc:
  updated replication locks, but now I see I did it wrong and it won't compile. Will fix
  before the push.
mysql-test/r/rpl000014.result:
  test result update
mysql-test/r/rpl000015.result:
  test result update
mysql-test/r/rpl000016.result:
  test result update
mysql-test/r/rpl_log.result:
  test result update
mysql-test/t/rpl000016-slave.sh:
  remove relay logs
mysql-test/t/rpl000017-slave.sh:
  remove relay logs
mysql-test/t/rpl_log.test:
  updated test
mysys/mf_iocache.c:
  IO_CACHE updates to make replication work
mysys/mf_iocache2.c:
  IO_CACHE update to make replication work
mysys/thr_mutex.c:
  cosmetic change
sql/item_func.cc:
  new replication code
sql/lex.h:
  new replication
sql/log.cc:
  new replication
sql/log_event.cc:
  new replication
sql/log_event.h:
  new replication
sql/mini_client.cc:
  new replication
sql/mini_client.h:
  new replication
sql/mysql_priv.h:
  new replication
sql/mysqld.cc:
  new replication
sql/repl_failsafe.cc:
  new replication
sql/slave.cc:
  new replication
sql/slave.h:
  new replication
sql/sql_class.cc:
  new replication
sql/sql_class.h:
  new replication
sql/sql_lex.h:
  new replication
sql/sql_parse.cc:
  new replication
sql/sql_repl.cc:
  new replication
sql/sql_repl.h:
  new replication
sql/sql_show.cc:
  new replication
sql/sql_yacc.yy:
  new replication
sql/stacktrace.c:
  more robust stack tracing
sql/structs.h:
  new replication code
BitKeeper/etc/ignore:
  Added mysql-test/r/rpl000002.eval mysql-test/r/rpl000014.eval mysql-test/r/rpl000015.eval mysql-test/r/rpl000016.eval mysql-test/r/slave-running.eval mysql-test/r/slave-stopped.eval to the ignore list
---
 sql/sql_yacc.yy | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'sql/sql_yacc.yy')

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 01ba468175e..2b62ee03575 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -2453,15 +2453,14 @@ show_param:
 	      YYABORT;
 	  }
         | NEW_SYM MASTER_SYM FOR_SYM SLAVE WITH MASTER_LOG_FILE_SYM EQ 
-	  TEXT_STRING AND MASTER_LOG_POS_SYM EQ ulonglong_num AND
-	MASTER_LOG_SEQ_SYM EQ ULONG_NUM AND MASTER_SERVER_ID_SYM EQ
+	  TEXT_STRING AND MASTER_LOG_POS_SYM EQ ulonglong_num
+	  AND MASTER_SERVER_ID_SYM EQ
 	ULONG_NUM
           {
 	    Lex->sql_command = SQLCOM_SHOW_NEW_MASTER;
 	    Lex->mi.log_file_name = $8.str;
 	    Lex->mi.pos = $12;
-	    Lex->mi.last_log_seq = $16;
-	    Lex->mi.server_id = $20;
+	    Lex->mi.server_id = $16;
           }
         | MASTER_SYM LOGS_SYM
           {
@@ -3083,12 +3082,18 @@ option_value:
 	   }
          | SQL_SLAVE_SKIP_COUNTER equal ULONG_NUM
           {
-	    pthread_mutex_lock(&LOCK_slave);
-	    if (slave_running)
+	    LOCK_ACTIVE_MI;
+	    pthread_mutex_lock(&active_mi->rli.run_lock);
+	    if (active_mi->rli.slave_running)
 	      send_error(&current_thd->net, ER_SLAVE_MUST_STOP);
 	    else
-	      slave_skip_counter = $3;
-	    pthread_mutex_unlock(&LOCK_slave);
+	    {
+	      pthread_mutex_lock(&active_mi->rli.data_lock);
+	      active_mi->rli.slave_skip_counter = $3;
+	      pthread_mutex_unlock(&active_mi->rli.data_lock);
+	    }
+	    pthread_mutex_unlock(&active_mi->rli.run_lock);
+	    UNLOCK_ACTIVE_MI;
           }
 	| ident equal DEFAULT
 	  {
-- 
cgit v1.2.1