1. 06 Feb, 2008 2 commits
  2. 05 Feb, 2008 2 commits
    • unknown's avatar
      Disabling test case. · 923da063
      unknown authored
      Bug 34311: main.lock_multi.test fails.
      
      
      mysql-test/r/lock_multi.result:
        Update result file.
      mysql-test/t/lock_multi.test:
        Disabled test case for Bug#30331.
      923da063
    • unknown's avatar
      Fix merge: fix test. · 02c60aac
      unknown authored
      02c60aac
  3. 04 Feb, 2008 1 commit
    • unknown's avatar
      Patch clean up. · 1df9d557
      unknown authored
      Fixed interference between tests: Users were added but not properly removed.
      This caused later tests to fail.
      
      
      mysql-test/r/grant.result:
        Fixed interference between tests: Users were added but not properly removed.
        This caused later tests to fail.
      mysql-test/t/grant.test:
        Fixed interference between tests: Users were added but not properly removed.
        This caused later tests to fail.
      1df9d557
  4. 01 Feb, 2008 8 commits
    • unknown's avatar
      Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · eba5afec
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
      
      
      sql/sql_acl.cc:
        Auto merged
      eba5afec
    • unknown's avatar
      Fix merge. · f4a9379e
      unknown authored
      f4a9379e
    • unknown's avatar
      * Manual merge fix. · 381d9c46
      unknown authored
      
      mysql-test/r/grant.result:
        - Manual merge step 2: Verify test cases and record new result set.
      381d9c46
    • unknown's avatar
      Merge adventure.(none):/home/thek/Development/cpp/bug33201/my50-bug33201 · e0a8e60f
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/bug33201/my51-bug33201
      
      
      mysql-test/t/grant.test:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      mysql-test/r/grant.result:
        Manual merge
      e0a8e60f
    • unknown's avatar
      Bug#33201 Crash occurs when granting update privilege on one column of a view · caf488fe
      unknown authored
      When issuing a column level grant on a table which require pre-locking the 
      server crashed.
      
      The reason behind the crash was that data structures used by the lock api
      wasn't properly reinitialized in the case of a column level grant.
      
      
      mysql-test/r/grant.result:
        * Added test case
      mysql-test/t/grant.test:
        * Added test case
      sql/sql_acl.cc:
        * The lock api is dending on the thd->lex object and this variable needs to 
          be re-initialized when opened with a new set of tables than specified in the
          original statement.
      caf488fe
    • unknown's avatar
      Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 · b56b705e
      unknown authored
      into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
      
      
      client/mysqlcheck.c:
        Auto merged
      configure.in:
        Auto merged
      extra/resolveip.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/func_misc.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/mysqlcheck.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/func_misc.test:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      mysql-test/t/mysqlcheck.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/buf/buf0flu.c:
        Auto merged
      storage/innobase/buf/buf0lru.c:
        Auto merged
      storage/innobase/include/buf0buf.h:
        Auto merged
      storage/innobase/include/buf0buf.ic:
        Auto merged
      storage/innobase/include/sync0arr.h:
        Auto merged
      storage/innobase/include/sync0rw.h:
        Auto merged
      storage/innobase/include/sync0rw.ic:
        Auto merged
      storage/innobase/include/sync0sync.h:
        Auto merged
      storage/innobase/os/os0sync.c:
        Auto merged
      storage/innobase/sync/sync0arr.c:
        Auto merged
      storage/innobase/sync/sync0rw.c:
        Auto merged
      storage/innobase/sync/sync0sync.c:
        Auto merged
      storage/myisam/ft_boolean_search.c:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      sql/sql_parse.cc:
        Manual merge.
      b56b705e
    • unknown's avatar
      Fix merge. · 4e3e5464
      unknown authored
      4e3e5464
    • unknown's avatar
      Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt · 541a1391
      unknown authored
      into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
      
      
      client/mysqlcheck.c:
        Auto merged
      configure.in:
        Auto merged
      extra/resolveip.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/func_misc.result:
        Auto merged
      mysql-test/r/mysqlcheck.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/func_misc.test:
        Auto merged
      mysql-test/t/mysqlcheck.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/buf/buf0flu.c:
        Auto merged
      storage/innobase/buf/buf0lru.c:
        Auto merged
      storage/innobase/include/buf0buf.h:
        Auto merged
      storage/innobase/include/buf0buf.ic:
        Auto merged
      storage/innobase/include/sync0arr.h:
        Auto merged
      storage/innobase/include/sync0rw.h:
        Auto merged
      storage/innobase/include/sync0rw.ic:
        Auto merged
      storage/innobase/include/sync0sync.h:
        Auto merged
      storage/innobase/os/os0sync.c:
        Auto merged
      storage/innobase/sync/sync0arr.c:
        Auto merged
      storage/innobase/sync/sync0rw.c:
        Auto merged
      storage/innobase/sync/sync0sync.c:
        Auto merged
      storage/myisam/ft_boolean_search.c:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      mysql-test/t/variables.test:
        Manual merge.
      541a1391
  5. 30 Jan, 2008 2 commits
    • unknown's avatar
      Fix a build failure (embedded server). · b9451318
      unknown authored
      b9451318
    • unknown's avatar
      A fix and a test case for Bug#34166 Server crash in SHOW OPEN TABLES and · a80ec7ad
      unknown authored
      pre-locking.
      
      The crash was caused by an implicit assumption in check_table_access() that
      table_list parameter is always a part of lex->query_tables.
      
      When iterating over the passed list of tables, check_table_access() used
      to stop only when lex->query_tables_last_not_own was reached. 
      In case of pre-locking, lex->query_tables_last_own is not NULL and points
      to some element of lex->query_tables. When the parameter
      of check_table_access() was not part of lex->query_tables, loop invariant
      could never be violated and a crash would happen when the current table
      pointer would point beyond the end of the provided list.
      
      The fix is to change the signature of check_table_access() to also accept
      a numeric limit of loop iterations, similarly to check_grant(), and 
      supply this limit in all places when we want to check access of tables
      that are outside lex->query_tables, or just want to check access to one table.
      
      
      mysql-test/r/information_schema.result:
        Update test results (Bug#34166).
      mysql-test/t/information_schema.test:
        Add a test case for Bug#34166.
      sql/mysql_priv.h:
        Change signature of check_table_access() to accept a numeric limit
        of tables to check.
      sql/sp_head.cc:
        Update to the new signature of check_table_access().
      sql/sql_acl.cc:
        Improve code clarity: if there is a numeric limit, we should not need
        to look at first_not_own_table.
      sql/sql_base.cc:
        Update to the new signature of check_table_access().
      sql/sql_cache.cc:
        Update to the new signature of check_table_access().
      sql/sql_parse.cc:
        Update to the new signature of check_table_access().
        Change check_table_access() to accept an optional numeric limit of tables
        to check. A crash would happen when check_table_access() was
        passed a list of tables that is not part of lex->query_tables and
        lex->query_tables_last_own was not NULL.
      sql/sql_plugin.cc:
        Update to the new signature of check_table_access().
      sql/sql_prepare.cc:
        Update to the new signature of check_table_access().
      sql/sql_show.cc:
        Update to the new signature of check_table_access().
        Ensure that check_table_access() only checks access to the first
        table in the table list when called from list_open_tables().
        list_open_tables() supplies a table list that is created on stack,
        whereas check_table_access() used to assume that the supplied list is a part
        of thd->lex.
      sql/sql_trigger.cc:
        Update to the new signature of check_table_access().
      sql/sql_view.cc:
        Update to the new signature of check_table_access().
      a80ec7ad
  6. 29 Jan, 2008 3 commits
  7. 28 Jan, 2008 2 commits
    • unknown's avatar
      Remove spurious commented out test line. · c885ba4b
      unknown authored
      
      mysql-test/t/lock_multi.test:
        Remove spurious test line.
      c885ba4b
    • unknown's avatar
      Bug#30331 Table_locks_waited shows inaccurate values · 0e315b39
      unknown authored
      The problem is that the Table_locks_waited was incremented only
      when the lock request succeed. If a thread waiting for the lock
      gets killed or the lock request is aborted, the variable would
      not be incremented, leading to inaccurate values in the variable.
      
      The solution is to increment the Table_locks_waited whenever the
      lock request is queued. This reflects better the intended behavior
      of the variable -- show how many times a lock was waited.
      
      
      mysql-test/r/lock_multi.result:
        Add test case result for Bug#30331
      mysql-test/t/lock_multi.test:
        Add test case for Bug#30331
      mysys/thr_lock.c:
        Increment locks_waited whenever the thread is supposed
        to wait for the lock.
      0e315b39
  8. 27 Jan, 2008 2 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 24cda918
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      mysql-test/r/mysqlcheck.result:
        Use local (manual merge)
      mysql-test/t/mysqlcheck.test:
        Use local (manual merge)
      24cda918
    • unknown's avatar
      Fix test case for Bug #25347 so that it actually tests the code fix, · 2989a539
      unknown authored
      and so that it works correctly on Windows.
      
      
      mysql-test/r/mysqlcheck.result:
        Flush tables before monkeying around with underlying MyISAM data files
      mysql-test/t/mysqlcheck.test:
        Fix the test case for bug #25347 so that it actually does test the behavior.
        Also, this makes it work on Windows by ensuring that mysqld doesn't hold the
        underlying MyISAM files open while we try to corrupt them on disk.
        
        Flush tables before monkeying around with underlying MyISAM data files;
        --use-frm, so that mysqlcheck will succeed.
      2989a539
  9. 25 Jan, 2008 5 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 323ebccd
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      mysql-test/t/mysqlcheck.test:
        Manual merge
      323ebccd
    • unknown's avatar
      Un-break test case on Windows, for bug #25347 · f1669721
      unknown authored
      
      mysql-test/t/mysqlcheck.test:
        Use --remove_file and --write_file instead of --exec rm and --exec touch.
      f1669721
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 9c4292b9
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      sql/sql_select.cc:
        Auto merged
      9c4292b9
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · e300d98b
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      client/mysqldump.c:
        Auto merged
      configure.in:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/handler.cc:
        Manual merge
      sql/item.cc:
        Manual merge
      e300d98b
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · 93d6b918
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      sql/sql_select.cc:
        Auto merged
      93d6b918
  10. 24 Jan, 2008 4 commits
  11. 23 Jan, 2008 9 commits
    • unknown's avatar
      Manual merge · bf296bb1
      unknown authored
      bf296bb1
    • unknown's avatar
      Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618 · c26bcbaf
      unknown authored
      into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-33618
      
      
      mysql-test/r/sp-code.result:
        Auto merged
      mysql-test/t/sp-code.test:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sp_rcontext.cc:
        Auto merged
      c26bcbaf
    • unknown's avatar
      manual merge · 5ecbc830
      unknown authored
      5ecbc830
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 5e065732
      unknown authored
      into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618
      
      
      mysql-test/t/sp.test:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      5e065732
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · d0739945
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      d0739945
    • unknown's avatar
      Bug#33618 (Crash in sp_rcontext) · 96dc5f05
      unknown authored
      Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)
      
      The server used to crash when REPEAT or another control instruction
      was used in conjunction with labels and a LEAVE instruction.
      
      The crash was caused by a missing "pop" of handlers or cursors in the
      code representing the stored program. When executing the code in a loop,
      this missing "pop" would result in a stack overflow, corrupting memory.
      
      Code generation has been fixed to produce the missing h_pop/c_pop
      instructions.
      
      Also, the logic checking that labels at the beginning and the end of a
      statement are matched was incorrect, causing Bug 33983.
      End labels, when used, must match the label used at the beginning of a block.
      
      
      mysql-test/r/sp-code.result:
        Bug#33618 (Crash in sp_rcontext)
      mysql-test/r/sp-error.result:
        Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)
      mysql-test/r/sp.result:
        Bug#33618 (Crash in sp_rcontext)
      mysql-test/t/sp-code.test:
        Bug#33618 (Crash in sp_rcontext)
      mysql-test/t/sp-error.test:
        Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)
      mysql-test/t/sp.test:
        Bug#33618 (Crash in sp_rcontext)
      sql/sp_head.cc:
        Bug#33618 (Crash in sp_rcontext)
      sql/sp_head.h:
        Bug#33618 (Crash in sp_rcontext)
      sql/sp_rcontext.cc:
        Bug#33618 (Crash in sp_rcontext)
      sql/sp_rcontext.h:
        Bug#33618 (Crash in sp_rcontext)
      sql/sql_yacc.yy:
        Bug#33618 (Crash in sp_rcontext)
      96dc5f05
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 75728793
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
      
      
      configure.in:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      75728793
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · beecdbdb
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      sql/item_timefunc.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      beecdbdb
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · a51fa842
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
      
      
      configure.in:
        Auto merged
      extra/resolveip.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/func_misc.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/func_misc.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/myisam/ft_boolean_search.c:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      client/mysqlcheck.c:
        manual merge
      mysql-test/r/mysqlcheck.result:
        manual merge
      mysql-test/t/mysqlcheck.test:
        manual merge
      a51fa842