1. 18 Dec, 2004 3 commits
    • unknown's avatar
      Simplify code during review · 2ca011d4
      unknown authored
      2ca011d4
    • unknown's avatar
      Remove bogus lines · c6be6653
      unknown authored
      c6be6653
    • unknown's avatar
      Bug#7391 - Multi-table UPDATE security regression · 4f9a0a06
      unknown authored
        Add in missing privilege checks. 
        Tests for the privileges.
      
      
      mysql-test/r/grant.result:
        Bug#7391 - Multi-table UPDATE security regression
          Tests column, table and db level access
      mysql-test/t/grant.test:
        Bug#7391 - Multi-table UPDATE security regression
          Tests column, table and db level access
      sql/sql_update.cc:
        Bug#7391 - Multi-table UPDATE security regression
          Add in missing privilege checks.
      4f9a0a06
  2. 16 Dec, 2004 4 commits
  3. 13 Dec, 2004 1 commit
    • unknown's avatar
      dict0load.c: · f40f838f
      unknown authored
        dict_load_table(): detect the new table format of MySQL 5.0.3
      
      
      innobase/dict/dict0load.c:
        dict_load_table(): detect the new table format of MySQL 5.0.3
      f40f838f
  4. 11 Dec, 2004 3 commits
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 · b18e8c92
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.0-bug6976
      
      
      b18e8c92
    • unknown's avatar
      Fix for BUG#6976: · b5c119e7
      unknown authored
      In Item_ref::Item_ref set maybe_null (and other fields fix_fields sets) to be the 
      same as in (*ref), because Item_ref::fix_fields() will not be called.  Previously 
      maybe_null was 0 always and this produced a bogus state where 
      maybe_null==0 && is_null() == true 
      which broke evaluation for some upper-level Items, like AND and OR.
      
      
      mysql-test/r/group_by.result:
        Test for BUG#6976
      mysql-test/t/group_by.test:
        Test for BUG#6976
      sql/item.cc:
        Comment added
      sql/item.h:
        Fix for BUG#6976:
          in Item_ref::Item_ref(Item**...) fix all fields because fix_fields() will not be called.
      b5c119e7
    • unknown's avatar
      Fix for BUG#5837 - attempt 3. · 8e4251dd
      unknown authored
        Call mark_as_null_row in join_read_const and join_read_system.
      
      
      mysql-test/r/multi_update.result:
        Testcase for BUG#5837
      mysql-test/t/multi_update.test:
        Testcase for BUG#5837
      sql/table.h:
        Added comments
      8e4251dd
  5. 10 Dec, 2004 2 commits
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0 · 96a927b5
      unknown authored
      into hundin.mysql.fi:/home/marko/k/mysql-4.0
      
      
      96a927b5
    • unknown's avatar
      dict0dict.h, dict0dict.c, ha_innodb.cc: · c486461e
      unknown authored
        Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8
      
      
      sql/ha_innodb.cc:
        Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8
      innobase/dict/dict0dict.c:
        Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8
      innobase/include/dict0dict.h:
        Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8
      c486461e
  6. 09 Dec, 2004 1 commit
    • unknown's avatar
      srv0srv.c: · f4f4e636
      unknown authored
        srv_printf_innodb_monitor(): Removed extraneous rewind() call.
        The caller of this function calls rewind() if necessary.
        In this way, we avoid rewind()ing stderr in
        srv_lock_timeout_and_monitor_thread().
      
      
      innobase/srv/srv0srv.c:
        srv_printf_innodb_monitor(): Removed extraneous rewind() call.
        The caller of this function calls rewind() if necessary.
        In this way, we avoid rewind()ing stderr in
        srv_lock_timeout_and_monitor_thread().
      f4f4e636
  7. 07 Dec, 2004 2 commits
  8. 02 Dec, 2004 2 commits
    • unknown's avatar
      Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the · 9286d1c1
      unknown authored
      insertion of new records partially failed. It would get logged because of the
      logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
      in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
      back on failure, even for non-transactional tables. (Bug #6682)
      (Original fix reimplemented after review by Serg and Guilhem.)
      
      
      mysql-test/t/insert_select.test:
        Add test case for Bug #6682
      mysql-test/r/insert_select.result:
        Add results for test case for Bug #6682
      sql/sql_table.cc:
        moved tmp_disable_binlog() and reenable_binlog macros to sql/sql_class.h
      sql/sql_insert.cc:
        disable binlog during call to super's ::send_error in select_create class
      sql/sql_class.h:
        add select_create::send_error()
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      9286d1c1
    • unknown's avatar
      A fix (bug #6878: Crash with engine=memory). · a845e882
      unknown authored
      
      heap/hp_open.c:
        A fix (bug #6878: Crash with engine=memory).
        Record length should be >= sizeof(byte*).
      a845e882
  9. 30 Nov, 2004 1 commit
    • unknown's avatar
      two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next... · 352ad815
      unknown authored
      two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever"
      (originally reported as "second run of innobackup hangs forever and can even hang server").
      Plus testcase for the bugfix and comments about global read locks.
      
      
      mysql-test/r/flush_block_commit.result:
        result update
      mysql-test/t/flush_block_commit.test:
        testing bugfix (originally: second run of innobackup hangs)
      sql/lock.cc:
        When we are in start_waiting_global_read_lock(), if we ourselves have
        the global read lock, there is nothing to start. This makes a pair with how 
        wait_if_global_read_lock() behaves when we ourselves have the global read lock.
        Previously, start_waiting_global_read_lock() decremented protect... whereas wait_if_global_read_lock()
        hadn't incremented it => very wrong => hangs.
        Descriptive comments on how global read lock works.
      352ad815
  10. 26 Nov, 2004 2 commits
    • unknown's avatar
      srv0srv.c: · 59abcd44
      unknown authored
        srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
        only if --innodb_status_file=1
      
      
      innobase/srv/srv0srv.c:
        srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
        only if --innodb_status_file=1
      59abcd44
    • unknown's avatar
      Fixes while reviewing code · 60af9206
      unknown authored
      (Cleanups and better bug fixes)
      
      
      mysql-test/r/select.result:
        Fixed test after wrong merge
      mysql-test/t/select.test:
        Fixed test after wrong merge
      scripts/mysql_fix_privilege_tables.sh:
        Don't read defaults files
      sql/item_cmpfunc.cc:
        Fix wrong value for not_null_tables_cache
      sql/item_cmpfunc.h:
        Remove wrong patch (flags are set in fix_length_and_dec())
      sql/item_func.h:
        Fix wrong value for not_null_tables_cache
      sql/slave.cc:
        Fixed indentation
      60af9206
  11. 25 Nov, 2004 4 commits
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/4.0-virgin · fecd27a1
      unknown authored
      into mysql.com:/home/timka/mysql/src/4.0-master
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      fecd27a1
    • unknown's avatar
      Merge for BUG#3759 which was missing from the main tree for some reason. · 0dcb55f4
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/item_cmpfunc.h:
        Auto merged
      mysql-test/r/select.result:
        Merge for BUG#3759
      mysql-test/t/select.test:
        Merge for BUG#3759
      0dcb55f4
    • unknown's avatar
      Merge mysql.com:/space/bkroot/mysql-4.0 · 467c4814
      unknown authored
      into mysql.com:/space/bk/b6148-mysql-4.0
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      467c4814
    • unknown's avatar
      Fix for Bug#6148. Only rewind read position in binary log when the · 6f2cf12a
      unknown authored
      slave SQL thread is started.
      
      
      sql/slave.cc:
        Adding threads to init as parameter to init_master_info.
        Only rewind read position when starting SQL thread.
      sql/slave.h:
        Adding threads to init as parameter to init_master_info.
        Only rewind read position when starting SQL thread.
      sql/sql_repl.cc:
        Adding threads to init as parameter to init_master_info.
        Only rewind read position when starting SQL thread.
      sql/repl_failsafe.cc:
        Adding threads to init as parameter to init_master_info.
        Only rewind read position when starting SQL thread.
      6f2cf12a
  12. 24 Nov, 2004 1 commit
  13. 23 Nov, 2004 1 commit
    • unknown's avatar
      Change "Do-compile" to make automatic build log analysis easier and · a9aff01e
      unknown authored
      to run the standard tests with "--force" (default, can be switched off).
      
      
      Build-tools/Do-compile:
        1) For an automated log analysis, we need a clear marker in the build log
           whether compile + link succeeded: Write it after successful "make".
        2) Ensure the standard tests are run with "--force" in the default case,
           but allow the old behaviour by an option "--one-error".
        3) Correct a typing error in the usage message.
      a9aff01e
  14. 22 Nov, 2004 4 commits
  15. 19 Nov, 2004 1 commit
  16. 18 Nov, 2004 1 commit
  17. 17 Nov, 2004 1 commit
  18. 16 Nov, 2004 1 commit
    • unknown's avatar
      ha_innodb.cc: · 16d735ad
      unknown authored
        Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
      
      
      sql/ha_innodb.cc:
        Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
      16d735ad
  19. 15 Nov, 2004 1 commit
    • unknown's avatar
      Proposed fix for bug #6439 "from_unixtime() function returns wrong datetime · e1509cf7
      unknown authored
      values for too big argument".
      
      Added range checking for from_unixtime() argument, cleaned up code 
      a bit.
      
      
      mysql-test/r/func_time.result:
        Test for bug #6439 "from_unixtime() function returns wrong datetime 
        values for too big argument".
      mysql-test/t/func_time.test:
        Test for bug #6439 "from_unixtime() function returns wrong datetime 
        values for too big argument".
      sql/item_timefunc.cc:
        Item_func_from_unixtime: 
          Added error range checking for function argument + small code clean up.
      e1509cf7
  20. 12 Nov, 2004 4 commits