Fixed merge problems.

BitKeeper/etc/ignore:
  Added libmysql_r/client_settings.h libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc to the ignore list

.bzrignore

@@ -3056,3 +3056,7 @@ win/vs71cache.txt
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
+libmysql_r/client_settings.h
+libmysqld/scheduler.cc
+libmysqld/sql_connect.cc
+libmysqld/sql_tablespace.cc

client/mysqltest.c

@@ -64,7 +64,6 @@ enum {
   OPT_SKIP_SAFEMALLOC=OPT_MAX_CLIENT_OPTION,
   OPT_PS_PROTOCOL, OPT_SP_PROTOCOL, OPT_CURSOR_PROTOCOL, OPT_VIEW_PROTOCOL,
   OPT_MAX_CONNECT_RETRIES, OPT_MARK_PROGRESS, OPT_LOG_DIR, OPT_TAIL_LINES,
-  OPT_MAX_CONNECT_RETRIES, OPT_MARK_PROGRESS, OPT_LOG_DIR,
   OPT_GLOBAL_SUBST
 };
 

sql/slave.cc

@@ -29,8 +29,6 @@
 #include <errmsg.h>
 #include <mysys_err.h>
 
-static Log_event* next_event(RELAY_LOG_INFO* rli);
-
 #ifdef HAVE_REPLICATION
 
 #include "rpl_tblmap.h"

sql/sql_yacc.yy

@@ -4499,13 +4499,6 @@ create_table_option:
             Lex->create_info.used_fields|= HA_CREATE_USED_KEY_BLOCK_SIZE;
             Lex->create_info.key_block_size= $3;
           }
-        | TRANSACTIONAL_SYM opt_equal ulong_num
-          {
-	    Lex->create_info.used_fields|= HA_CREATE_USED_TRANSACTIONAL;
-            Lex->create_info.transactional= ($3 != 0 ? HA_CHOICE_YES :
-        				     HA_CHOICE_NO);
-          }
-
         | TRANSACTIONAL_SYM opt_equal ulong_num
           {
 	    Lex->create_info.used_fields|= HA_CREATE_USED_TRANSACTIONAL;

storage/maria/ha_maria.cc

@@ -686,41 +686,6 @@ err:
 }
 #endif                                          /* HAVE_REPLICATION */
 
-
-bool ha_maria::check_if_locking_is_allowed(uint sql_command,
-                                           ulong type, TABLE *table,
-                                           uint count, uint current,
-                                           uint *system_count,
-                                           bool called_by_privileged_thread)
-{
-  /*
-     To be able to open and lock for reading system tables like 'mysql.proc',
-     when we already have some tables opened and locked, and avoid deadlocks
-     we have to disallow write-locking of these tables with any other tables.
-  */
-  if (table->s->system_table &&
-      table->reginfo.lock_type >= TL_WRITE_ALLOW_WRITE)
-    (*system_count)++;
-
-  /* 'current' is an index, that's why '<=' below. */
-  if (*system_count > 0 && *system_count <= current)
-  {
-    my_error(ER_WRONG_LOCK_OF_SYSTEM_TABLE, MYF(0));
-    return FALSE;
-  }
-
-  /*
-    Deny locking of the log tables, which is incompatible with
-    concurrent insert. Unless called from a logger THD (general_log_thd
-    or slow_log_thd) or by a privileged thread.
-  */
-  if (!called_by_privileged_thread)
-    return check_if_log_table_locking_is_allowed(sql_command, type, table);
-
-  return TRUE;
-}
-
-
         /* Name is here without an extension */
 
 int ha_maria::open(const char *name, int mode, uint test_if_locked)

storage/maria/ha_maria.h

@@ -66,11 +66,6 @@ public:
   uint checksum() const;
   virtual double scan_time();
 
-  virtual bool check_if_locking_is_allowed(uint sql_command,
-                                           ulong type, TABLE * table,
-                                           uint count, uint current,
-                                           uint *system_count,
-                                           bool called_by_logger_thread);
   int open(const char *name, int mode, uint test_if_locked);
   int close(void);
   int write_row(uchar * buf);