1. 08 Nov, 2004 1 commit
    • unknown's avatar
      Fixed a bug in UPDATE statement with no index column in where condition · 20c82f5c
      unknown authored
      locks all rows (BUG #3300). When using innobase_locks_unsafe_for_binlog
      option InnoDB does not take locks for those rows which do not
      belong to the result set or werent changed by the query. This fix removes
      unnecessary locks also from SELECT and DELETE queries.
      
      
      innobase/include/row0mysql.h:
        Added prototype for row_unlock_for_mysql() function which does an unlock of 
        a row for MySQL.
      innobase/include/trx0trx.h:
        Added a field trx_create_lock to a transaction structure. This field is
        TRUE if we have created a new lock for a record accessed.
      innobase/lock/lock0lock.c:
        Set lock create flag if lock is created and reset this flag before 
        transaction requests a lock.
      innobase/row/row0mysql.c:
        Add support for unlocking a row in InnoDB. If we are using 
        innobase_locks_unsafe_for_binlog option then all those record 
        locks obtained by SQL-query which do not belong to result set 
        or were not modified are unlocked i.e. we remove the lock from 
        those records.
      sql/ha_innodb.cc:
        Added support for a unlock_row interface in InnoDB.
      sql/ha_innodb.h:
        Added prototype for a function unlock_row().
      20c82f5c
  2. 07 Nov, 2004 4 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · bff1d475
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-update-5.0
      
      
      sql/sql_prepare.cc:
        Auto merged
      bff1d475
    • unknown's avatar
      postreview fixes · f1b9bf69
      unknown authored
      
      mysql-test/r/multi_update.result:
        test with multiupdate reopening tables
      mysql-test/t/multi_update.test:
        test with multiupdate reopening tables
      sql/item.cc:
        processor for cleunuping items in item tree
      sql/item.h:
        processor for cleunuping items in item tree
      sql/sql_update.cc:
        fixed case when lock reopened tables
      sql/table.cc:
        methos for cleunup view itema of table if they are present
      sql/table.h:
        methos for cleunup view itema of table if they are present
      f1b9bf69
    • unknown's avatar
      don't return intg=frac=0 from mod · 7b30603b
      unknown authored
      7b30603b
    • unknown's avatar
      memory overrun in decimal_mod · fc99b521
      unknown authored
      fc99b521
  3. 06 Nov, 2004 2 commits
  4. 05 Nov, 2004 4 commits
    • unknown's avatar
      Fix the client_test failure (due to failing cursors tests after the merge). · 21f90d19
      unknown authored
      
      sql/sql_select.cc:
        Fix the client_test failure (due to failing cursors tests after the merge):
        move some code around, use set_n_backup calls instead of by-hand
        setup.
      21f90d19
    • unknown's avatar
      A fix and test case for Bug#6102 "Server crash with prepared statement · 714fc4b7
      unknown authored
      and blank after function name".
      Crop fruits of copy-paste programming: pre-caching of stored functions
      wasn't performed for prepared statements just because implementation
      of prepared statements is done as an add-on to the main execution flow, 
      and the preload was originally implemented for main execution branch
      only (mysql_execute_command).
      
      
      mysql-test/r/ps.result:
        Test results fixed: bug#6102
      mysql-test/t/ps.test:
        A test case for Bug#6102 "Server crash with prepared statement
         and blank after functionname"
      sql/sql_prepare.cc:
        A fix for Bug#6102 "Server crash with prepared statement and blank 
        after functionname": we need to preload stored functions from system tables
         before we open any other tables.
      714fc4b7
    • unknown's avatar
      new lock for multiupdate: · 8b0ece5e
      unknown authored
      - open and create derived tables
      - detect which tables should be locked for write
      - lock and fill derived tables
      some unitialized variables fixed
      
      
      mysql-test/r/lock_multi.result:
        correct results returned
      mysql-test/r/multi_update.result:
        correct results returned
      mysql-test/r/view.result:
        correct results returned
      mysql-test/t/multi_update.test:
        correct results returned
      mysql-test/t/view.test:
        correct results returned
      sql/mysql_priv.h:
        derived tables processing splited on table creation and table filling
      sql/sql_base.cc:
        derived tables processing splited on table creation and table filling
      sql/sql_class.h:
        function to detect when we need fill derived tables
      sql/sql_derived.cc:
        derived tables processing splited on table creation and table filling
      sql/sql_lex.cc:
        fixed uninitialized value
      sql/sql_load.cc:
        fixed uninitialized value
      sql/sql_parse.cc:
        initialization muved (will be done for all queries)
      sql/sql_prepare.cc:
        preparation of multiupdate changed a bit because new locking procedure
      sql/sql_update.cc:
        new lock for multiupdate:
        - open and create derived tables
        - detect which tables should be locked for write
        - lock and fill derived tables
      sql/table.h:
        place to store select_result between creation and filling tables
      8b0ece5e
    • unknown's avatar
      The new "Bootstrap" pushed in 4.0 with changeset "joerg:1.2057" is used for building · ab71b3c6
      unknown authored
      _all_ versions. It tries to remove "Docs/Images/Makefile*" as part of the actions to
      correct bug number 6350. If the source tree does not contain a dummy file matching
      that pattern, this "rm" will fail, and so "Bootstrap" will fail.
      The "Makefile.am" introduced with this changeset is identical to the one that will
      arrive in the 5.0 tree when "joerg:1.2057" is propagated from 4.0 via 4.1 to here,
      so this separate introduction here is just to allow "Bootstraps" in the meantime.
      
      
      ab71b3c6
  5. 04 Nov, 2004 9 commits
  6. 03 Nov, 2004 13 commits
    • unknown's avatar
      take into accound end \0 in decimal_string_size · e981c836
      unknown authored
      e981c836
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · dccbc690
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
      
      
      mysql-test/r/ndb_blob.result:
        Auto merged
      dccbc690
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0/ · 9aa4871c
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      9aa4871c
    • unknown's avatar
      After merge fixes · 3693aa47
      unknown authored
      
      libmysqld/lib_sql.cc:
        After merge fix
      sql/handler.cc:
        Cleanup
      3693aa47
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0/ · e50a3099
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      e50a3099
    • unknown's avatar
      error codes chaged to bitmap (for easier testing with masks) · c41f992d
      unknown authored
      two more round() modes - CEILING and FLOOR
      
      
      c41f992d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4fb5d78d
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/sql_yacc.yy:
        Auto merged
      4fb5d78d
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2c856fa5
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
      
      
      2c856fa5
    • unknown's avatar
      Various syntax fixes in sql/sql_yacc.yy for stored procedures: · ebbe5e39
      unknown authored
        - No RESTICT|CASCADE in DROP SP (since it's not implemented)
        - Added optional "noise" to FETCH: [[NEXT] FROM]
        - At least one statement required in all block constructs except BEGIN-END
          (where zero is allowed)
      
      
      mysql-test/r/sp.result:
        Modified test cases for optional [[NEXT] FROM] in FETCH.
      mysql-test/t/sp.test:
        Modified test cases for optional [[NEXT] FROM] in FETCH.
      sql/sql_yacc.yy:
        Various syntax fixes for stored procedures:
          - No RESTICT|CASCADE in DROP SP (since it's not implemented)
          - Added optional "noise" to FETCH: [[NEXT] FROM]
          - At least one statement required in all block constructs except BEGIN-END
            (where zero is allowed)
      ebbe5e39
    • unknown's avatar
      Merge on pull · 614cda69
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/grant2.result:
        Auto merged
      mysql-test/r/sql_mode.result:
        Auto merged
      mysql-test/t/grant2.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      614cda69
    • unknown's avatar
      Fixes after merge with 4.1 · f5a47f15
      unknown authored
      FOUND is not a reserved keyword anymore
      Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
      Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
      Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
      
      
      BUILD/SETUP.sh:
        Portability fix
      client/mysqltest.c:
        Portability fix
      mysql-test/r/drop.result:
        updated results
      mysql-test/r/func_str.result:
        New warnings (after merge)
      mysql-test/r/insert.result:
        Updated tests
      mysql-test/r/join_nested.result:
        Updated results (because of new column types in 5.0)
      mysql-test/r/lock_multi.result:
        Temporarly wrong results until Sanja fixes multi-update-lock in 5.0
      mysql-test/r/multi_update.result:
        Temporary fix until Sanja fixes multi-update locking
      mysql-test/r/ps_1general.result:
        Update of results after merge
      mysql-test/r/ps_2myisam.result:
        Update of results after merge
      mysql-test/r/ps_3innodb.result:
        Update of results after merge
      mysql-test/r/ps_4heap.result:
        Update of results after merge
      mysql-test/r/ps_5merge.result:
        Update of results after merge
      mysql-test/r/ps_6bdb.result:
        Update of results after merge
      mysql-test/r/query_cache.result:
        Update of results after merge
      mysql-test/r/range.result:
        New results for new tests
      mysql-test/r/rpl_auto_increment.result:
        Update with new 4.0 information
      mysql-test/r/rpl_charset.result:
        After merge fixes
      mysql-test/r/subselect.result:
        After merge fixes
      mysql-test/r/view.result:
        Temporary fix until multi-update-locking is fixed
      mysql-test/t/drop.test:
        Safety fix
      mysql-test/t/multi_update.test:
        Temporary fix until multi-update-locking is fixed
      mysql-test/t/rpl_charset.test:
        More comments
      mysql-test/t/sp-error.test:
        Updated comments
      mysql-test/t/view.test:
        Temporary fix until multi-update-locking is fixed
      scripts/mysql_fix_privilege_tables.sh:
        Better error message
      sql-common/client.c:
        More debugging
      sql/ha_ndbcluster.cc:
        After merge fixes
      sql/handler.cc:
        After merge fixes
      sql/item.cc:
        Simple optimization of creating item
        After merge fixed
        Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
        The problem is that if you compare a string field to a binary string, you can't replace the field with a string constant as the binary comparison may then fail (The original field value may be in a different case)
      sql/item.h:
        Added Item::set_no_const_sub() to be able to mark fields that can't be substituted
      sql/item_cmpfunc.cc:
        Mark fields compared as binary to not be substituted.
      sql/item_func.cc:
        After merge fix
      sql/log_event.cc:
        After merge fix
      sql/mysql_priv.h:
        After merge fix
      sql/opt_range.cc:
        After merge fix
      sql/protocol.cc:
        Made flags uint instead of int (as it's used as a bit mask)
      sql/protocol.h:
        Made flags uint instead of int (as it's used as a bit mask)
      sql/protocol_cursor.cc:
        Made flags uint instead of int (as it's used as a bit mask)
        Indentation cleanups
      sql/sp.cc:
        After merge fixes
        Removed compiler warnings
      sql/sp_head.cc:
        After merge fixes
      sql/sql_base.cc:
        After merge fixes
        Removed 'send_error' from 'insert_fields()' as the error is sent higher up
      sql/sql_class.cc:
        Give assert if set_n_backup_item_arena is used twice
      sql/sql_class.h:
        Give assert if set_n_backup_item_arena is used twice
        After merge fixes
        Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
      sql/sql_handler.cc:
        After merge fixes
      sql/sql_parse.cc:
        After merge fixes
      sql/sql_prepare.cc:
        After merge fixes
      sql/sql_select.cc:
        After merge fixes
        Moved 'build_equal_items' to optimize_cond() (logical place)
      sql/sql_table.cc:
        After merge fixes
      sql/sql_trigger.cc:
        After merge fixes
      sql/sql_update.cc:
        After merge fixes
        (This should be fixed by Sanja to have lower granuality locking of tables in multi-update)
      sql/sql_view.cc:
        After merge fixes
      sql/sql_yacc.yy:
        After merge fixes
        Don't have FOUND as a reserved keyword
      f5a47f15
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · fbb2b237
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
      
      
      fbb2b237
    • unknown's avatar
      Merge bk://mysql.bkbits.net/mysql-5.0 · 2bc842a4
      unknown authored
      into avenger.(none):/export/brian/mysql/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      2bc842a4
  7. 02 Nov, 2004 7 commits