1. 29 May, 2006 12 commits
  2. 26 May, 2006 7 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 22345420
      unknown authored
      into  mysql.com:/home/emurphy/iggy/mysql-5.0
      
      
      sql/mysqld.cc:
        Auto merged
      22345420
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0 · bce6a702
      unknown authored
      into  mysql.com:/home/kgeorge/mysql/5.0/clean
      
      
      bce6a702
    • unknown's avatar
      Merge mysql.com:/home/kgeorge/mysql/5.0/clean · dd01932a
      unknown authored
      into  mysql.com:/home/kgeorge/mysql/5.0/B18681
      
      
      sql/sql_acl.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/view_grant.result:
        resolved conflict
      mysql-test/t/view_grant.test:
        resolved merge conflict
      dd01932a
    • unknown's avatar
      Merge mysql.com:/home/kgeorge/mysql/5.0/clean · 6386c5df
      unknown authored
      into  mysql.com:/home/kgeorge/mysql/5.0/B18681
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      6386c5df
    • unknown's avatar
      Merge mysql.com:/home/kgeorge/mysql/5.0/clean · 232a7e7c
      unknown authored
      into  mysql.com:/home/kgeorge/mysql/5.0/B14875
      
      
      232a7e7c
    • unknown's avatar
      Bug #14875: Bad view DEFINER makes SHOW CREATE VIEW fail · 419ae6cb
      unknown authored
      When reading a view definition from a .frm file it was
      throwing a SQL error if the DEFINER user is not defined.
      Changed it to a warning to match the (documented) case
      when a view with undefined DEFINER user is created.
      
      
      mysql-test/r/view_grant.result:
        test case for the bug
      mysql-test/t/view_grant.test:
        test case for the bug
      sql/sql_acl.cc:
        Initialized the members to no privileges so even if
        the subsequent checks fail it will still initialize
        the security context.
      sql/table.cc:
        Turned the error of undefined DEFINER user in reading 
        a view definition to a warning.
      419ae6cb
    • unknown's avatar
      BUG#18681: View privileges are broken · d7743c41
      unknown authored
      The check for view security was lacking several points :
      1. Check with the right set of permissions : for each table ref that
      participates in a view there were the right credentials to use in it's
      security_ctx member, but these weren't used for checking the credentials.
      This makes hard enforcing the SQL SECURITY DEFINER|INVOKER property
      consistently.
      2. Because of the above the security checking for views was just ruled out
      in explicit ways in several places.
      3. The security was checked only for the columns of the tables that are
      brought into the query from a view. So if there is no column reference
      outside of the view definition it was not detecting the lack of access to
      the tables in the view in SQL SECURITY INVOKER mode.
      
      The fix below tries to fix the above 3 points.
      
      
      mysql-test/r/grant.result:
        removed nondeterminism (unspecified order) in some test output
      mysql-test/r/view_grant.result:
        Somewhat extended test case for the bug and similar queries.
      mysql-test/t/grant.test:
        removed nondeterminism (unspecified order) in some test output
      mysql-test/t/view_grant.test:
        Somewhat extended test case for the bug and similar queries.
      sql/mysql_priv.h:
        A wrapper for setup_tables that also checks access to the tables
      sql/sql_acl.cc:
        removed artificial security check stop and used the table ref's credentials.
      sql/sql_base.cc:
        a wrapper for setup_tables to check access to the tables
      sql/sql_delete.cc:
        wrapper called.
      sql/sql_insert.cc:
        wrapper called
      sql/sql_load.cc:
        wrapper called
      sql/sql_parse.cc:
        wrapper called and artificial check stop removed
      sql/sql_select.cc:
        wrapper called
      sql/sql_update.cc:
        wrapper called
      sql/table.cc:
        Mask table access to the view error as well.
      d7743c41
  3. 25 May, 2006 8 commits
  4. 24 May, 2006 13 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 39736af1
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      39736af1
    • unknown's avatar
      Merge monty@192.168.0.9:/my/mysql-5.0 · 54263173
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      sql/mysqld.cc:
        Auto merged
      54263173
    • unknown's avatar
      More DBUG statements · 8b670ee3
      unknown authored
      Replaced COND_refresh with COND_global_read_lock becasue of a bug in NTPL threads when using different mutexes as arguments to pthread_cond_wait()
      The original code caused a hang in FLUSH TABLES WITH READ LOCK in some circumstances because pthread_cond_broadcast() was not delivered to other threads.
      This fixes:
      Bug#16986: Deadlock condition with MyISAM tables
      Bug#20048: FLUSH TABLES WITH READ LOCK causes a deadlock
      
      
      mysql-test/r/flush.result:
        Added test case for deadlock with FLUSH TABLES WITH READ LOCK
      mysql-test/r/lock_multi.result:
        Test for bug in LOCK TABLE + optimize table
      mysql-test/t/flush.test:
        Added test case for deadlock with FLUSH TABLES WITH READ LOCK
      mysql-test/t/lock_multi.test:
        Test for bug in LOCK TABLE + optimize table
      sql/lock.cc:
        Replaced COND_refresh with COND_global_read_lock becasue of a bug in NTPL threads when using different mutexes as arguments to pthread_cond_wait()
        The original code caused a hang in FLUSH TABLES WITH READ LOCK in some circumstances because pthread_cond_broadcast() was not delivered to other threads
      sql/mysql_priv.h:
        Added COND_global_read_lock
      sql/mysqld.cc:
        Added COND_global_read_lock
      sql/sql_base.cc:
        More DBUG statements
        Added a broadcast in remove_table_from_cache() to release any threads waiting in open
      8b670ee3
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · f63e1728
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
      
      
      f63e1728
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · ce4cab46
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
      
      
      ce4cab46
    • unknown's avatar
      Merge mysql.com:/opt/local/work/mysql-5.0-root · bbb279f8
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.0-runtime
      
      
      bbb279f8
    • unknown's avatar
      configure.in: · 5ec9cff7
      unknown authored
        Stepped up to 5.0.23
      
      
      configure.in:
        Stepped up to 5.0.23
      5ec9cff7
    • unknown's avatar
      Merge april.(none):/home/svoj/devel/mysql/BUG12873/mysql-5.0 · 3ebf1916
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
      
      
      3ebf1916
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · c06d757e
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
      
      
      sql/sql_table.cc:
        Auto merged
      c06d757e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d5df9342
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      d5df9342
    • unknown's avatar
      Remove dflt_field from field structure as this was only needed when createing... · 12a0f4ff
      unknown authored
      Remove dflt_field from field structure as this was only needed when createing temporary table and I found another soultion that doesn't increase the size of the field structure for all table instances. (Better fix for bug #19089)
      Fixed compiler warnings
      Fixed valgrind warning in Item_date_add_intervall::eq. (Recoding of bugfix #19490)
      
      
      sql/field.cc:
        remove dflt_field from field structure (not needed)
        Simple cleanup of code that been copied elsewhere
      sql/field.h:
        remove dflt_field from field structure (not needed)
      sql/item.h:
        Removed compiler warnings
      sql/item_timefunc.cc:
        Fixed Item_date_add_intervall::eq
        The problem was that when we call 'eq' 'this' is not fixed, which means we can't call const_item() or a value function.
        I fixed this so that we check eq for all arguments and that the sign and type are identical.
        (The original code gave a 'accessing uninitialized data' in valgrind.
      sql/mysql_priv.h:
        Added default fields to create_tmp_field
      sql/sql_insert.cc:
        New default_field parameter to create_tmp_field()
      sql/sql_select.cc:
        New default_field parameter to create_tmp_field()
        Use this in create_tmp_table() to set right default value for a field
      12a0f4ff
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug15328/my41-bug15328 · 81dd2cd0
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/mysqldump.result:
        Manual merge
      mysql-test/t/mysqldump.test:
        Manual merge
      81dd2cd0
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 89fdbbeb
      unknown authored
      into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
      
      
      89fdbbeb