bk commit into 4.0 tree (1.1476)

Below is the list of changes that have just been committed into a local
4.0 repository of heikki. When heikki does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1476 03/04/27 17:25:39 heikki@xxxxxxxxxxxxxxx +3 -0
  trx0trx.h, trx0trx.c, ha_innodb.cc:
    Remove code never actually used in IGNORE; InnoDB just rolls back the 
latest row insert or update on a duplicate key error and leaves it for MySQL to 
decide whether to ignore the error

  innobase/include/trx0trx.h
    1.24 03/04/27 17:24:19 heikki@xxxxxxxxxxxxxxx +0 -4
    Remove code never actually used in IGNORE; InnoDB just rolls back the 
latest row insert or update on a duplicate key error and leaves it for MySQL to 
decide whether to ignore the error

  innobase/trx/trx0trx.c
    1.23 03/04/27 17:24:13 heikki@xxxxxxxxxxxxxxx +0 -2
    Remove code never actually used in IGNORE; InnoDB just rolls back the 
latest row insert or update on a duplicate key error and leaves it for MySQL to 
decide whether to ignore the error

  sql/ha_innodb.cc
    1.170 03/04/27 17:23:53 heikki@xxxxxxxxxxxxxxx +0 -9
    Remove code never actually used in IGNORE; InnoDB just rolls back the 
latest row insert or update on a duplicate key error and leaves it for MySQL to 
decide whether to ignore the error

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: heikki
# Host: hundin.mysql.fi
# Root: /home/heikki/mysql-4.0

--- 1.23/innobase/include/trx0trx.h     Thu Nov  7 14:33:27 2002
+++ 1.24/innobase/include/trx0trx.h     Sun Apr 27 17:24:19 2003
@@ -418,10 +418,6 @@
        lock_t*         auto_inc_lock;  /* possible auto-inc lock reserved by
                                        the transaction; note that it is also
                                        in the lock list trx_locks */
-        ibool           ignore_duplicates_in_insert;
-                                        /* in an insert roll back only insert
-                                        of the latest row in case
-                                        of a duplicate key error */
        UT_LIST_NODE_T(trx_t)
                        trx_list;       /* list of transactions */
        UT_LIST_NODE_T(trx_t)

--- 1.22/innobase/trx/trx0trx.c Wed Jan 15 21:26:37 2003
+++ 1.23/innobase/trx/trx0trx.c Sun Apr 27 17:24:13 2003
@@ -102,8 +102,6 @@
        trx->mysql_master_log_file_name = (char*) "";
        trx->mysql_master_log_pos = 0;
        
-       trx->ignore_duplicates_in_insert = FALSE;
-
        mutex_create(&(trx->undo_mutex));
        mutex_set_level(&(trx->undo_mutex), SYNC_TRX_UNDO);
 

--- 1.169/sql/ha_innodb.cc      Thu Apr 24 23:23:57 2003
+++ 1.170/sql/ha_innodb.cc      Sun Apr 27 17:23:53 2003
@@ -1911,13 +1911,6 @@
                build_template(prebuilt, NULL, table, ROW_MYSQL_WHOLE_ROW);
        }
 
-       if (user_thd->lex.sql_command == SQLCOM_INSERT
-           && user_thd->lex.duplicates == DUP_IGNORE) {
-               prebuilt->trx->ignore_duplicates_in_insert = TRUE;
-        } else {
-               prebuilt->trx->ignore_duplicates_in_insert = FALSE;
-       }
-
        srv_conc_enter_innodb(prebuilt->trx);
 
        error = row_insert_for_mysql((byte*) record, prebuilt);
@@ -1957,8 +1950,6 @@
                        auto_inc_counter_for_this_stat--;
                }
        }
-
-       prebuilt->trx->ignore_duplicates_in_insert = FALSE;
 
        error = convert_error_code_to_mysql(error, user_thd);
 

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx