1. 07 Feb, 2008 4 commits
  2. 06 Feb, 2008 5 commits
  3. 05 Feb, 2008 2 commits
    • unknown's avatar
      Disabling test case. · 4df3bc0c
      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.
      4df3bc0c
    • unknown's avatar
      Fix merge: fix test. · 4e1be622
      unknown authored
      4e1be622
  4. 04 Feb, 2008 2 commits
    • unknown's avatar
      Patch clean up. · 4e8ef9c8
      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.
      4e8ef9c8
    • unknown's avatar
      Bug#21801 SQL exception handlers and warnings · ff8651c4
      unknown authored
      The problem is that deprecated syntax warnings were not being
      suppressed when the stored routine is being parsed for the first
      execution. It's doesn't make sense to print out deprecated
      syntax warnings when the routine is being executed because this
      kind of warning only matters when the routine is being created.
      
      The solution is to suppress deprecated syntax warnings when
      parsing the stored routine for loading into the cache (might
      mean that the routine is being executed for the first time).
      
      
      mysql-test/r/sp-error.result:
        Add test case result for Bug#21801
      mysql-test/t/sp-error.test:
        Add test case for Bug#21801
      sql/sp.cc:
        Implement a internal error handler to catch deprecated
        syntax warnings when loading a stored procedure into the
        cache.
      ff8651c4
  5. 01 Feb, 2008 8 commits
    • unknown's avatar
      Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 7d5a858d
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
      
      
      sql/sql_acl.cc:
        Auto merged
      7d5a858d
    • unknown's avatar
      Fix merge. · eab1044e
      unknown authored
      eab1044e
    • unknown's avatar
      * Manual merge fix. · bc070bd3
      unknown authored
      
      mysql-test/r/grant.result:
        - Manual merge step 2: Verify test cases and record new result set.
      bc070bd3
    • unknown's avatar
      Merge adventure.(none):/home/thek/Development/cpp/bug33201/my50-bug33201 · 36265f70
      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
      36265f70
    • unknown's avatar
      Bug#33201 Crash occurs when granting update privilege on one column of a view · f7d8fb1c
      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.
      f7d8fb1c
    • unknown's avatar
      Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 · d639cdc3
      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.
      d639cdc3
    • unknown's avatar
      Fix merge. · c47ba211
      unknown authored
      c47ba211
    • unknown's avatar
      Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt · 8df2bb04
      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.
      8df2bb04
  6. 30 Jan, 2008 2 commits
    • unknown's avatar
      Fix a build failure (embedded server). · 96f33937
      unknown authored
      96f33937
    • unknown's avatar
      A fix and a test case for Bug#34166 Server crash in SHOW OPEN TABLES and · 39509d64
      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().
      39509d64
  7. 29 Jan, 2008 3 commits
  8. 28 Jan, 2008 2 commits
    • unknown's avatar
      Remove spurious commented out test line. · cdc66b12
      unknown authored
      
      mysql-test/t/lock_multi.test:
        Remove spurious test line.
      cdc66b12
    • unknown's avatar
      Bug#30331 Table_locks_waited shows inaccurate values · 3d5e32b2
      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.
      3d5e32b2
  9. 27 Jan, 2008 2 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 4bacd537
      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)
      4bacd537
    • unknown's avatar
      Fix test case for Bug #25347 so that it actually tests the code fix, · 32f59206
      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.
      32f59206
  10. 25 Jan, 2008 5 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 8b314591
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      mysql-test/t/mysqlcheck.test:
        Manual merge
      8b314591
    • unknown's avatar
      Un-break test case on Windows, for bug #25347 · 9dbd3877
      unknown authored
      
      mysql-test/t/mysqlcheck.test:
        Use --remove_file and --write_file instead of --exec rm and --exec touch.
      9dbd3877
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · aa4f8572
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      sql/sql_select.cc:
        Auto merged
      aa4f8572
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · bf541d14
      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
      bf541d14
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · 893d98fb
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      sql/sql_select.cc:
        Auto merged
      893d98fb
  11. 24 Jan, 2008 4 commits
  12. 23 Jan, 2008 1 commit