An error occurred fetching the project authors.
  1. 10 Aug, 2006 1 commit
    • unknown's avatar
      This is the second patch for bdb removeal. This takes care of all options and... · 04d2b020
      unknown authored
      This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb. 
      
      
      BitKeeper/deleted/.del-ha_berkeley.cc:
        Delete: sql/ha_berkeley.cc
      BitKeeper/deleted/.del-ha_berkeley.h:
        Delete: sql/ha_berkeley.h
      mysql-test/install_test_db.sh:
        Removed skip option
      mysql-test/mysql-test-run.pl:
        Remove bdb option
      mysql-test/mysql-test-run.sh:
        Remove bdb option
      sql/Makefile.am:
        Remove bdb option
      sql/handler.cc:
        Remove references to bdb
      sql/lex.h:
        Removed lex for bdb
      sql/mysql_priv.h:
        Removed bdb privs
      sql/mysqld.cc:
        Removed all options for bdb
      sql/set_var.cc:
        Removed variables for bdb
      sql/sql_yacc.yy:
        Removed yacc for bdb
      04d2b020
  2. 03 Aug, 2006 1 commit
    • unknown's avatar
      Fix Bug #18559 "log tables cannot change engine, and · 157c42de
      unknown authored
                      gets deadlocked when dropping w/ log on"
      
      Log tables rely on concurrent insert machinery to add data.
      This means that log tables are always opened and locked by
      special (artificial) logger threads. Because of this, the thread
      which tries to drop a log table starts to wait for the table
      to be unlocked. Which will happen only if the log table is disabled.
      Alike situation happens if one tries to alter a log table.
      However in addition to the problem above, alter table calls
      check_if_locking_is_allowed() routine for the engine. The
      routine does not allow alter for the log tables. So, alter
      doesn't start waiting forever for logs to be disabled, but 
      returns with an error.
      Another problem is that not all engines could be used for
      the log tables. That's because they need concurrent insert.
      
      In this patch we:
      (1) Explicitly disallow to drop/alter a log table if it
          is currently used by the logger.
      (2) Update MyISAM to support log tables
      (3) Allow to drop log tables/alter log tables if log is
          disabled
      At the same time we (4) Disallow to alter log tables to
      unsupported engine (after this patch CSV and MyISAM are 
      alowed)
      Recommit with review fixes.
      
      
      mysql-test/r/log_tables.result:
        Update result file.
        Note: there are warnings in result file. This is because of CSV
        bug (Bug #21328). They should go away after it is fixed.
      mysql-test/t/log_tables.test:
        Add a test for the bug
      sql/ha_myisam.cc:
        Add log table handling to myisam: as log tables
        use concurrent insert, they are typically
        locked with TL_CONCURRERENT_INSERT lock. So,
        disallow other threads to attempt locking of
        the log tables in incompatible modes. Because
        otherwise the threads will wait for the tables
        to be unlocked forever.
      sql/handler.cc:
        Add a function to check if a table we're going to lock
        is a log table and if the lock mode we want allowed
      sql/handler.h:
        Add a new function to check compatibility of the locking
      sql/log.cc:
        we shouldn't close the log table if and only
        if this particular table is already closed
      sql/log.h:
        add new functions to check if a log is enabled
      sql/share/errmsg.txt:
        add new error messages
      sql/sql_table.cc:
        DROP and ALTER TABLE should not work on log
        tables if the log tables are enabled
      storage/csv/ha_tina.cc:
        move function to check if the locking for the log
        tables allowed to handler class, so that we can
        reuse it in other engines.
      storage/myisam/mi_extra.c:
        add new ::extra() flag processing to myisam
      storage/myisam/mi_open.c:
        init log table flag
      storage/myisam/mi_write.c:
        update status after each write if it's a log table
      storage/myisam/myisamdef.h:
        Add new log table flag to myisam share.
        We need it to distinguish between usual
        and log tables, as for the log tables we
        should provide concurrent insert in a
        different way than for usual tables: we
        want new rows to be immediately visible
        to other threads.
      157c42de
  3. 21 Jul, 2006 1 commit
  4. 20 Jul, 2006 1 commit
    • unknown's avatar
      Finish the merge of the patch for bug #15195 from 4.1 -> 5.0 · 93eef69d
      unknown authored
      - Adapt it to work with the handlerton class
      
      
      sql/handler.cc:
        Only create new MERGE handler if merge engine is enabled
      sql/mysql_priv.h:
        Use the myisammrg_hton.state field for the have_merge_db option
      sql/mysqld.cc:
        Handle the OPT_MERGE (--skip-merge) option case
      93eef69d
  5. 14 Jul, 2006 1 commit
  6. 12 Jul, 2006 1 commit
    • unknown's avatar
      Bug #17766: The server accepts to create MERGE tables which cannot work · 97cdd9df
      unknown authored
       Changed the error reporting (and a crash) when inserting data into a
       MERGE table that has no underlying tables or no INSERT_METHOD specified
       by reporting that it is read-only.
      
      
      include/my_base.h:
        Add new handler error
      mysql-test/r/merge.result:
        Update results
      mysql-test/t/merge.test:
        Add new regression test
      sql/ha_myisammrg.cc:
        When trying to insert into a MERGE table with no underlying tables
        or no INSERT_METHOD, report that it is read-only.
      sql/handler.cc:
        Handle new error message
      97cdd9df
  7. 10 Jul, 2006 1 commit
    • unknown's avatar
      fixes after merge. Updates to test's results. · 20c59f9c
      unknown authored
      We now reset the THD members related to auto_increment+binlog in
      MYSQL_LOG::write(). This is better than in THD::cleanup_after_query(),
      which was not able to distinguish between SELECT myfunc1(),myfunc2()
      and INSERT INTO t SELECT myfunc1(),myfunc2() from a binlogging point
      of view.
      Rows_log_event::exec_event() now calls lex_start() instead of
      mysql_init_query() because the latter now does too much (it resets
      the binlog format).
      
      
      mysql-test/extra/rpl_tests/rpl_insert_id.test:
        fix after merge
      mysql-test/mysql-test-run.pl:
        -v does not bring useful information when running valgrind; I remove it;
        if you think it's useful add it back.
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Position columns of SHOW BINLOG EVENTS are replaced by # (more robust
        if the size of an event changes).
      mysql-test/r/rpl_insert_id.result:
        fix after merge
      mysql-test/r/rpl_loaddata.result:
        The binlog positions change, because one event disappeared; indeed there
        was this in the binlog (in the current 5.1!):
        SET INSERT_ID=2;
        SET INSERT_ID=1;
        SET TIMESTAMP=1152540671;
        load data LOCAL INFILE '/tmp/SQL_LOAD_MB-1-2' INTO table t1;
        Two INSERT_ID events, useless and a bug. Goes away afer cleaning up
        auto_increment handling.
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        INSERT_ID=5 appears, it's a consequence of having merged the fix
        for BUG#20341
        "stored function inserting into one auto_increment puts bad data in slave".
        In mixed mode, if one substatement of a stored procedure requires row-based,
        the entire procedure uses row-based (was already true for stored functions);
        this is a consequence of not doing the resetting of binlog format inside
        lock_tables() (which didn't work with how the slave thread executes
        row-based binlog events).
      mysql-test/t/rpl_switch_stm_row_mixed.test:
        removing the multi-row delayed insert because in RBR the number of events
        which it generates, is not repeatable (probably depends on how the delayed
        thread groups rows, i.e. dependent on timing).
      sql/ha_partition.cc:
        update to new prototype
      sql/ha_partition.h:
        update to new prototype of the handler:: method.
      sql/handler.cc:
        after-merge fixes (manually merging part which was hard to merge in fmtool)
      sql/log.cc:
        When we write to the binary log, THD's parameters which influenced this
        write are reset: stmt_depends_on_first_successful_insert_id_in_prev_stmt
        and auto_inc_intervals_in_cur_stmt_for_binlog. This is so that future
        writes are not influenced by those and can write their own values.
        As a consequence, when we don't write to the binlog we do not reset.
        This is to abide by the rule that in a complex statement (using triggers etc),
        the first top- or substatement to generate auto_increment ids
        wins their writing to the binlog (that writing may be done by the statement
        itself or by the caller); so for example for
        INSERT INTO t SELECT myfunc() where myfunc() inserts into auto_increment
        and INSERT INTO t does not, myfunc() will fill
        auto_inc_intervals_in_cur_stmt_for_binlog, which will not be reset when
        myfunc() ends, then INSERT INTO t will write to the binlog and thus
        write the preserved auto_inc_intervals_in_cur_stmt_for_binlog.
      sql/log_event.cc:
        mysql_init_query() does too much now to be called in Rows_log_event::exec_event
        (it call mysql_reset_thd_for_next_command() which may switch
        the binlog format now).
        It's ok to call it in Table_map_log_event::exec_event() but its call must
        be before setting the binlog format to "row".
      sql/sql_base.cc:
        Resetting the binlog format in lock_tables() was a bad idea of mine;
        it causes problems in execution of row-based binlog events, where
        the thread sets the binlog format by itself and does not want a next
        lock_tables() to reset the binlog format.
        It is also misleading, for a function named lock_tables(), to reset
        the binlog format.
        As a consequence of this change, in mixed binlogging mode, a routine
        is logged either entirely statement-based or entirely row-based, we
        don't switch in the middle (this was already true for prelocked routines,
        now it's also true for stored procedures).
      sql/sql_class.cc:
        resetting of auto_increment variables used for binlogging is now done
        when writing to the binary log, no need to do the resetting at the end
        of the statement. It is also more correct this way; consider
        SELECT myfunc1(),myfunc2();
        where both functions insert into the same auto_increment column.
        Binlogging is done in 2 events: "SELECT myfunc1()" and "SELECT myfunc2()".
        So each of those needs to have, in binlog, the INSERT_ID which
        it inserted. But as the 2 function calls are executed under prelocked mode,
        the old code didn't reset auto_inc_intervals_in_cur_stmt_for_binlog
        after the first SELECT was binlogged, and so the INSERT_ID of the first
        SELECT was binlogged for the first SELECT and (wrong) also for the 2nd
        SELECT event.
        stmt_depends_on_first_... has the same logic.
      sql/sql_class.h:
        clearer comment
      sql/sql_delete.cc:
        unneeded #ifdef. As we temporarily change the binlog format to "statement"
        before calling mysql_delete(), we must restore it afterwards.
      sql/sql_insert.cc:
        after-merge fixes.
        No need to reset auto_inc_intervals_in_cur_stmt_for_binlog for every
        row in the delayed insert system thread, because we already reset it
        when writing to the binlog.
      sql/sql_parse.cc:
        unneeded #ifdef
      20c59f9c
  8. 09 Jul, 2006 1 commit
    • unknown's avatar
      WL#3146 "less locking in auto_increment": · 60272e75
      unknown authored
      this is a cleanup patch for our current auto_increment handling:
      new names for auto_increment variables in THD, new methods to manipulate them
      (see sql_class.h), some move into handler::, causing less backup/restore
      work when executing substatements. 
      This makes the logic hopefully clearer, less work is is needed in
      mysql_insert().
      By cleaning up, using different variables for different purposes (instead
      of one for 3 things...), we fix those bugs, which someone may want to fix
      in 5.0 too:
      BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
      statement-based"
      BUG#20341 "stored function inserting into one auto_increment puts bad
      data in slave"
      BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
      (now if a row is updated, LAST_INSERT_ID() will return its id)
      and re-fixes:
      BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
      (already fixed differently by Ramil in 4.1)
      Test of documented behaviour of mysql_insert_id() (there was no test).
      The behaviour changes introduced are:
      - LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
      successfully inserted", instead of "the first autogenerated auto_increment
      value if any row was successfully inserted", see auto_increment.test.
      Same for mysql_insert_id(), see mysql_client_test.c.
      - LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
      UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
      mysql_client_test.c.
      - LAST_INSERT_ID() does not change if no autogenerated value was successfully 
      inserted (it used to then be 0), see auto_increment.test.
      - if in INSERT SELECT no autogenerated value was successfully inserted,
      mysql_insert_id() now returns the id of the last inserted row (it already
      did this for INSERT VALUES), see mysql_client_test.c.
      - if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
      (it already did this for INSERT VALUES), see mysql_client_test.c.
      - NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
      the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
      influences not only the first row now.
      
      Additionally, when unlocking a table we check that the thread is not keeping
      a next_insert_id (as the table is unlocked that id is potentially out-of-date);
      forgetting about this next_insert_id is done in a new
      handler::ha_release_auto_increment().
      
      Finally we prepare for engines capable of reserving finite-length intervals
      of auto_increment values: we store such intervals in THD. The next step
      (to be done by the replication team in 5.1) is to read those intervals from
      THD and actually store them in the statement-based binary log. NDB
      will be a good engine to test that.
      
      
      mysql-test/extra/binlog_tests/binlog.test:
        Testing that if INSERT_ID is set to a value too big for the
        column's type, the binlogged INSERT_ID is the truncated value
        (important if slave has a column of a "wider" numeric type).
        Testing binlogging of INSERT_ID with INSERT DELAYED, to be sure that 
        we binlog an INSERT_ID event only for the delayed rows which use one.
      mysql-test/extra/rpl_tests/rpl_insert_id.test:
        Testcase for BUG#20339 "stored procedure using
        LAST_INSERT_ID() does not replicate statement-based".
        Testcase for BUG#20341 "stored function inserting into one
        auto_increment puts bad data in slave".
      mysql-test/extra/rpl_tests/rpl_loaddata.test:
        Test that LOAD DATA INFILE sets a value for a future LAST_INSERT_ID().
      mysql-test/r/auto_increment.result:
        behaviour change: when INSERT totally fails (not even succeeds
        partially and then rolls back), don't change last_insert_id().
        Behaviour change: LAST_INSERT_ID() is now the first successfully inserted,
        autogenerated, id.
        Behaviour change: if INSERT ON DUPLICATE KEY UPDATE, if the table has auto_increment
        and a row is updated, then LAST_INSERT_ID() returns the id of this row.
      mysql-test/r/binlog_row_binlog.result:
        result update
      mysql-test/r/binlog_stm_binlog.result:
        result update
      mysql-test/r/insert.result:
        result update
      mysql-test/r/rpl_insert_id.result:
        result update
      mysql-test/r/rpl_loaddata.result:
        result update
      mysql-test/r/rpl_ndb_auto_inc.result:
        ndb's behaviour is now like other engines wrt SET INSERT_ID
        in a multi-row INSERT:
        - with INSERT IGNORE: the id passed in SET INSERT_ID is re-used until
        a row succeeds.
        - generally, SET INSERT_ID sets the first value and other values are
        simply computed from this first value, instead of previously where
        the 2nd and subsequent values where not influenced by SET INSERT_ID;
        this good change is due to the removal of "thd->next_insert_id=0"
        from ha_ndbcluster.
      mysql-test/t/auto_increment.test:
        A testcase of BUG#19243: if ON DUPLICATE KEY UPDATE updates a row,
        LAST_INSERT_ID() now returns the id of the row.
        Test of new behaviour of last_insert_id() when no autogenerated value was
        inserted, or when only some autogenerated value (not the first of them) was
        inserted.
      mysql-test/t/insert.test:
        testing INSERT IGNORE re-using generated values
      sql/ha_federated.cc:
        update for new variables.
      sql/ha_ndbcluster.cc:
        handler::auto_increment_column_changed not needed, equivalent to
        (insert_id_for_cur_row > 0).
        thd->next_insert_id=0 not needed anymore; it was used to force
        handler::update_auto_increment() to call ha_ndbcluster::get_auto_increment()
        for each row of a multi-row INSERT, now this happens naturally
        because NDB says "I have reserved you *one* value" in get_auto_increment(),
        so handler::update_auto_increment() calls again for next row.
      sql/handler.cc:
        More comments, use of new methods and variables. Hopes to be clearer
        than current code.
        thd->prev_insert_id not in THD anymore: it is managed locally by inserters
        (like mysql_insert()).
        THD::clear_next_insert_id is now equivalent to
        handler::next_insert_id > 0.
        get_auto_increment() reserves an interval of values from the engine,
        uses this interval for next rows of the statement, until interval
        is exhausted then it asks for another interval (of a bigger size
        than the first one; size doubles until reaching 65535 then it stays constant).
        If doing statement-based binlogging, intervals are remembered in a list
        for storage in the binlog.
        For "forced" insert_id values (SET INSERT_ID or replication slave),
        forced_auto_inc_intervals is non-empty and the handler takes its intervals
        from there, without calling get_auto_increment().
        ha_release_auto_increment() resets the handler's auto_increment variables;
        it calls release_auto_increment() which is handler-dependent and
        serves to return to the engine any unused tail of the last used
        interval.
        If ending a statement, next_insert_id>0 means that autoinc values have been
        generated or taken from the master's binlog (in a replication slave) so
        we clear those values read from binlog, so that next top- or sub-
        statement does not use them.
      sql/handler.h:
        handler::auto_increment_changed can be replaced by
        (handler::insert_id_for_cur_row > 0).
        THD::next_insert_id moves into handler (more natural, and prepares
        for the day when we'll support a single statement inserting into
        two tables - "multi-table INSERT" like we have UPDATE - will this
        happen?).
        This move makes the backup/restore of THD::next_insert_id when entering
        a substatement unneeded, as each substatement has its own handler
        objects.
      sql/item_func.cc:
        new names for variables.
        For the setting of what mysql_insert_id() will return to the client,
        LAST_INSERT_ID(X) used to simply pretend that the generated autoinc
        value for the current row was X, but this led to having no reliable
        way to know the really generated value, so we now have a bool:
        thd->arg_of_last_insert_id_function which enables us to know that
        LAST_INSERT_ID(X) was called (and then X can be found in
        thd->first_successful_insert_id_in_prev_stmt).
      sql/log.cc:
        new variable names for insert_ids. Removing some unused variables in the slow
        log.
      sql/log_event.cc:
        new variable names, comments. Preparing for when master's won't binlog
        LAST_INSERT_ID if it was 0.
      sql/set_var.cc:
        new variable names.
        The last change repeats how Bar fixed BUG#20392
        "INSERT_ID session variable has weird value" in 5.0.
      sql/sql_class.cc:
        new variables for insert_id. In THD::cleanup_after_query() we fix
        BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
        statement-based" (will one want to fix it in 5.0?). Many comments
        about what stored functions do to auto_increment.
        In reset|restore_sub_statement_state(), we need to backup less
        auto_inc variables as some of them have moved to the handler;
        we backup/restore those which are about the current top- or sub-
        statement, *not* those about the statement-based binlog
        (which evolve as the top- and sub-statement execute).
        Because we split THD::last_insert_id into 
        THD::first_successful_insert_id_in_prev_stmt and
        THD::auto_inc_intervals_for_binlog (among others), we fix
        BUG#20341 "stored function inserting into one auto_increment
        puts bad data in slave": indeed we can afford to not backup/restore
        THD::auto_inc_intervals_for_binlog (which fixes the bug) while still
        backing up / restoring THD::first_successful_insert_id_in_prev_stmt
        (ensuring that the top-level LAST_INSERT_ID() is not affected by INSERTs
        done by sub-statements, as is desirable and tested in rpl_insert_id.test).
      sql/sql_class.h:
        new variables and methods for auto_increment.
        Some THD members move into handler (those which are really about
        the table being inserted), some stay in THD (those which are
        about what a future LAST_INSERT_ID() should return, or about
        what should be stored into the statement-based binlog).
        THD::next_insert_id moves to handler::.
        THD::clear_next_insert_id removed (had become equivalent
        to next_insert_id > 0).
        THD::last_insert_id becomes four:
        THD::first_successful_insert_id_in_cur_stmt,
        THD::auto_inc_intervals_for_binlog,
        handler::insert_id_for_cur_row,
        THD::first_successful_insert_id_in_prev_stmt.
        THD::current_insert_id becomes:
        THD::first_successful_insert_id_in_prev_stmt_for_binlog
        THD::prev_insert_id is removed, handler can just use
        handler::insert_id_for_cur_row instead (which is more accurate:
        for the first row, prev_insert_id was set before get_auto_increment
        was called, so was 0, causing a call to
        get_auto_increment() for the 2nd row if the 1st row fails;
        here we don't need the call as insert_id_for_cur_row has
        the value of the first row).
        THD::last_insert_id_used becomes: stmt_depends_on_first_row_in_prev_stmt
        THD::insert_id_used is removed (equivalent to
        auto_inc_intervals_for_binlog non empty).
        The interval returned by get_auto_increment() and currently being
        consumed is handler::auto_inc_interval_for_cur_row.
        Comments to explain each of them.
        select_insert::last_insert_id becomes autoinc_value_of_last_inserted_row.
      sql/sql_insert.cc:
        the "id" variable is not changed for each row now; it used to compensate for
        this contradiction:
        - thd->last_insert_id supposed job was to keep the id of the first row
        - but it was updated for every row
        - so mysql_insert() made sure to catch its first value and restore it at the end of stmt.
        Now THD keeps the first value in first_successful_insert_id_in_cur_stmt,
        and value of the row in insert_id_for_cur_row. So "id" only serves to fill
        mysql_insert_id(), as depending on some conditions, "id" must be different
        values.
        Prev_insert_id moves from THD to write_record().
        We now set LAST_INSERT_ID() in ON DUPLICATE KEY UPDATE too (BUG#19243).
        In an INSERT DELAYED, we still "reset auto-increment caching" but differently
        (by calling ha_release_auto_increment()).
      sql/sql_load.cc:
        no need to fiddle with "id", THD maintains
        THD::first_successful_insert_id_in_cur_stmt by itself and correctly now.
        ha_release_auto_increment() is now (logically) called before we unlock
        the table.
      sql/sql_parse.cc:
        update to new variable names.
        Assertion that reset_thd_for_next_command() is not called for every
        substatement of a routine (I'm not against it, but if we do this change,
        statement-based binlogging needs some adjustments).
      sql/sql_select.cc:
        update for new variable names
      sql/sql_table.cc:
        next_insert_id not needed in mysql_alter_table(), THD manages.
      sql/sql_update.cc:
        update for new variable names.
        Even though this is UPDATE, an insert id can be generated (by
        LAST_INSERT_ID(X)) and should be recorded because mysql_insert_id() wants
        to know about it.
      sql/structs.h:
        A class for "discrete" intervals (intervals of integer numbers with a certain
        increment between them): Discrete_interval, and a class for a list of such
        intervals: Discrete_intervals_list
      tests/mysql_client_test.c:
        tests of behaviour of mysql_insert_id(): there were no such tests, while in
        our manual we document its behaviour. In comments you'll notice the behaviour
        changes introduced (there are 5).
      60272e75
  9. 06 Jul, 2006 1 commit
    • unknown's avatar
      Fix for BUG#20524 "auto_increment_* not observed when inserting · 8646be88
      unknown authored
      a too large value": the bug was that if MySQL generated a value for an
      auto_increment column, based on auto_increment_* variables, and this value
      was bigger than the column's max possible value, then that max possible
      value was inserted (after issuing a warning). But this didn't honour
      auto_increment_* variables (and so could cause conflicts in a master-master
      replication where one master is supposed to generated only even numbers,
      and the other only odd numbers), so now we "round down" this max possible
      value to honour auto_increment_* variables, before inserting it.
      
      
      mysql-test/r/rpl_auto_increment.result:
        result update. Before the fix, the result was that master inserted 127 in t1
        (which didn't honour auto_increment_* variables!),
        instead of failing with "duplicate key 125" like now.
      mysql-test/t/rpl_auto_increment.test:
        Test for BUG#20524 "auto_increment_* not observed when inserting
        a too large value".
        We also check the pathological case (table t2) where it's impossible to
        "round down".
        The fixer of BUG#20573 will be able to use table t2 for testing his fix.
      sql/handler.cc:
        If handler::update_auto_increment() generates a value larger than the field's
        max possible value, we used to simply insert this max possible value
        (after pushing a warning). Now we "round down" this max possible value to
        honour auto_increment_* variables (if at all possible), before trying the
        insertion.
      8646be88
  10. 05 Jul, 2006 1 commit
    • unknown's avatar
      Fix for BUG#20188 "REPLACE or ON DUPLICATE KEY UPDATE in · 4e9d7d6c
      unknown authored
      auto_increment breaks binlog":
      if slave's table had a higher auto_increment counter than master's (even
      though all rows of the two tables were identical), then in some cases,
      REPLACE and INSERT ON DUPLICATE KEY UPDATE failed to replicate
      statement-based (it inserted different values on slave from on master).
      write_record() contained a "thd->next_insert_id=0" to force an adjustment
      of thd->next_insert_id after the update or replacement. But it is this
      assigment introduced indeterminism of the statement on the slave, thus
      the bug. For ON DUPLICATE, we replace that assignment by a call to
      handler::adjust_next_insert_id_after_explicit_value() which is deterministic
      (does not depend on slave table's autoinc counter). For REPLACE, this
      assignment can simply be removed (as REPLACE can't insert a number larger
      than thd->next_insert_id).
      We also move a too early restore_auto_increment() down to when we really know
      that we can restore the value.
      
      
      mysql-test/r/rpl_insert_id.result:
        result update, without the bugfix, slave's "3 350" were "4 350".
      mysql-test/t/rpl_insert_id.test:
        test for BUG#20188 "REPLACE or ON DUPLICATE KEY UPDATE in
        auto_increment breaks binlog".
        There is, in this order:
        - a test of the bug for the case of REPLACE
        - a test of basic ON DUPLICATE KEY UPDATE functionality which was not
        tested before
        - a test of the bug for the case of ON DUPLICATE KEY UPDATE
      sql/handler.cc:
        the adjustment of next_insert_id if inserting a big explicit value, is
        moved to a separate method to be used elsewhere.
      sql/handler.h:
        see handler.cc
      sql/sql_insert.cc:
        restore_auto_increment() means "I know I won't use this autogenerated
        autoincrement value, you are free to reuse it for next row". But we were
        calling restore_auto_increment() in the case of REPLACE: if write_row() fails
        inserting the row, we don't know that we won't use the value, as we are going to
        try again by doing internally an UPDATE of the existing row, or a DELETE
        of the existing row and then an INSERT. So I move restore_auto_increment()
        further down, when we know for sure we failed all possibilities for the row.
        Additionally, in case of REPLACE, we don't need to reset THD::next_insert_id:
        the value of thd->next_insert_id will be suitable for the next row.
        In case of ON DUPLICATE KEY UPDATE, resetting thd->next_insert_id is also
        wrong (breaks statement-based binlog), but cannot simply be removed, as
        thd->next_insert_id must be adjusted if the explicit value exceeds it.
        We now do the adjustment by calling
        handler::adjust_next_insert_id_after_explicit_value() (which, contrary to
        thd->next_insert_id=0, does not depend on the slave table's autoinc counter,
        and so is deterministic).
      4e9d7d6c
  11. 23 Jun, 2006 1 commit
  12. 22 Jun, 2006 3 commits
    • unknown's avatar
      Remove compiler warnings · e03f8ef2
      unknown authored
      Fixed wrong table flags type in ndbcluster that caused previous commit to fail
      
      
      client/mysqltest.c:
        Portability fix
      mysys/my_bitmap.c:
        Remove compiler warning
      mysys/my_handler.c:
        Remove compiler warning
      mysys/thr_lock.c:
        Remove compiler warning
      plugin/fulltext/plugin_example.c:
        Remove compiler warning
      sql/ha_ndbcluster.h:
        Fixed wrong of handler flags (caused previous commit to fail)
      sql/ha_ndbcluster_binlog.cc:
        Remove compiler warning
      sql/handler.cc:
        Indentation cleanups
      sql/mysql_priv.h:
        Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines)
      sql/mysqld.cc:
        Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines)
        Split initialization of variables of different types to remove compiler warning
      sql/set_var.cc:
        Fixed indentation
      sql/set_var.h:
        sys_var_log_output now takes a pointer to ulong
      storage/archive/archive_test.c:
        Remove compiler warning
      e03f8ef2
    • unknown's avatar
      Fixed failure with rpl_truncate_7ndb.test when using statement based replication. · b58e990c
      unknown authored
      is_injective -> table_flag() HA_HAS_OWN_BINLOGGING
      (Faster and easier to understand)
      Allow cluster_binlogging also in mixed replication mode.
      
      
      mysql-test/t/rpl_truncate_7ndb.test:
        Ensure that test is only run with mixed or row based replication
      sql/ha_ndbcluster.cc:
        Enforce row based replication if a cluster table is used
      sql/ha_ndbcluster.h:
        Remove is_injective() (Is now a table flag)
      sql/ha_ndbcluster_binlog.cc:
        Use cluster binlogging also in mixed binary logging
        (Using a cluster table will enforce row based replication in mixed mode, so this should be ok)
      sql/handler.cc:
        is_injective -> HA_HAS_OWN_BINLOGGING
      sql/handler.h:
        is_injective -> HA_HAS_OWN_BINLOGGING
      mysql-test/include/have_binlog_format_mixed_or_row.inc:
        New BitKeeper file ``mysql-test/include/have_binlog_format_mixed_or_row.inc''
      mysql-test/r/rpl_truncate_7ndb_2.result:
        New BitKeeper file ``mysql-test/r/rpl_truncate_7ndb_2.result''
      mysql-test/t/rpl_truncate_7ndb_2-master.opt:
        New BitKeeper file ``mysql-test/t/rpl_truncate_7ndb_2-master.opt''
      mysql-test/t/rpl_truncate_7ndb_2.test:
        New BitKeeper file ``mysql-test/t/rpl_truncate_7ndb_2.test''
      b58e990c
    • unknown's avatar
      Patch to handle some bad situations resulting from the fix for BUG#19995. · ab28aa9c
      unknown authored
      sql/handler.cc:
        Generating table maps from all locks that can be available: THD::extra_lock,
        THD::lock, and THD::locked_tables.
      sql/sql_class.h:
        Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create.
        Removing select_insert::lock.
      sql/sql_insert.cc:
        Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create.
        Removing select_insert::lock.
      ab28aa9c
  13. 16 Jun, 2006 1 commit
  14. 15 Jun, 2006 1 commit
  15. 12 Jun, 2006 1 commit
    • unknown's avatar
      Bug#20168 · 01e8913e
      unknown authored
        "Change in behavior --default-storage-engine=ndb or ndbcluster"
        Reduce use of legacy_db_type, some code cleanup
        (serg read my mind and implemented desired mysqld.cc changes)
      
      
      sql/handler.cc:
        Bug#20168
          remove some use of legacy_db_type
          cleanup code, new func for default type
      sql/handler.h:
        Bug#20168
          remove some use of legacy_db_type
          cleanup code, new func for default type
      sql/sql_plugin.cc:
        compiler hints, consts
      sql/sql_plugin.h:
        compiler hints, consts
      sql/sql_tablespace.cc:
        use ha_default_handlerton instead of resolving DB_TYPE_DEFAULT
      01e8913e
  16. 06 Jun, 2006 1 commit
    • unknown's avatar
      Manually reapplied msvenssons changes to new BK tree: · 0b870cc1
      unknown authored
      Add definition of YASSL_PREFIX to Cmake file
      Change "and" to "&&"
      Remove the "static" directive SunCC can't use the function
      
      
      extra/yassl/CMakeLists.txt:
        Add definition of YASSL_PREFIX to Cmake file
      sql/filesort.cc:
        Change "and" to "&&"
      sql/handler.cc:
         Remove the "static" directive SunCC can't use the function
      0b870cc1
  17. 05 Jun, 2006 1 commit
    • unknown's avatar
      After merge fixes · 6c3babe5
      unknown authored
      Remove compiler warnings
      
      
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Fixed regex to get rid of xid= in output
      mysql-test/r/mysqlcheck.result:
        Drop client_test_db if mysql_client_test fails
      mysql-test/t/mysqlcheck.test:
        Drop client_test_db if mysql_client_test fails
      mysql-test/t/mysqldump.test:
        Use --defaults-file instead of --defaults-extra-file to avoid reading my.cnf files
      sql/event_scheduler.cc:
        Remove compiler warnings
      sql/ha_partition.cc:
        Don't divide with 0 when checking current auto_increment value
      sql/handler.cc:
        After merge fix
      sql/mysqld.cc:
        Remove comiler warning
      sql/partition_info.cc:
        After merge fix
        Fixed memory reference overrun for some wrong partition definitions
      sql/sql_base.cc:
        After merge fix
        Always set *leaves in setup_tables_and_check_access() (assume argument is always given).
      sql/sql_select.cc:
        Simple optimization
      sql/sql_show.cc:
        Remove compiler warning
      sql/sql_table.cc:
        After merge fix
      storage/csv/ha_tina.cc:
        Ensure table maps are restored properly
      storage/ndb/include/ndbapi/Ndb.hpp:
        Remove compiler warning
      6c3babe5
  18. 04 Jun, 2006 1 commit
    • unknown's avatar
      This changeset is largely a handler cleanup changeset (WL#3281), but includes... · 01d03e7b
      unknown authored
      This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
      
      Changes that requires code changes in other code of other storage engines.
      (Note that all changes are very straightforward and one should find all issues
      by compiling a --debug build and fixing all compiler errors and all
      asserts in field.cc while running the test suite),
      
      - New optional handler function introduced: reset()
        This is called after every DML statement to make it easy for a handler to
        statement specific cleanups.
        (The only case it's not called is if force the file to be closed)
      
      - handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
        should be moved to handler::reset()
      
      - table->read_set contains a bitmap over all columns that are needed
        in the query.  read_row() and similar functions only needs to read these
        columns
      - table->write_set contains a bitmap over all columns that will be updated
        in the query. write_row() and update_row() only needs to update these
        columns.
        The above bitmaps should now be up to date in all context
        (including ALTER TABLE, filesort()).
      
        The handler is informed of any changes to the bitmap after
        fix_fields() by calling the virtual function
        handler::column_bitmaps_signal(). If the handler does caching of
        these bitmaps (instead of using table->read_set, table->write_set),
        it should redo the caching in this code. as the signal() may be sent
        several times, it's probably best to set a variable in the signal
        and redo the caching on read_row() / write_row() if the variable was
        set.
      
      - Removed the read_set and write_set bitmap objects from the handler class
      
      - Removed all column bit handling functions from the handler class.
        (Now one instead uses the normal bitmap functions in my_bitmap.c instead
        of handler dedicated bitmap functions)
      
      - field->query_id is removed. One should instead instead check
        table->read_set and table->write_set if a field is used in the query.
      
      - handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
        handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
        instead use table->read_set to check for which columns to retrieve.
      
      - If a handler needs to call Field->val() or Field->store() on columns
        that are not used in the query, one should install a temporary
        all-columns-used map while doing so. For this, we provide the following
        functions:
      
        my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
        field->val();
        dbug_tmp_restore_column_map(table->read_set, old_map);
      
        and similar for the write map:
      
        my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
        field->val();
        dbug_tmp_restore_column_map(table->write_set, old_map);
      
        If this is not done, you will sooner or later hit a DBUG_ASSERT
        in the field store() / val() functions.
        (For not DBUG binaries, the dbug_tmp_restore_column_map() and
        dbug_tmp_restore_column_map() are inline dummy functions and should
        be optimized away be the compiler).
      
      - If one needs to temporary set the column map for all binaries (and not
        just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
        methods) one should use the functions tmp_use_all_columns() and
        tmp_restore_column_map() instead of the above dbug_ variants.
      
      - All 'status' fields in the handler base class (like records,
        data_file_length etc) are now stored in a 'stats' struct. This makes
        it easier to know what status variables are provided by the base
        handler.  This requires some trivial variable names in the extra()
        function.
      
      - New virtual function handler::records().  This is called to optimize
        COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
        (stats.records is not supposed to be an exact value. It's only has to
        be 'reasonable enough' for the optimizer to be able to choose a good
        optimization path).
      
      - Non virtual handler::init() function added for caching of virtual
        constants from engine.
      
      - Removed has_transactions() virtual method. Now one should instead return
        HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
        transactions.
      
      - The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
        that is to be used with 'new handler_name()' to allocate the handler
        in the right area.  The xxxx_create_handler() function is also
        responsible for any initialization of the object before returning.
      
        For example, one should change:
      
        static handler *myisam_create_handler(TABLE_SHARE *table)
        {
          return new ha_myisam(table);
        }
      
        ->
      
        static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
        {
          return new (mem_root) ha_myisam(table);
        }
      
      - New optional virtual function: use_hidden_primary_key().
        This is called in case of an update/delete when
        (table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
        but we don't have a primary key. This allows the handler to take precisions
        in remembering any hidden primary key to able to update/delete any
        found row. The default handler marks all columns to be read.
      
      - handler::table_flags() now returns a ulonglong (to allow for more flags).
      
      - New/changed table_flags()
        - HA_HAS_RECORDS	    Set if ::records() is supported
        - HA_NO_TRANSACTIONS	    Set if engine doesn't support transactions
        - HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
                                  Set if we should mark all primary key columns for
      			    read when reading rows as part of a DELETE
      			    statement. If there is no primary key,
      			    all columns are marked for read.
        - HA_PARTIAL_COLUMN_READ  Set if engine will not read all columns in some
      			    cases (based on table->read_set)
       - HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
         			    Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
       - HA_DUPP_POS              Renamed to HA_DUPLICATE_POS
       - HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
      			    Set this if we should mark ALL key columns for
      			    read when when reading rows as part of a DELETE
      			    statement. In case of an update we will mark
      			    all keys for read for which key part changed
      			    value.
        - HA_STATS_RECORDS_IS_EXACT
      			     Set this if stats.records is exact.
      			     (This saves us some extra records() calls
      			     when optimizing COUNT(*))
      			    
      
      - Removed table_flags()
        - HA_NOT_EXACT_COUNT     Now one should instead use HA_HAS_RECORDS if
      			   handler::records() gives an exact count() and
      			   HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
        - HA_READ_RND_SAME	   Removed (no one supported this one)
      
      - Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
      
      - Renamed handler::dupp_pos to handler::dup_pos
      
      - Removed not used variable handler::sortkey
      
      
      Upper level handler changes:
      
      - ha_reset() now does some overall checks and calls ::reset()
      - ha_table_flags() added. This is a cached version of table_flags(). The
        cache is updated on engine creation time and updated on open.
      
      
      MySQL level changes (not obvious from the above):
      
      - DBUG_ASSERT() added to check that column usage matches what is set
        in the column usage bit maps. (This found a LOT of bugs in current
        column marking code).
      
      - In 5.1 before, all used columns was marked in read_set and only updated
        columns was marked in write_set. Now we only mark columns for which we
        need a value in read_set.
      
      - Column bitmaps are created in open_binary_frm() and open_table_from_share().
        (Before this was in table.cc)
      
      - handler::table_flags() calls are replaced with handler::ha_table_flags()
      
      - For calling field->val() you must have the corresponding bit set in
        table->read_set. For calling field->store() you must have the
        corresponding bit set in table->write_set. (There are asserts in
        all store()/val() functions to catch wrong usage)
      
      - thd->set_query_id is renamed to thd->mark_used_columns and instead
        of setting this to an integer value, this has now the values:
        MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
        Changed also all variables named 'set_query_id' to mark_used_columns.
      
      - In filesort() we now inform the handler of exactly which columns are needed
        doing the sort and choosing the rows.
      
      - The TABLE_SHARE object has a 'all_set' column bitmap one can use
        when one needs a column bitmap with all columns set.
        (This is used for table->use_all_columns() and other places)
      
      - The TABLE object has 3 column bitmaps:
        - def_read_set     Default bitmap for columns to be read
        - def_write_set    Default bitmap for columns to be written
        - tmp_set          Can be used as a temporary bitmap when needed.
        The table object has also two pointer to bitmaps read_set and write_set
        that the handler should use to find out which columns are used in which way.
      
      - count() optimization now calls handler::records() instead of using
        handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
      
      - Added extra argument to Item::walk() to indicate if we should also
        traverse sub queries.
      
      - Added TABLE parameter to cp_buffer_from_ref()
      
      - Don't close tables created with CREATE ... SELECT but keep them in
        the table cache. (Faster usage of newly created tables).
      
      
      New interfaces:
      
      - table->clear_column_bitmaps() to initialize the bitmaps for tables
        at start of new statements.
      
      - table->column_bitmaps_set() to set up new column bitmaps and signal
        the handler about this.
      
      - table->column_bitmaps_set_no_signal() for some few cases where we need
        to setup new column bitmaps but don't signal the handler (as the handler
        has already been signaled about these before). Used for the momement
        only in opt_range.cc when doing ROR scans.
      
      - table->use_all_columns() to install a bitmap where all columns are marked
        as use in the read and the write set.
      
      - table->default_column_bitmaps() to install the normal read and write
        column bitmaps, but not signaling the handler about this.
        This is mainly used when creating TABLE instances.
      
      - table->mark_columns_needed_for_delete(),
        table->mark_columns_needed_for_delete() and
        table->mark_columns_needed_for_insert() to allow us to put additional
        columns in column usage maps if handler so requires.
        (The handler indicates what it neads in handler->table_flags())
      
      - table->prepare_for_position() to allow us to tell handler that it
        needs to read primary key parts to be able to store them in
        future table->position() calls.
        (This replaces the table->file->ha_retrieve_all_pk function)
      
      - table->mark_auto_increment_column() to tell handler are going to update
        columns part of any auto_increment key.
      
      - table->mark_columns_used_by_index() to mark all columns that is part of
        an index.  It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
        it to quickly know that it only needs to read colums that are part
        of the key.  (The handler can also use the column map for detecting this,
        but simpler/faster handler can just monitor the extra() call).
      
      - table->mark_columns_used_by_index_no_reset() to in addition to other columns,
        also mark all columns that is used by the given key.
      
      - table->restore_column_maps_after_mark_index() to restore to default
        column maps after a call to table->mark_columns_used_by_index().
      
      - New item function register_field_in_read_map(), for marking used columns
        in table->read_map. Used by filesort() to mark all used columns
      
      - Maintain in TABLE->merge_keys set of all keys that are used in query.
        (Simplices some optimization loops)
      
      - Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
        but the field in the clustered key is not assumed to be part of all index.
        (used in opt_range.cc for faster loops)
      
      -  dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
         tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
         mark all columns as usable.  The 'dbug_' version is primarily intended
         inside a handler when it wants to just call Field:store() & Field::val()
         functions, but don't need the column maps set for any other usage.
         (ie:: bitmap_is_set() is never called)
      
      - We can't use compare_records() to skip updates for handlers that returns
        a partial column set and the read_set doesn't cover all columns in the
        write set. The reason for this is that if we have a column marked only for
        write we can't in the MySQL level know if the value changed or not.
        The reason this worked before was that MySQL marked all to be written
        columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
        bug'.
      
      - open_table_from_share() does not anymore setup temporary MEM_ROOT
        object as a thread specific variable for the handler. Instead we
        send the to-be-used MEMROOT to get_new_handler().
        (Simpler, faster code)
      
      
      
      Bugs fixed:
      
      - Column marking was not done correctly in a lot of cases.
        (ALTER TABLE, when using triggers, auto_increment fields etc)
        (Could potentially result in wrong values inserted in table handlers
        relying on that the old column maps or field->set_query_id was correct)
        Especially when it comes to triggers, there may be cases where the
        old code would cause lost/wrong values for NDB and/or InnoDB tables.
      
      - Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
        OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
        This allowed me to remove some wrong warnings about:
        "Some non-transactional changed tables couldn't be rolled back"
      
      - Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
        (thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
        some warnings about
        "Some non-transactional changed tables couldn't be rolled back")
      
      - Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
        which could cause delete_table to report random failures.
      
      - Fixed core dumps for some tests when running with --debug
      
      - Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
        (This has probably caused us to not properly remove temporary files after
        crash)
      
      - slow_logs was not properly initialized, which could maybe cause
        extra/lost entries in slow log.
      
      - If we get an duplicate row on insert, change column map to read and
        write all columns while retrying the operation. This is required by
        the definition of REPLACE and also ensures that fields that are only
        part of UPDATE are properly handled.  This fixed a bug in NDB and
        REPLACE where REPLACE wrongly copied some column values from the replaced
        row.
      
      - For table handler that doesn't support NULL in keys, we would give an error
        when creating a primary key with NULL fields, even after the fields has been
        automaticly converted to NOT NULL.
      
      - Creating a primary key on a SPATIAL key, would fail if field was not
        declared as NOT NULL.
      
      
      Cleanups:
      
      - Removed not used condition argument to setup_tables
      
      - Removed not needed item function reset_query_id_processor().
      
      - Field->add_index is removed. Now this is instead maintained in
        (field->flags & FIELD_IN_ADD_INDEX)
      
      - Field->fieldnr is removed (use field->field_index instead)
      
      - New argument to filesort() to indicate that it should return a set of
        row pointers (not used columns). This allowed me to remove some references
        to sql_command in filesort and should also enable us to return column
        results in some cases where we couldn't before.
      
      - Changed column bitmap handling in opt_range.cc to be aligned with TABLE
        bitmap, which allowed me to use bitmap functions instead of looping over
        all fields to create some needed bitmaps. (Faster and smaller code)
      
      - Broke up found too long lines
      
      - Moved some variable declaration at start of function for better code
        readability.
      
      - Removed some not used arguments from functions.
        (setup_fields(), mysql_prepare_insert_check_table())
      
      - setup_fields() now takes an enum instead of an int for marking columns
         usage.
      
      - For internal temporary tables, use handler::write_row(),
        handler::delete_row() and handler::update_row() instead of
        handler::ha_xxxx() for faster execution.
      
      - Changed some constants to enum's and define's.
      
      - Using separate column read and write sets allows for easier checking
        of timestamp field was set by statement.
      
      - Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
      
      - Don't build table->normalized_path as this is now identical to table->path
        (after bar's fixes to convert filenames)
      
      - Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
        do comparision with the 'convert-dbug-for-diff' tool.
      
      
      Things left to do in 5.1:
      
      - We wrongly log failed CREATE TABLE ... SELECT in some cases when using
        row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
        Mats has promised to look into this.
      
      - Test that my fix for CREATE TABLE ... SELECT is indeed correct.
        (I added several test cases for this, but in this case it's better that
        someone else also tests this throughly).
        Lars has promosed to do this.
      
      
      BitKeeper/etc/ignore:
        added mysys/test_bitmap
      include/base64.h:
        Removed my_global.h, as this must be included first in any program
      include/heap.h:
        Added heap_reset() (Required by new handler interface)
      include/my_base.h:
        Removed HA_EXTRA_RESET. MySQL will now call ::reset() instead of ::extra(HA_EXTRA_RESET).
        HA_EXTRA_RETRIVE_ALL_COLS and HA_EXTRA_RETRIVE_PRIMARY key are deleted as the column bitmaps makes these unnecessary
      include/my_bitmap.h:
        Remove my_pthread.h (should be included at upper level)
        Introduced my_bitmap_map typedef to make it the bitmap handling more like a black box
        Added bitmap_is_overlapping(), bitmap_test_and_clear(), bitmap_copy() and bitmap_cmp()
        Made bitmap_set_bit(), bitmap_flip_bit(), bitmap_clear_bit() return void
      include/myisam.h:
        Added mi_reset() (Required by new handler interface)
      include/myisammrg.h:
        Added myrg_reset() (Required by new handler interface)
      include/mysql_com.h:
        Added flag FIELD_IN_ADD_INDEX to be able to remove Field->add_index
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Added testing of CREATE ... SELECT in a mixed environment
        (This found some bugs that Mats is going to fix shortly)
      mysql-test/install_test_db.sh:
        Simplify ldata usage
        Added --tmpdir=. option to mysqld bootstrap (Removed some warnings when TMPDIR was wrongly set)
      mysql-test/mysql-test-run.pl:
        Added --tmpdir=. to bootstrap
      mysql-test/mysql-test-run.sh:
        Use copy instead of INSTALL_DB for master and slave databases.
        (Speeds up startup time a lot!)
        Remove snapshot directories at startup (removes some strange warnings)
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        Added testing of CREATE ... SELECT in a mixed environment
        (This found some bugs that Mats is going to fix shortly)
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Added testing of CREATE ... SELECT in a mixed environment
      mysql-test/r/create.result:
        Some extra tests of warnings and number of tables opened by CREATE ... SELECT
      mysql-test/r/federated.result:
        Drop some left over tables
        Added testing of multiple table update and multiple table delete (with and without keys)
      mysql-test/r/func_gconcat.result:
        Enable some disabled tests (converted them slightly to be predictable)
      mysql-test/r/func_time.result:
        Added drop of test function
      mysql-test/r/innodb_mysql.result:
        Added tests for CREATE ... SELECT
      mysql-test/r/insert.result:
        More tests
        Added testing of duplicate columns in insert
      mysql-test/r/loaddata.result:
        Added testing LOAD DATA ... SET ...
      mysql-test/r/multi_update.result:
        Test multi updates and deletes using primary key and without
      mysql-test/r/ndb_index_unique.result:
        Better error message
      mysql-test/r/ndb_replace.result:
        New correct result after fixing REPLACE handling with NDB
      mysql-test/r/rpl_ddl.result:
        Now we don't get these (wrong) warnings anymore
      mysql-test/r/view_grant.result:
        Drop used views
      mysql-test/t/create.test:
        Some extra tests of warnings and number of tables opened by CREATE ... SELECT
      mysql-test/t/federated.test:
        Drop some left over tables
        Added testing of multiple table update and multiple table delete (with and without keys)
      mysql-test/t/func_gconcat.test:
        Enable some disabled tests (converted them slightly to be predictable)
      mysql-test/t/func_time.test:
        Added drop of test function
      mysql-test/t/innodb_mysql.test:
        Added tests for CREATE ... SELECT
      mysql-test/t/insert.test:
        More tests
        Added testing of duplicate columns in insert
      mysql-test/t/loaddata.test:
        Added testing LOAD DATA ... SET ...
      mysql-test/t/multi_update.test:
        Test multi updates and deletes using primary key and without
      mysql-test/t/view_grant.test:
        Drop used views
      mysql-test/valgrind.supp:
        Added supression of not needed warnings when printing stack trace
      mysys/base64.c:
        Include my_global.h first
      mysys/my_bitmap.c:
        Added bitmap_is_overlapping(), bitmap_test_and_clear() and bitmap_copy()
        Changed logic of bitmap handling to be a bit more efficent (Did this together with Mikael Ronström)
        Now the 'extra, not used bits' in the bitmap are assumed to have a 'random value' and the bitmap functions are free to change them whenever needed.
        Changed how mutex is allocated to make 'bitmap_free()' function simpler.
      mysys/thr_lock.c:
        Added 0x before thread pointers (for easier comparison of DBUG traces)
      sql/event.cc:
        Ensure 'use_all_columns()' is used for event tables
        Don't print warning that event table is damaged if it doesn't exists.
      sql/field.cc:
        Added ASSERT_COLUMN_MARKED_FOR_WRITE in all store() methods and ASSERT_COLUMN_MARKED_FOR_READ in all val() methods to catch wrong setting if table->read_set and table->write_set
        (Rest of changes are only indentation cleanups)
      sql/field.h:
        Removed Field->query_id (replaced by table->read_set and table->write_set)
        Removed Field->fieldnr (use Field->field_index instead)
        Removed Field->add_index (Use Field->flags instead)
        Add Field->part_of_key_not_clustered (for usage in opt_range.cc)
      sql/filesort.cc:
        Added paramater sort_postion to filesort() to force sorting by position instead of storing all fields in the result set.
        This allowed me to remove checking of sql_command.
        Create a temporary column bitmap for fields that are used by the sorting process.
        Use column bitmaps instead of query_id
      sql/ha_berkeley.cc:
        Update to 'newer' table handler interface
      sql/ha_berkeley.h:
        Update to 'newer' table handler interface
      sql/ha_federated.cc:
        Update to 'newer' table handler interface
        Only read columns that are needed from remote server.
        In case of eq ranges, don't generate two conditions in the WHERE clause
        (this can still be optimized, but would require a bigger code change)
        Use 'simpler to use' XXXX_LEN' macros
        A bit simpler logic in ::write_row() when creating statements.
        In update, only include test of fields actually read.
        (This greatly simplifies the queries sent by the federated engine)
        Similar changes done for delete_row()
      sql/ha_federated.h:
        Update to 'newer' table handler interface
        Changed XXX_LEN macros to use sizeof(...)-1, to simplify usage in ha_federated.cc
        Added HA_PRIMARY_KEY_REQUIRED_FOR_DELETE to tell MySQL to read all primary key columns in case of DELETE
      sql/ha_heap.cc:
        Update to 'newer' table handler interface
      sql/ha_heap.h:
        Update to 'newer' table handler interface
      sql/ha_innodb.cc:
        Update to 'newer' table handler interface
        - Update innobase_create_handler() to new interface
        - Removed HA_NOT_EXACT_COUNT (not needed)
        - Renamed HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
        - Prefixed base status variables with 'stats'
        - Use table column bitmaps instead of ha_get_bit_in_read_set()
        - Added ::reset(), with code from ::extra(HA_EXTRA_RESET)
        - Removed HA_EXTRA_RETRIVE_ALL_COLS and HA_EXTRA_RETRIEVE_PRIMARY_KEY as
          the table->read_set and table->write_set bitmaps now are accurate
      sql/ha_innodb.h:
        Update to 'newer' table handler interface
        - table_flags are now ulonglong
        - Added reset() method
        - Removed not needed ha_retrieve_all_cols() and ha_retrieve_all_pk() columns.
        - Made build_template() a class function to be able to easier access class variables
      sql/ha_myisam.cc:
        Update to 'newer' table handler interface
      sql/ha_myisam.h:
        Update to 'newer' table handler interface
      sql/ha_myisammrg.cc:
        Update to 'newer' table handler interface
      sql/ha_myisammrg.h:
        Update to 'newer' table handler interface
      sql/ha_ndbcluster.cc:
        Update to 'newer' table handler interface
        Fixed use_blob_value() to be accurate
        In ::complemented_read() we have to check both the read and write bitmap as the old code did mark all changed columns also in the read map
        Correct dumping of field data with DBUG_DUMP
        Prefix addresses in DBUG_PRINT with 0x
        Fixed usage of not initialized memory
        Update to use field->flags & FIELD_IN_ADD_INDEX instead of field->add_index.
      sql/ha_ndbcluster.h:
        Update to 'newer' table handler interface
      sql/ha_ndbcluster_binlog.cc:
        Mark usage of all columns in ndbcluster binlog tables
        false -> FALSE, true -> TRUE
        Use table->s->all_set instead of creating a temporary bitmap.
      sql/ha_partition.cc:
        Update to 'newer' table handler interface
        Added memroot to initialise_partitions() and related functions to get faster memory allocation.
        partition_create_handler() is now responsible for initialisation of the partition object
        Some trivial optimizations and indentation fixes
        Ensure that table_flags() are up to date
        Removed documentation for removed HA_EXTRA flags
        Fixed 'strange' usage of m_file[i] in new_handlers_from_part_info()that worked in current code 'by chance'
      sql/ha_partition.h:
        Update to 'newer' table handler interface
      sql/handler.cc:
        create_xxx handler now takes MEMROOT as an argument to simplify memory allocation.
        Much simpler get_new_handler()
        (Initialization of the object is now handled by the create method for the engine)
        Moved all allocation of bitmap handling to the TABLE object (in table.cc)
        Added column_bitmaps_signal() to signal column usage changes.
        Changed binlog_log_row() to use the exiusting all_set bitmap in the table object.
        Added ha_reset() function to test that the file object is ok at end of statement and call handler::reset()
        Added use_hidden_primary_key() to signal handler that we we are going to read and update + delete the row and the handler should thus remember the position for the row
      sql/handler.h:
        Added HA_NO_TRANSACTIONS, HA_PARTIAL_COLUMN_READ, HA_REQUIRES_KEY_COLUMNS_FOR_DELETE,HA_PRIMARY_KEY_REQUIRED_FOR_DELETE and HA_HAS_RECORDS
        Removed HA_NOT_EXACT_COUNT, HA_READ_RND_SAME
        HA_DUPP_POS -> HA_DUPLICATE_POS
        HA_NOT_EXACT_COUNT replaced by HA_STATS_RECORDS_IS_EXACT, HA_HAS_RECORDS and records()
        HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION
        Added future row type 'ROW_TYPE_PAGES'
        Added MEM_ROOT to handlerton 'create' function
        Added ha_statistics, a structure for all status variable in the base handler class.
        Moved all status variables in the handler class into a stats structs to improve readability.
        ha_table_flags() is now a cached (not virtual) version of table_flags()
        reset() doesn't anymore call extra(HA_EXTRA_RESET) but is a function of it's own.
        Renamed dupp_ref to dup_ref
        Renamed not used handler::sortkey
        Moved read_set and write_set to TABLE structure
        handler::init() function added for cacheing of virtual constants from engine.
      sql/item.cc:
        Added register_field_in_read_map() for marking used columns in expression.
        This is used by filesort() for creating an optimal column bitmap while retrieving columns for sorting.
        Initalize value.cs_info.character_set_client to fix core dump bug with --debug
        set_query_id -> mark_used_columns
        Mark used columns in read_set OR write_set.
      sql/item.h:
        Removed reset_query_id_processor() as it's not needed anymore.
        Added register_field_in_read_map()
        Added extra argument to Item::walk() to indicate if we should also
        traverse sub queries.
      sql/item_cmpfunc.cc:
        Temporary mark used columns to be read/writable
        Update Item::walk to new interface
      sql/item_cmpfunc.h:
        Added extra argument to Item::walk() to indicate if we should also traverse sub queries.
      sql/item_func.cc:
        Update Item::walk() to new interface
        table_flags() -> ha_table_flags()
      sql/item_func.h:
        Update Item::walk() to new interface
      sql/item_row.cc:
        Update Item::walk() to new interface
      sql/item_row.h:
        Update Item::walk() to new interface
      sql/item_strfunc.h:
        Update Item::walk() to new interface
      sql/item_subselect.cc:
        Added Item_subselect::walk()
        (It was a bug it was missing before. Not sure what kind of bugs this could have caused)
      sql/item_subselect.h:
        Update Item::walk() to new interface
      sql/item_sum.cc:
        Update Item::walk() to new interface
        Updates for new handler interace
      sql/item_sum.h:
        Update Item::walk() to new interface
      sql/key.cc:
        Updates for new handler interace
      sql/log.cc:
        Mark all columns used for log tables
        Split options flag
        Ensured that second argument to trans_register_ha is a bool
      sql/log_event.cc:
        Fixed comments to be withing 79 characters
        Use OPTION_KEEP_LOG instead of OPTION_STATUS_NO_TRANS_UPDATE to remove wrong warnings
        Updates for new handler interface
        Use 0x%lx instead of %p (portability problem)
      sql/mysql_priv.h:
        Added OPTION_KEEP_LOG to indicate that we should replicate the binlog even on rollback
        Removed not used 'conds' argument to setup_tables
      sql/mysqld.cc:
        Indentation fixes and removed old comment
      sql/opt_range.cc:
        Update to new handler and bitmap interface.
        Fixed calls to cp_buffer_from_ref() and walk() (new argument).
        Create new temporary bitmaps for ror scans.
        (Needed because of handler changes and to get more accurate column bitmaps than before)
        Remove not needed file->ha_reset() call before file->close().
        Some trivial optimization and indentation fixes.
        Use Field->part_of_key_not_clustered() to check if field is part of a key, instead of looping over all key parts.
        
        Added flag 'in_ror_merged_scan' to allow ::get_next() to know that we need a special column bitmap to only fetch pointer to record.
        This is needed because ror scan uses the same TABLE object but different file objects, which creates problem for the column bitmap handling.
        (This is a temporary solution. A better one would be to allocate an own TABLE object for ROR scans)
        
        Optimized bitmap handling in ror scans:
        - Start bitmap at position 0, not 1
        - Use same bitmap size as in TABLE
        - Use table->read_set and table->write_set to create column bitmaps instead of looping over all fields in table
      sql/opt_range.h:
        Added 'in_ror_merged_scan' to indicate if we are doing a ROR scan
        Added temporary column bitmaps used in ROR scans
      sql/opt_sum.cc:
        Added get_ext_record_count() which is used in COUNT() optimization if handler has HA_HAS_RECORDS
        Note that we don't call this if handler has HA_STATS_RECORDS_IS_EXACT set.
      sql/protocol.cc:
        We need to mark columns as readable in ::store() as we sometimes return default value for fields to the user
      sql/records.cc:
        Updates for new handler interface
      sql/set_var.cc:
        Handle splitting OPTION_STATUS_NO_TRANS_UPDATE to two flags
      sql/share/errmsg.txt:
        Fixed wrong
      sql/sp.cc:
        Mark that we are using all columns for the proc table
        Update call to setup_tables() to use new prototype
      sql/sp_head.cc:
        Removed QQ comment
      sql/spatial.cc:
        Removed wrong QQ comment
      sql/sql_acl.cc:
        Mark that we need all columns for acl tables
        Supply memroot to some 'new' calls.
        Indentation fixes
      sql/sql_base.cc:
        set_query_id removed
        Ensure we call ha_reset() at end of each statement
        Mark read columns in read_set and changed columns in write_set (Before all columns was marked in read set)
        Fixed marking of some columns that was not proplerly marked before
        Maintain in TABLE->merge_keys set of all keys that are used in some way
        Removed not used 'conds' argument from setup_tables()
        Remove not used setting of 'dupp_field' in insert_fields()
        Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
        (This has probably caused us to not properly remove temporary files after crash)
      sql/sql_bitmap.h:
        Added is_overlapping()
      sql/sql_class.cc:
        Slow_logs was not properly initialized, which could maybe cause extra/lost entries in slow log.
        set_query_id -> mark_used_columns
        Simpler variable usage in pack_row()  (cleanup)
        Moved some variable declartion at start of function for better code readability
      sql/sql_class.h:
        Added enum_mark_columns
        Updated comments
        Renamed dupp_field -> dup_field
        Added virtual function 'can_rollback_data()' to select_insert() to be used in CREATE ... SELECT to optimize use of OPTION_STATUS_NO_TRANS_UPDATE.
        (This fixes a bug in CREATE ... SELECT where we did give wrong warnings when using non transacational tables)
      sql/sql_delete.cc:
        Updates to new handler interface
        Call table->mark_columns_needed_for_delete() to allow us to put additional columns in column usage maps if handler so requires.
        Call table->prepare_for_position() to tell handler that we are going to call ha_position().
        Removed call to free_io_cache(). (io_cache is now removed in ha_reset()).
        Fixed calls to setup_tables()
      sql/sql_do.cc:
        Update call to setup_fields()
      sql/sql_handler.cc:
        Tell handler tables to always read all columns.
        Use temporary column map when storing value in field for later index usage
      sql/sql_help.cc:
        Makr all used fields to be read
        Update call to setup_fields()
      sql/sql_insert.cc:
        Tell handler we are going to update the auto_increment column
        dupp_field -> dup_field
        Set column usage bits for timestamp field.
        Call table->mark_columns_needed_for_insert() and table->mark_auto_increment_column()
        Removed not used argument from mysql_prepare_insert_check_table().
        
        If we get an duplicate row on insert, change column map to read and write all columns while retrying the operatation.
        This is required by the definition of REPLACE and also ensures that fields that are only part of UPDATE are properly handled.
        This fixed a bug in NDB and REPLACE where REPLACE wrongly copied some column values from the replaced row.
        
        Setup new bitmaps for delayed insert rows
        Remove reseting of next_number_fields as it will be reset on next call to handler_insert()
        
        Fixed usage of thd->options and OPTION_STATUS_NO_TRANS_UPDATE.
        The issue was that one should not to reset this flag as it may be set by a previous statement.
        The way it was now used caused us to loose some warnings and get other wrong warnings when using non transactional tables mixed with transactional.
        I fixed it by introducing 'select_insert::can_rollback_data' to inform send_error() that the given statement can be rolled back (which in case of CREATE TABLE can always be done)
        Don't close tables created with CREATE ... SELECT but keep them in the table cache.
        
        Moved out MY_HOOKS from inside function (better readability)
      sql/sql_load.cc:
        Update to use new handler and column marking interface
        Update using setup_tables()
      sql/sql_olap.cc:
        Update calls to setup_tables
        Use enums instead of constants to setup_fields()
      sql/sql_parse.cc:
        Handle OPTION_KEEP_LOG:
        - Set it on CREATE TEMPORARY TABLE / DROP TABLE
        - Reset it when OPTION_STATUS_NO_TRANS_UPDATE is reset
        - Don't set it for CREATE ... SELECT (this is handled in select_create class)
        Remove reseting of OPTION_STATUS_NO_TRANS_UPDATE in begin_trans() as this should already be reset.
        If in autocommit mode, reset OPTION_KEEP_LOG and OPTION_STATUS_NO_TRANS_UPDATE to not give warnings in future commands
      sql/sql_partition.cc:
        Update walk() usage
        Trivial indentation fixes
      sql/sql_plugin.cc:
        Mark all columns as used for plugins
      sql/sql_prepare.cc:
        Added assert to find out hidden bugs in character_set_client (got an error in debug binary when this not set correctly)
        Updates for new handler interface
        Update calls to setup_fields()
      sql/sql_repl.cc:
        Indentation fixes
      sql/sql_select.cc:
        Update call to setup_tables() and setup_fields()
        Remove some old disabled code
        Update to new hadler interface
        Indentation cleanups
        Added column bitmaps for temporary tables.
        Remove updating of the removed slots in the Field class
        Added TABLE argument to cp_buffer_from_ref() (To be able to install temporary column maps)
        For internal temporary tables, use handler::write_row(), handler::delete_row() and handler::update_row() instead of handler::ha_xxxx() for faster execution.
      sql/sql_select.h:
        Indentaition fixes.
        Install temporary column usage maps when needed
        Added TABLE element to cp_buffer_from_ref()
      sql/sql_show.cc:
        Update to new handler interface
        Mark all columns used for internal tables.
        Style fixes.
        Added support for 'future' ROW_TYPE_PAGES.
        Don't allocate TMP_TABLE_PARAM with calloc. The 'init()' function will initialize the structure properly.
      sql/sql_table.cc:
        Update to new handler interface
        Simple my_snprintf -> strmake()
        Changed some constants to defines
        Don't test for NULL in primary key (as we a couple of line above force the PRIMARY KEY to be NOT NULL)
        Change field->add_index to use field->flags & FIELD_IN_ADD_INDEX
        Mark all columns as used for ALTER TABLE
        Style fixes
        Update call to filesort()
      sql/sql_trigger.h:
        Added friend functions to be able to test if triggers exists for table we are going to insert/update or delete in.
      sql/sql_udf.cc:
        Mark all columns as used for udf system table.
      sql/sql_union.cc:
        Update call to walk()
        Update to new handler interface
      sql/sql_update.cc:
        Remove query_id argument from compare_record()
        Use column bitmaps instead of query_id.
        We can't use compare_records() to skip updates for handlers that returns a partial column set and the read_set doesn't cover all columns in the write set, because compare_record() can't in this case know if a not read column changed value.
        Update call to setup_fields()
        Using separate column read and write sets allows for easier checking of timestamp field was set by statement.
        Removed call to free_io_cache() as this is now done in ha_reset()
        Call table->mark_columns_needed_for_update() and table->prepare_for_position()
        Style fixes
      sql/sql_view.cc:
        Style fixes
      sql/table.cc:
        Remove implicitely include 'errno.h'
        Remove code for building normalized path, as this is now identical to 'path'
        Remove field->fieldnr
        Added update of field->part_of_key_not_clustered()
        Create column bitmaps in TABLE and TABLE_SHARE
        Don't setup a temporary MEM_ROOT object as a thread specific variable for the handler. Instead we send the to-be-used MEMROOT to get_new_handler()
        Update to new handler interface
        Update call to walk()
        Added new functions:
        - st_table::clear_column_bitmaps()
        - st_table::prepare_for_position()
        - st_table::mark_columns_used_by_index()
        - st_table::restore_column_maps_after_mark_index()
        - st_table::mark_columns_used_by_index_no_reset()
        - st_table::mark_auto_increment_column()
        - st_table::mark_columns_needed_for_delete()
        - st_table::mark_columns_needed_for_update()
        - st_table::mark_columns_needed_for_insert()
      sql/table.h:
        Moved column usage bitmaps from handler to TABLE
        Added to TABLE_SHARE all_set and column_bitmap_size
        Added to TABLE merge_keys, bitmap_init_values, def_read_set, def_write_set, tmp_set, read_set and write_set.
        Declared all new table column bitmap functions
        Added TABLE functions column_bitmaps_set(), column_bitmaps_set_no_signal(), use_all_columns() and default_column_bitmaps()
        Added functions: tmp_use_all_columns() and tmp_restore_column_map() to temporarly switch column bitmaps
        Added functions: dbug_tmp_use_all_columns() and dbug_tmp_restore_column_map() to temporarly switch column bitmaps to avoid asserts in Field::store() and Field::val().
      sql/tztime.cc:
        Mark all columns as used for timezone tables
      storage/archive/ha_archive.cc:
        Update to new handler interface
      storage/archive/ha_archive.h:
        Update to new handler interface
      storage/blackhole/ha_blackhole.cc:
        Update to new handler interface
      storage/blackhole/ha_blackhole.h:
        Update to new handler interface
        removed not needed flag HA_DUPP_POS
      storage/csv/ha_tina.cc:
        Update to new handler interface
      storage/csv/ha_tina.h:
        Update to new handler interface
      storage/example/ha_example.cc:
        Update to new handler interface
      storage/example/ha_example.h:
        Update to new handler interface
      storage/heap/hp_extra.c:
        Added heap_reset() (Required by new handler interface)
      storage/heap/hp_test2.c:
        Use heap_reset()
      storage/myisam/ft_boolean_search.c:
        Fixed compiler warning
      storage/myisam/mi_extra.c:
        Added mi_reset() (Required by new handler interface)
      storage/myisam/mi_search.c:
        Fixed DBUG_PRINT messages to use 0x%lx instead of %lx
      storage/myisam/mi_test2.c:
        Use mi_reset()
      storage/myisam/myisampack.c:
        Use mi_reset()
      storage/myisammrg/myrg_extra.c:
        Added myrg_reset() (Required by new handler interface)
      unittest/mysys/base64.t.c:
        Include my_global.h
        Don't include implictely include file 'stdlib.h'
      01d03e7b
  19. 02 Jun, 2006 2 commits
    • unknown's avatar
      First push for WL#3146 "less locking in auto_increment". It is a 0-real-change patch. · e63f3779
      unknown authored
      New prototype for get_auto_increment() (but new arguments not yet used), to be able
      to reserve a finite interval of auto_increment values from cooperating engines.
      A hint on how many values to reserve is found in handler::estimation_rows_to_insert,
      filled by ha_start_bulk_insert(), new wrapper around start_bulk_insert().
      NOTE: this patch changes nothing, for all engines. But it makes the API ready for those
      engines which will want to do reservation.
      More csets will come to complete WL#3146.
      
      
      sql/ha_berkeley.cc:
        update to new prototype of get_auto_increment
      sql/ha_berkeley.h:
        update to new prototype of get_auto_increment
      sql/ha_heap.cc:
        update to new prototype of get_auto_increment
      sql/ha_heap.h:
        update to new prototype of get_auto_increment
      sql/ha_innodb.cc:
        update to new prototype of get_auto_increment
      sql/ha_innodb.h:
        update to new prototype of get_auto_increment
      sql/ha_myisam.cc:
        update to new prototype of get_auto_increment
      sql/ha_myisam.h:
        update to new prototype of get_auto_increment
      sql/ha_ndbcluster.cc:
        update to new prototype of get_auto_increment
      sql/ha_ndbcluster.h:
        update to new prototype of get_auto_increment
      sql/ha_partition.cc:
        update to new prototype of get_auto_increment
      sql/ha_partition.h:
        update to new prototype of get_auto_increment
      sql/handler.cc:
        new prototype of get_auto_increment, comments, preparation for when the MySQL layer is capable
        of getting finite auto_increment intervals from cooperating engines.
      sql/handler.h:
        a wrapper around start_bulk_insert(): ha_bulk_insert(), which stores the argument (number
        of rows expected for insertion) into a member of handler: estimation_rows_to_insert.
        This member will soon be used to decide how much auto_increment values we want to reserve
        from cooperating engines.
        New prototype for get_auto_increment, preparing for cooperating engines to reserve finite auto_increment
        intervals.
        release_auto_increment() will be used by the MySQL layer to inform the engine that it has
        not used all of the interval (engine can reclaim it).
      sql/log.cc:
        note for the future
      sql/log_event.cc:
        name of wrapper
      sql/sql_insert.cc:
        name of wrapper. When done with inserting, return unused auto_inc values to engine.
      sql/sql_load.cc:
        name of wrapper. When done with inserting, return unused auto_inc values to engine.
      sql/sql_select.cc:
        name of wrapper
      sql/sql_table.cc:
        name of wrapper
      storage/archive/ha_archive.cc:
        update to new prototype of get_auto_increment.
        Archive reserves only one value (Archive's god - Brian - told me that's the truth).
      storage/archive/ha_archive.h:
        update to new prototype of get_auto_increment()
      e63f3779
    • unknown's avatar
      Bug#19995 (Extreneous table maps generated for statements that does not generate rows): · 08440d28
      unknown authored
      Comment change.
      
      
      sql/handler.cc:
        Comment change
      08440d28
  20. 01 Jun, 2006 1 commit
    • unknown's avatar
      interface for transaction log management added to handlerton · 1101cda3
      unknown authored
      iterators creation interface added to handlerton
      
      
      sql/ha_berkeley.cc:
        added new methods
      sql/ha_federated.cc:
        added new methods
      sql/ha_heap.cc:
        added new methods
      sql/ha_innodb.cc:
        added new methods
      sql/ha_myisam.cc:
        added new methods
      sql/ha_myisammrg.cc:
        added new methods
      sql/ha_ndbcluster.cc:
        added new methods
      sql/ha_partition.cc:
        added new methods
      sql/handler.cc:
        added new methods
        spelling fixed
        examples of functions for new interface added
      sql/handler.h:
        transaction logs management interface added
        general iterator creatioin interface added
      sql/log.cc:
        added new methods
      storage/archive/ha_archive.cc:
        added new methods
      storage/blackhole/ha_blackhole.cc:
        added new methods
      storage/csv/ha_tina.cc:
        added new methods
      storage/example/ha_example.cc:
        added new methods
      1101cda3
  21. 31 May, 2006 2 commits
    • unknown's avatar
      Bug#19995 (Extreneous table maps generated for statements that do not generate rows): · e9b5cafa
      unknown authored
      Switched to writing out table maps for tables that are locked when
      the first row in a statement is seen.
      
      
      mysql-test/include/master-slave.inc:
        Moved code to reset master and slave into separate file.
      mysql-test/r/binlog_row_blackhole.result:
        Result change
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        Result change
      mysql-test/r/ndb_binlog_ignore_db.result:
        Result change
      mysql-test/r/rpl_ndb_charset.result:
        Result change
      mysql-test/r/rpl_row_basic_11bugs.result:
        Result change
      mysql-test/r/rpl_row_charset.result:
        Result change
      mysql-test/r/rpl_row_create_table.result:
        Result change
      mysql-test/t/rpl_row_basic_11bugs.test:
        Added test to check that no events are generated when no rows are changed.
      mysql-test/t/rpl_row_create_table.test:
        Master log position changed
      sql/handler.cc:
        Adding function write_locked_table_maps() that will write table maps for all
        tables locked for write.
        Using "table->in_use" instead of "current_thd" since tables are now locked
        when the function is called.
        Removing old code to write table map.
      sql/log_event.cc:
        Added assertion
      sql/sql_class.cc:
        Removing code to write "dummy termination event".
      sql/sql_class.h:
        Adding getter for binlog_table_maps.
      sql/sql_insert.cc:
        Setting thd->lock before calling write_record for the execution of
        CREATE-SELECT and INSERT-SELECT since they keep multiple locks in the
        air at the same time.
      mysql-test/include/master-slave-reset.inc:
        New BitKeeper file ``mysql-test/include/master-slave-reset.inc''
      e9b5cafa
    • unknown's avatar
      after review fixes · 0de72ae9
      unknown authored
      mysql-test/t/disabled.def:
        enable test
      0de72ae9
  22. 28 May, 2006 1 commit
    • unknown's avatar
      handlerton cleanup: · e2e582d1
      unknown authored
      duplicate fields removed, st_mysql_storage_engine added to support
      run-time handlerton initialization (no compiler warnings), handler API
      is now tied to MySQL version, handlerton->plugin mapping added
      (slot-based), dummy default_hton removed, plugin-type-specific
      initialization generalized, built-in plugins are now initialized too,
      --default-storage-engine no longer needs a list of storage engines
      in handle_options().
      
      mysql-test-run.pl bugfixes
      
      
      include/mysql/plugin.h:
        added st_mysql_storage_engine
        made handlerton tied to MySQL version
      mysql-test/mysql-test-run.pl:
        bugfixes (umask, --no-defaults)
      mysql-test/r/ndb_dd_basic.result:
        update error message
      mysql-test/t/partition_mgm_err2.test:
        fix typo
      sql/ha_berkeley.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_berkeley.h:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_federated.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_heap.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_innodb.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_innodb.h:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_myisam.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_myisammrg.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_ndbcluster.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_ndbcluster.h:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/ha_ndbcluster_binlog.cc:
        no 'name' in the handlerton anymore
      sql/ha_partition.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/handler.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        handlerton->plugin mapping
      sql/handler.h:
        handlerton cleanup: remove duplicate fields
      sql/log.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      sql/mysql_priv.h:
        handler.h needs plugin.h
      sql/mysqld.cc:
        Convert --default-storage-engine to a handlerton* when
        all storage engines are initialized and not in getopt
      sql/set_var.cc:
        no name in the handlerton anymore
      sql/sql_parse.cc:
        no default_hton anymore
      sql/sql_partition.cc:
        no name in the handlerton anymore
      sql/sql_plugin.cc:
        generalize plugin type-specific initialization.
        initialize built-in plugins too
      sql/sql_plugin.h:
        generalize plugin type-specific initialization.
      sql/sql_show.cc:
        st_mysql_storage_engine structure
        no name in the handlerton anymore
      sql/sql_table.cc:
        no name in the handlerton anymore
        no default_hton anymore
      sql/sql_tablespace.cc:
        no name in the handlerton anymore
        no default_hton anymore
      sql/sql_yacc.yy:
        no default_hton anymore
        issue "unknown storage engine" warning where it is discovered
      storage/archive/ha_archive.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      storage/archive/ha_archive.h:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      storage/blackhole/ha_blackhole.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      storage/csv/ha_tina.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      storage/example/ha_example.cc:
        handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine,
        initialize handlerton run-time to avoid compiler warnings
      e2e582d1
  23. 12 May, 2006 1 commit
    • unknown's avatar
      bug #14573 (Error on adding auto_increment on to a column with '0' values) · 273e1e01
      unknown authored
      mysql-test/r/auto_increment.result:
        test result
      mysql-test/t/auto_increment.test:
        test case
      sql/handler.cc:
        print_keydupp_error implemented
      sql/handler.h:
        handler::print_keydupp_error declared
      sql/share/errmsg.txt:
        error message added
      sql/sql_table.cc:
        now we return different error message for auto_increment case
      273e1e01
  24. 05 May, 2006 1 commit
    • unknown's avatar
      Don't use row level logging on optimize or repair table. · 3995b06b
      unknown authored
      (Fixes core dump in rpl_failed_optimize.test)
      Ensure we end active transcations if we do an admin command (like optimize, repair etc)
      
      
      mysql-test/extra/rpl_tests/rpl_failed_optimize.test:
        Added extra test + drop of table at end of test
      mysql-test/lib/mtr_report.pl:
        Fail if mysqld asserts or prints stack
      mysql-test/mysql-test-run.sh:
        Fail if mysqld asserts or prints stack
      mysql-test/r/exampledb.result:
        Cleanup of events_tests (as this caused a lot of problems if it didn't work)
      mysql-test/r/innodb.result:
        Extra test to see that we can do an optimize table on an active transaction
      mysql-test/r/rpl_failed_optimize.result:
        Added extra test + drop of table at end of test
      mysql-test/t/exampledb.test:
        Cleanup of events_tests (as this caused a lot of problems if it didn't work)
      mysql-test/t/innodb.test:
        Extra test to see that we can do an optimize table on an active transaction
      sql/handler.cc:
        Don't use row level logging on optimize or repair table.
      sql/log.cc:
        Simplify code (no logic changes)
      sql/mysql_priv.h:
        Added prototype
      sql/sql_base.cc:
        Better name for define
      sql/sql_class.cc:
        Indentation fix
      sql/sql_parse.cc:
        Make end_active_trans() global
      sql/sql_table.cc:
        Ensure we end active transcations if we do an admin command (like optimize, repair etc)
      3995b06b
  25. 03 May, 2006 2 commits
    • unknown's avatar
      Cleanups after review of WL#602 · 3c099551
      unknown authored
      Fixed warnings from test suite
      Some fixes in mysql-test-run script to catch more warnings
      
      
      mysql-test/lib/mtr_report.pl:
        Catch more warnings
      mysql-test/mysql-test-run.sh:
        Catch warnings from mysqld
      mysql-test/t/mysqldump.test:
        Add key_block_size to catch future changes in information schema
      mysys/errors.c:
        Ensure that mysql-test-run catches if we call my_close() too many times
      sql/handler.cc:
        Initialize all elements
      sql/log.cc:
        true -> TRUE
      sql/sql_class.h:
        Review change: key_info -> key_create_info
      sql/sql_lex.h:
        Review change: key_info -> key_create_info
      sql/sql_table.cc:
        Review change: key_info -> key_create_info
        Don't call mysql_close() if init_ddl_log is not called.
        Better error handling in init_ddl_log
      sql/sql_yacc.yy:
        Review change: key_info -> key_create_info
      3c099551
    • unknown's avatar
      Added support for key_block_size for key and table level (WL#602) · d50ae165
      unknown authored
      Added support for key_block_size to MyISAM.
      Simplify interface to 'new Key' to make it easier to add new key options.
      mysqld option --new is used to define where key options are printed.
      (In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
      Fixed some compiler warnings and a memory leak in ssl
      
      
      include/my_base.h:
        Added flag to check if block size for key was secified
      include/my_sys.h:
        Added new support function to round up to a power of two
      include/myisam.h:
        Rename block_size -> block_size_index to avoid confusion with 'block_size'
      include/violite.h:
        Added function to free memory after new_VioSSLAcceptorFd
        (Will rename all vio_ssl functions in a future changeset)
      mysql-test/mysql-test-run.pl:
        Don't print port number info when we use --extern
      mysql-test/r/myisam.result:
        Added test for key_block_size
      mysql-test/t/myisam.test:
        Added test for key_block_size
      mysys/mf_keycache.c:
        Simplify code
      mysys/my_bit.c:
        Added new support function to round up to a power of two
      sql/ha_myisam.cc:
        Tell MyISAM to use the specified key_block_size
        MyISAM also updates the global key_block_size from the used values.
      sql/handler.cc:
        Added 'default_key_create_info' to be used as 'dummy' argument to 'new Key'
      sql/handler.h:
        Added KEY_CREATE_INFO, to be used as for general options for KEY's
      sql/item_func.h:
        Removed compiler warning
      sql/lex.h:
        Added new symbol
      sql/mysqld.cc:
        Fixed memory leak in ssl (new_VioSSLAcceptorFd)
      sql/sql_class.h:
        Change 'new Key' to use KEY_CREATE_INFO instead of 'algoritm', parser, key_page_size.
        This makes it easier to add new key options in the future.
      sql/sql_lex.h:
        Added key create options
      sql/sql_parse.cc:
        Use new interface to 'new Key'
      sql/sql_show.cc:
        Added support for key_block_size
        If --new is used, key options are printed after the key part definition.
      sql/sql_table.cc:
        Use new interface to 'new Key'
        Add support for key_block_size
      sql/sql_yacc.yy:
        Add support for key_block_size
        Allow key options before and after key_parts (In future they should be always after the key_part defintion)
        Use new interface to 'new Key'
      sql/structs.h:
        Added block_size to keys
      sql/table.cc:
        Remmeber and read key_block_size for table and key level
      sql/table.h:
        Added default key_block_size for table
      sql/unireg.cc:
        Remember key_block_size for key
      storage/myisam/ft_eval.c:
        Set block_length to 0 to get default key page size
      storage/myisam/ft_test1.c:
        Set block_length to 0 to get default key page size
      storage/myisam/mi_check.c:
        block_size -> block_size_index
      storage/myisam/mi_create.c:
        Added support for block size per key.
        Block size is rounded up to next power of two and enforced between MIN and MAX KEY_BLOCK_LENGTH.
        Align start of key block to start at an even offset of max_key_block_length to ensure key cache works good if all key pages are of same size.
      storage/myisam/mi_open.c:
        block_size -> block_size_index
      storage/myisam/mi_page.c:
        block_size -> block_size_index
      storage/myisam/mi_test1.c:
        Set block_length to 0 to get default key page size
      storage/myisam/mi_test2.c:
        Set block_length to 0 to get default key page size
      storage/myisam/mi_test3.c:
        Set block_length to 0 to get default key page size
      storage/myisam/myisamdef.h:
        block_size -> block_size_index to avoid confusion with 'block_size' in MySQL
        Added block_size as argument to MI_BLOCK_SIZE
        Added missing prototypes to get rid of compiler warnings
      storage/myisam/myisampack.c:
        Removed compiler warning
        block_size -> block_size_index
      vio/viosslfactories.c:
        Fixed memory leak in ssl (new_VioSSLAcceptorFd)
      mysql-test/r/myisam-system.result:
        New BitKeeper file ``mysql-test/r/myisam-system.result''
      mysql-test/t/myisam-system.test:
        New BitKeeper file ``mysql-test/t/myisam-system.test''
      d50ae165
  26. 20 Apr, 2006 1 commit
    • unknown's avatar
      WL#3201 · a7dde923
      unknown authored
        Fixes after first review
      
      
      config/ac-macros/ha_ndbcluster.m4:
        WL#3201
          Undo change
      config/ac-macros/plugins.m4:
        WL#3201
          Remove unneccesary use of AC_DEFUN
          fix shell script to be more portable
      configure.in:
        WL#3201
          Remove use of word "engine" when desribing partition module
          Undo ndb config files change
      sql/ha_partition.cc:
        WL#3201
          Remove use of word "engine" when desribing partition module
      sql/handler.cc:
        WL#3201
          Add comment describing installed_htons array
      a7dde923
  27. 13 Apr, 2006 3 commits
    • unknown's avatar
      WL#3201 · 83583111
      unknown authored
        " Configure support for server plugins "
      
      
      storage/blackhole/ha_blackhole.h:
        Rename: sql/ha_blackhole.h -> storage/blackhole/ha_blackhole.h
      BitKeeper/deleted/.del-storage.m4~24bf2fffdaa328ad:
        Delete: config/ac-macros/storage.m4
      BitKeeper/deleted/.del-ha_archive.m4~a07fac7110b39294:
        Delete: config/ac-macros/ha_archive.m4
      BitKeeper/deleted/.del-ha_blackhole.m4~8ed06eb91f6420ed:
        Delete: config/ac-macros/ha_blackhole.m4
      BitKeeper/deleted/.del-ha_example.m4~1dfb268163297708:
        Delete: config/ac-macros/ha_example.m4
      BitKeeper/deleted/.del-ha_federated.m4~7acddd58286acfd6:
        Delete: config/ac-macros/ha_federated.m4
      BitKeeper/deleted/.del-ha_innodb.m4~6f141fb5b80c1f39:
        Delete: config/ac-macros/ha_innodb.m4
      BitKeeper/deleted/.del-ha_partition.m4~bc57067550be5f89:
        Delete: config/ac-macros/ha_partition.m4
      BitKeeper/deleted/.del-ha_tina.m4~f658506ebbc113ca:
        Delete: config/ac-macros/ha_tina.m4
      BitKeeper/deleted/.del-handlerton.cc.in~377156e7b06067cc:
        Delete: sql/handlerton.cc.in
      BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df:
        Delete: sql/handlerton-win.cc
      BUILD/SETUP.sh:
        WL#3201
          Changes in configure arguments
      Makefile.am:
        WL#3201
          changes in build subst names
      config/ac-macros/ha_berkeley.m4:
        WL#3201
          remove unused variable
          Makefile is always made
      config/ac-macros/ha_ndbcluster.m4:
        WL#3201
          remove unused variables
          Split big macro
      configure.in:
        WL#3201
          out with storage.m4, in with plugins.m4
          change how plugins are declared
          include makefiles, remove handlerton.cc, add sql_builtin.cc
      include/mysql/plugin.h:
        WL#3201
          support static and dynamic build - MYSQL_DYNAMIC_PLUGIN
      libmysqld/Makefile.am:
        WL#3201
          Storage engine files still left in sql subdir are not conditionally
          compiled. Should move them out soon,
      plugin/Makefile.am:
        WL#3201
          update makefile
      plugin/fulltext/Makefile.am:
        WL#3201
          update makefile
      plugin/fulltext/plugin_example.c:
        WL#3201
          change to mysql_declare_plugin macro
      sql/Makefile.am:
        WL#3201
          Storage engine files still left in sql subdir are not conditionally
          compiled. Should move them out soon,
      sql/ha_berkeley.cc:
        WL#3201
          make into a plugin
          conditionally compile content
      sql/ha_federated.cc:
        WL#3201
          make into a plugin
          conditionally compile content
      sql/ha_heap.cc:
        WL#3201
          make into a plugin
      sql/ha_innodb.cc:
        WL#3201
          make into a plugin
          conditionally compile content
      sql/ha_myisam.cc:
        WL#3201
          make into a plugin
      sql/ha_myisammrg.cc:
        WL#3201
          make into a plugin
      sql/ha_ndbcluster.cc:
        WL#3201
          make into a plugin
          conditionally compile content
      sql/ha_ndbcluster_binlog.cc:
        WL#3201
          make into a plugin
          conditionally compile content
      sql/ha_partition.cc:
        WL#3201
          make into a plugin
          conditionally compile content
      sql/handler.cc:
        WL#3201
          Simplify how storage engines are found by db_type
          (hopefully we can get rid of it soon)
          Code cleanup
      sql/handler.h:
        WL#3201
          new DB_TYPE_FIRST_DYNAMIC
          new func ha_finalize_handlerton()
          remove ha_register_builtin_plugins()
      sql/log.cc:
        WL#3201
          make into a plugin
      sql/mysqld.cc:
        WL#3201
          remove ha_register_builtin_plugins()
          alter init order so that storage engines are initialized before first use
      sql/partition_info.cc:
        WL#3201
          conditionally compile content
      sql/sql_delete.cc:
        WL#3201
          conditionally include ha_innodb.h
      sql/sql_plugin.cc:
        WL#3201
          All compiled in plugins are in mysqld_builtins[]
          add funcs for plugin finalization
          install builtin plugins on initialization
      sql/sql_show.cc:
        WL#3201
          Fix to use plugin_foreach()
      sql/sql_yacc.yy:
        WL#3201
          SHOW FULL PLUGIN
      storage/archive/Makefile.am:
        WL#3201
          setup as plugin makefile
      storage/archive/ha_archive.cc:
        WL#3201
          Convert into a plugin
      storage/archive/ha_archive.h:
        WL#3201
          azlib.h now in local dir
      storage/blackhole/ha_blackhole.cc:
        WL#3201
          convert into a plugin
      storage/csv/Makefile.am:
        WL#3201
          setup as plugin makefile
      storage/csv/ha_tina.cc:
        WL#3201
          remove conditional compilation on MYSQL_PLUGIN
          mysql_declare_plugin macro change
      storage/example/Makefile.am:
        WL#3201
          fix as new-style plugin makefile
      storage/example/ha_example.cc:
        WL#3201
          remove conditional compilation on MYSQL_PLUGIN
          mysql_declare_plugin macro change
      storage/innobase/Makefile.am:
        WL#3201
          Lets make life easier and reduce innodb into a single library file
      config/ac-macros/plugins.m4:
        New BitKeeper file ``config/ac-macros/plugins.m4''
      sql/sql_builtin.cc.in:
        New BitKeeper file ``sql/sql_builtin.cc.in''
      storage/blackhole/Makefile.am:
        New BitKeeper file ``storage/blackhole/Makefile.am''
      83583111
    • unknown's avatar
      foo2 · 365f6f6f
      unknown authored
      sql/ha_innodb.cc:
        Import patch foo2
      sql/ha_innodb.h:
        Import patch foo2
      sql/handler.cc:
        Import patch foo2
      sql/handler.h:
        Import patch foo2
      sql/mysqld.cc:
        Import patch foo2
      sql/set_var.cc:
        Import patch foo2
      sql/sql_class.h:
        Import patch foo2
      sql/sql_repl.cc:
        Import patch foo2
      365f6f6f
    • unknown's avatar
      foo1 · ce335550
      unknown authored
      sql/ha_innodb.cc:
        Import patch foo1
      sql/ha_innodb.h:
        Import patch foo1
      sql/handler.cc:
        Import patch foo1
      sql/handler.h:
        Import patch foo1
      sql/mysqld.cc:
        Import patch foo1
      sql/set_var.cc:
        Import patch foo1
      sql/sql_class.h:
        Import patch foo1
      sql/sql_repl.cc:
        Import patch foo1
      ce335550
  28. 29 Mar, 2006 1 commit
    • unknown's avatar
      Fixed compiler and valgrind warnings · 59eaf292
      unknown authored
      Added missing DBUG_xxx_RETURN statements
      Fixed some usage of not initialized variables (as found by valgrind)
      Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
      This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
      This will allow Tomas to continue with his work to use namelocks to syncronize things.
      
      Note: valgrind still produces a lot of warnings about using not initialized code and shows memory loss errors when running the ndb tests
      
      
      BitKeeper/etc/ignore:
        added mysql-test/r/*.log
      client/mysqltest.c:
        Change type of variables to get rid of compiler warnings
        More debugging
        Fix memory leak
      mysql-test/mysql-test-run.sh:
        Collect warnings about missing DBUG_RETURN statements
      mysql-test/r/lock_multi.result:
        Add test of new code
      mysql-test/r/ndb_condition_pushdown.result:
        Drop used tables before test
      mysql-test/t/lock_multi.test:
        Add test of new code
      mysql-test/t/ndb_condition_pushdown.test:
        Drop used tables before test
      mysql-test/valgrind.supp:
        Ignore 'safe' warnings from libz (when used with archive)
      sql/event.cc:
        More comments
        Simplify code
        Fixed memory leak found by valgrind
      sql/ha_archive.cc:
        Remove compiler warnings (Wrong handlerton structure and signed/unsigned comparison)
      sql/ha_berkeley.cc:
        Fixed compiler warning
      sql/ha_blackhole.cc:
        Fixed compiler warning
      sql/ha_federated.cc:
        Fixed compiler warning
      sql/ha_heap.cc:
        Fixed compiler warning
      sql/ha_myisam.cc:
        Fixed compiler warning
      sql/ha_myisammrg.cc:
        Fixed compiler warning
      sql/ha_ndbcluster.cc:
        Fixed compiler warnings
      sql/ha_partition.cc:
        Fixed compiler warning
        Fixed error noticed by valgrind in ha_partition::rnd_init()
      sql/handler.cc:
        Fixed compiler warning
      sql/handler.h:
        Fixed compiler warning
      sql/item.cc:
        Fixed compiler warning
      sql/item_xmlfunc.cc:
        Fixed warning from valgrind when calling memcpy with wrong address
      sql/lock.cc:
        More debugging
      sql/log.cc:
        Fixed compiler warning
        Indentation fixes
      sql/log.h:
        Fixed compiler warning
      sql/mysql_priv.h:
        Changed prototype for 'drop_locked_tables'
      sql/opt_range.cc:
        Indentation fix
      sql/password.c:
        Removed compiler warnings
      sql/set_var.cc:
        Fixed compiler warning
      sql/slave.cc:
        Fixed compiler warning
      sql/sp_head.cc:
        Fixed compiler warning
      sql/sql_acl.cc:
        Fixed compiler warning
      sql/sql_analyse.cc:
        Added missing DBUG_RETURN statements
      sql/sql_base.cc:
        Removed de-reference of not initialized pointer
        More comments
        drop_locked_tables() changed to not delete tables used for name locking
        Fixed compiler warnings
      sql/sql_delete.cc:
        Fixed usage of not initialized variable
        (deleted could be referenced in some not common error conditions)
      sql/sql_parse.cc:
        Added missing DBUG_VOID_RETURN
        Simplify code
      sql/sql_partition.cc:
        Fixed usage of wrong variable (noticed by valgrind)
      sql/sql_plugin.cc:
        Removed compiler warning
      sql/sql_show.cc:
        Removed compiler warning
      sql/sql_table.cc:
        Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
        This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
        This will allow Tomas to continue with his work to use namelocks to syncronize things.
        
        Fixed wrong test of 'table_type' (path_length could otherwise be accessed uninitialized)
        
        Remove compile warnings about not initialized variables.
      sql/sql_yacc.yy:
        Ensure that no_write_to_binlog is properly initialized
        (Was accessed uninitialized by partition code)
      sql/table.cc:
        Removed valgrind warnings (not fatal)
        Removed compiler warnings
      sql/tztime.cc:
        Removed valgrind warning
      storage/ndb/include/ndbapi/NdbIndexStat.hpp:
        Removed compiler warning
      59eaf292
  29. 28 Mar, 2006 1 commit
  30. 26 Mar, 2006 1 commit
  31. 23 Mar, 2006 2 commits
    • unknown's avatar
      Bug#18436 (RBR: Replication to partition engine triggers assertion on slave side): · e40dbfa8
      unknown authored
      Partial fix for resolving the problem. Swapping contents of record[0]
      and record[1] since this is what some storage engines expect.
      
      
      sql/handler.cc:
        Adding assertion to get early failure.
      sql/log_event.cc:
        Correcting code so that new record is passed in record[0] and
        old record is passed in record[1] when calling update_row().
      mysql-test/r/rpl_row_basic_8partition.result:
        New BitKeeper file ``mysql-test/r/rpl_row_basic_8partition.result''
      mysql-test/t/rpl_row_basic_8partition.test:
        New BitKeeper file ``mysql-test/t/rpl_row_basic_8partition.test''
      e40dbfa8
    • unknown's avatar
      Refactored some code to remove ifdef and removed dead code related to un-useable sync code. · fd8513fa
      unknown authored
      sql/ha_innodb.cc:
        Removing dead code
      sql/handler.cc:
        Removing dead code
      sql/handler.h:
        Removing Dead code
      sql/sql_class.cc:
        Removing unneeded ifdef code.
      sql/sql_repl.cc:
        Removing dead code.
      fd8513fa
  32. 17 Mar, 2006 1 commit
    • unknown's avatar
      Bug#18280 (RBR: Extreneous maps when writing to general_log and slow_log): · 604e0535
      unknown authored
      Filter out replication general_log and slow_log entirely from binary
      log. Caching result of table share-specific tests.
      
      
      mysql-test/r/binlog_row_drop_tmp_tbl.result:
        Result change
      mysql-test/r/rpl_row_log.result:
        Result change
      mysql-test/r/rpl_row_log_innodb.result:
        Result change
      mysql-test/r/rpl_row_max_relay_size.result:
        Result change
      sql/handler.cc:
        Refactoring code to support filtering many tables.
        Filtering out mysql.general_log and mysql.slow_log from binary log.
        Caching result from table share-specific tests.
      sql/sql_class.cc:
        Correcting comment
      sql/sql_parse.cc:
        Using binlog_query() instead of constructing Query_log_events
      sql/table.cc:
        Adding variable to cache table check parts for row-based logging.
      sql/table.h:
        Adding variable to cache table check parts for row-based logging.
      604e0535