1. 01 Feb, 2006 5 commits
    • unknown's avatar
      WL 2826: Fifth step · 4b335429
      unknown authored
      Removed partition state from parser
      
      
      sql/sql_yacc.yy:
        Removed partition state from parser
      4b335429
    • unknown's avatar
      WL 2826: Fourth step · 17de6d59
      unknown authored
      Remove partition state from frm file
      Ensure we can still load tables created in 5.1.6 for the time
      being
      
      
      sql/table.cc:
        Remove partition state from frm file
        Ensure we can still load tables created in 5.1.6 for the time
        being
      sql/unireg.cc:
        Remove partition state from frm file
        Ensure we can still load tables created in 5.1.6 for the time
        being
      17de6d59
    • unknown's avatar
      WL 2826: A third step, fixing generate_partition_syntax · 93c697ad
      unknown authored
      
      sql/mysql_priv.h:
        Make it possible to set injector code and value
        Declare header part of a set of new functions
      sql/sql_partition.cc:
        Fix generate_partition_syntax to handle shadow variant of frm file
      93c697ad
    • unknown's avatar
      WL 2826: Another step · 463e4e79
      unknown authored
      
      sql/mysql_priv.h:
        Set error_inject_code to zero after firing error injection
      sql/sql_partition.cc:
        New entries for new functions
      463e4e79
    • unknown's avatar
      WL 2826: First step in error handling of ALTER TABLE for partitioning · 3742297b
      unknown authored
      
      BUILD/SETUP.sh:
        Add possibility for BUILD scripts to add error inject flag
      BUILD/compile-pentium-debug-max:
        Add error inject flag to this script
      configure.in:
        Add handling of --with-error-inject in configure script
      sql/ha_ndbcluster.cc:
        Add possibility to rename handler file
      sql/ha_ndbcluster.h:
        Add possibility to rename handler file
      sql/ha_partition.cc:
        Add possibility to rename handler file
      sql/ha_partition.h:
        Add possibility to rename handler file
      sql/handler.h:
        Add possibility to rename handler file
      sql/mysql_priv.h:
        Add error inject macros
      sql/mysqld.cc:
        Add error inject system variables
      sql/set_var.cc:
        Add error inject system variables
      sql/sql_class.h:
        Add error inject system variables
      sql/sql_table.cc:
        Start modifying code for introducing table log, Step 1
      sql/unireg.cc:
        Add rename flag to handler file call
      sql/sql_partition.cc:
        Changes to ADD/DROP/CHANGE partitions
      3742297b
  2. 30 Jan, 2006 28 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 254ecc6a
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      254ecc6a
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d0b94118
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      d0b94118
    • unknown's avatar
      bug#10987 - rpl_ndb_bank - · e4fa3b80
      unknown authored
        Allow GET_TABINFO during BACKUP
        (otherwise LCP gets corrupt)
      
      
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        All GET_TABINFO during BACKUP
      e4fa3b80
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 79d941d2
      unknown authored
      into  linux.site:/home/reggie/work/mysql-5.1
      
      79d941d2
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · d145c1b8
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.1-clean
      
      d145c1b8
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · b98a0fe3
      unknown authored
      into lmy004.:/work/mysql-5.1-events_i_s
      
      b98a0fe3
    • unknown's avatar
      post-merge fixes of fix for bug#16642 (No I_S.EVENTS table) · d39162f6
      unknown authored
      WL#1034 (Internal CRON)
      
      
      mysql-test/r/events.result:
        fix result of t/events (post-merge fix of bug #16642)
      mysql-test/r/system_mysql_db.result:
        fix result(post-merge fix of bug #16642)
      mysql-test/t/events.test:
        fix test, use --echo instead of select, fix failing create event statement
      sql/event_timed.cc:
        add a bit more debug information
      d39162f6
    • unknown's avatar
      BUG# 14524 - Partitions: crash if blackhole · e946f094
      unknown authored
      This bug was fixed through other patches.  This test case just shows 
      that it is fixed.
      
      
      mysql-test/r/partition_hash.result:
        result block for bug #14524
      mysql-test/t/partition_hash.test:
        test block for bug# 14524
      e946f094
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 0a3674e9
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      0a3674e9
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d435bc8a
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      d435bc8a
    • unknown's avatar
      added --core option in mysql-test-run for ndb · ad94d5e6
      unknown authored
      
      mysql-test/r/ndb_restore.result:
        removed test printout not used
      mysql-test/t/ndb_restore.test:
        removed test printout not used
      ad94d5e6
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 33705339
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      33705339
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.1-new · 3cb27ddd
      unknown authored
      into  mysql.com:/home/bk/fix-mysql-5.1-new
      
      3cb27ddd
    • unknown's avatar
      Fixing minor problem causing the rpl_row_basic_11bugs test to fail · d3818204
      unknown authored
      when executed using the Perl version of mysql-test-run.
      
      
      mysql-test/t/rpl_row_basic_11bugs-master.opt:
        Removing extreneous semicolon
      d3818204
    • unknown's avatar
      post-commit merge · 40dfe2b7
      unknown authored
      
      mysql-test/lib/init_db.sql:
        Auto merged
      scripts/mysql_create_system_tables.sh:
        Auto merged
      scripts/mysql_fix_privilege_tables.sql:
        Auto merged
      sql/event.cc:
        Auto merged
      sql/event.h:
        Auto merged
      sql/event_executor.cc:
        Auto merged
      sql/event_priv.h:
        Auto merged
      sql/event_timed.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/events.result:
        manual merge
      mysql-test/r/system_mysql_db.result:
        manual merge
      mysql-test/t/events.test:
        manual merge
      40dfe2b7
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 03111c75
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      03111c75
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3ade6d1e
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/BUG16722/mysql-5.1-new
      
      
      storage/myisam/ft_boolean_search.c:
        Auto merged
      3ade6d1e
    • unknown's avatar
      fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table) · c821df7f
      unknown authored
      post-review change - use pointer instead of copy on the stack.
      WL#1034 (Internal CRON)
       This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
        EVENT_CATALOG  - MYSQL_TYPE_STRING  (Always NULL)
        EVENT_SCHEMA   - MYSQL_TYPE_STRING  (the database)
        EVENT_NAME     - MYSQL_TYPE_STRING  (the name)
        DEFINER        - MYSQL_TYPE_STRING  (user@host)
        EVENT_BODY     - MYSQL_TYPE_STRING  (the body from mysql.event)
        EVENT_TYPE     - MYSQL_TYPE_STRING  ("ONE TIME" | "RECURRING")
        EXECUTE_AT     - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
        INTERVAL_VALUE - MYSQL_TYPE_LONG    (set for RECURRING otherwise NULL)
        INTERVAL_FIELD - MYSQL_TYPE_STRING  (set for RECURRING otherwise NULL)
        SQL_MODE       - MYSQL_TYPE_STRING  (for now NULL)
        STARTS         - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
        ENDS           - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
        STATUS         - MYSQL_TYPE_STRING  (ENABLED | DISABLED)
        ON_COMPLETION  - MYSQL_TYPE_STRING  (NOT PRESERVE | PRESERVE)
        CREATED        - MYSQL_TYPE_TIMESTAMP
        LAST_ALTERED   - MYSQL_TYPE_TIMESTAMP
        LAST_EXECUTED  - MYSQL_TYPE_TIMESTAMP
        EVENT_COMMENT  - MYSQL_TYPE_STRING
      
        SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
      Support will be added as a fix for another bug.
      
       This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
      1. SHOW EVENTS shows always only the events on the same user,
         because the PK of mysql.event is (definer, db, name) several 
         users may have event with the same name -> no information disclosure.
      2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
         of all users. The user has to have PROCESS privilege, if not then
         SHOW FULL EVENTS behave like SHOW EVENTS.
      3. If [FROM db] is specified then this db is considered.
      4. Event names can be filtered with LIKE pattern.
        SHOW EVENTS returns table with the following columns, which are subset of
        the data which is returned by SELECT * FROM I_S.EVENTS
         Db
         Name
         Definer 
         Type
         Execute at
         Interval value
         Interval field 
         Starts 
         Ends
         Status
      
      
      mysql-test/lib/init_db.sql:
        change the PK - (definer, db, name)
        quicker searches when SHOW EVENTS;
        allow also different users to have events with the same name -> 
        no information disclosure
      mysql-test/r/events.result:
        result of new tests
      mysql-test/r/information_schema.result:
        result of new tests
      mysql-test/r/information_schema_db.result:
        result of new tests
      mysql-test/r/system_mysql_db.result:
        result of new tests
      mysql-test/t/events.test:
        new tests for information_schema.events
      scripts/mysql_create_system_tables.sh:
        change the PK of mysql.event to (definer, db, name)
      scripts/mysql_fix_privilege_tables.sql:
        change the PK of mysql.event to (definer, db, name)
      sql/event.cc:
        pass around the definer of the event because of the new PK
        which is (definer, db, name). It's needed for index searching.
      sql/event.h:
        - make enum evex_table_field again public so it can be used
        in sql_show.cc
        - make created and modified ulonglong, because they should be such
        - make public evex_open_event_table so it can be used in sql_show.cc
      sql/event_executor.cc:
        - cosmetics
      sql/event_priv.h:
        - moved enum evex_table_field and evex_open_event_table()
          to event.h (made them therefore public)
      sql/event_timed.cc:
        - in event_timed::init_definer() always fill this.definer with
          the concatenated value of definer_user@definer_host. Makes
          later the work easier.
        - pass around the definer wherever is needed for searching 
          (new prototype of evex_db_find_evex_aux)
      sql/mysqld.cc:
        - add counter for SHOW EVENTS
      sql/sql_lex.h:
        - register SHOW EVENTS as command
      sql/sql_parse.cc:
        - handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
        - make additional check in case of SHOW EVENTS (check for EVENT on
          the current database. if it is null check_access() gives appropriate
          message back.
      sql/sql_show.cc:
        - add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
        - I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
          asked to be added so bug #16642 can be completely closed. There
          is another bug report which will fix the lack of storage of
          SQL_MODE during event creation.
      sql/sql_yacc.yy:
        - always call event_timed::init_definer() when CREATE/ALTER/DROP
          EVENT but not when just compiling the body of the event because
          in this case this operation is not needed, it takes memory and
          CPU time and at the end the result is not used. event_timed::definer
          is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
          statement compilation.
        - add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
          in case of FULL and the user has PROCESS privilege then he will see
          also others' events in the current database, otherwise the output
          is the same as of SHOW EVENTS. Because the events are per DB only
          the events from the current database are shown. pattern is applied
          against event name. FROM db is self explanatory.
      sql/table.h:
        add SCH_EVENTS as part of INFORMATION_SCHEMA
      c821df7f
    • unknown's avatar
      Fix another non-portable __attribute__ · b86ba408
      unknown authored
      b86ba408
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 713663be
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      713663be
    • unknown's avatar
      __attribute__ is (of course) not portable · fa6e8ab0
      unknown authored
      fa6e8ab0
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c4b1f98b
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      c4b1f98b
    • unknown's avatar
      MySQL Bugs: #16772: Starting node joins cluster too early, workaround avoiding... · 622a2201
      unknown authored
      MySQL Bugs: #16772: Starting node joins cluster too early, workaround avoiding the issue for dynamically allocated nodeid's
      
      
      storage/ndb/include/kernel/signaldata/AllocNodeId.hpp:
        New BitKeeper file ``storage/ndb/include/kernel/signaldata/AllocNodeId.hpp''
      622a2201
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug15904/my51-bug15904 · d3c0764d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      sql/sql_table.cc:
        Auto merged
      d3c0764d
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug15719/my51-bug15719 · b34e199f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      b34e199f
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug15719/my50-bug15719 · 551069bc
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug15719/my51-bug15719
      
      
      sql-common/client.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      551069bc
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f6ca221c
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      f6ca221c
    • unknown's avatar
      bug#10987 - ndb - ndb_rpl_bank · 65eedf1f
      unknown authored
        more printouts...
      
      
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        printouts
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        printouts
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        printouts
      65eedf1f
  3. 29 Jan, 2006 6 commits
    • unknown's avatar
      Do not create log table handler if run in bootstrap mode. · 3bce2be5
      unknown authored
      This patch also fixes annoying complains on the log tables
      absence, issued by the shell version of mysql-test-run.
      
      
      sql/log.h:
        check for the table log handler presence, as now it
        could be absent in some cases. Namely, during bootstrap.
      sql/mysqld.cc:
        do not create log table handler, if run
        in bootstrap mode.
      3bce2be5
    • unknown's avatar
      bug#10987 - ndb - ndb_rpl_bank · 14fc26c3
      unknown authored
        even more debug printouts
      
      
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        more printouts...
      14fc26c3
    • unknown's avatar
      bug#10987 - ndb - more printouts to hunt rpl_ndb_bank problem in pushbuild · bf6a77e2
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        more printouts
        write tabfile sync
      bf6a77e2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 87564aa3
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.1
      
      
      sql/handler.h:
        Auto merged
      87564aa3
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new · aa17a53c
      unknown authored
      into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-new-wl2986
      
      aa17a53c
    • unknown's avatar
      WL# 2986 · 13ee3410
      unknown authored
      Final patch
      -----------
      
      This WL is about using this bitmap in all parts of the partition handler.
      Thus for:
      rnd_init/rnd_next
      index_init/index_next and all other variants of index scans
      read_range_... the various range scans implemented in the partition handler.
      
      Also use those bitmaps in the various other calls that currently loop over all
      partitions.
      
      
      
      
      mysql-test/r/partition_pruning.result:
        WL# 2986
        
        New results reflecting bitmap being used to determine if a partition is to be
        included
      mysql-test/t/partition_pruning.test:
        WL# 2986
        
        New tests to show bitmap being used in ha_partition
      sql/ha_partition.cc:
        WL# 2986
        
        Used work from 2682 and removed the partition select code.
            
        Added do {} while loop to any iteration over partitions to now utilise 
        m_part_info->used_partitions bitmap to determine if a partition should be
        used.
      sql/ha_partition.h:
        WL# 2986
        
        Removed unused member
      sql/handler.h:
        WL# 2986
        
        Removed unused member
      sql/opt_range.cc:
        WL# 2986
        
        Added bitmap_clear_all to clear bitmap prior to pruning
        DBUG code for testing
      sql/sql_partition.cc:
        WL# 2986
        
        Changed < to <=, which fixes the problem with edge cases going awry.
      13ee3410
  4. 28 Jan, 2006 1 commit
    • unknown's avatar
      two buffer overflows fixed · 180e9f8e
      unknown authored
      
      sql/sp.cc:
        use strxnmov, just in case
      sql/sql_parse.cc:
        init thd->security_ctx->priv_host,
        otherwise - buffer overflow in db_create_routine
      sql/unireg.cc:
        not too nice to do bzero(buf, 9) after char buf[5], eh ?
      180e9f8e