1. 27 Mar, 2007 1 commit
    • unknown's avatar
      Fix for BUG#25082: default database change on trigger · 73664252
      unknown authored
      execution breaks replication.
      
      When a stored routine is executed, we switch current
      database to the database, in which the routine
      has been created. When the stored routine finishes,
      we switch back to the original database.
      
      The problem was that if the original database does not
      exist (anymore) after routine execution, we raised an error.
      
      The fix is to report a warning, and switch to the NULL database.
      
      
      mysql-test/r/sp.result:
        Updated result file.
      mysql-test/t/sp.test:
        Added test case for BUG#25082.
      sql/mysql_priv.h:
        1. Change mysql_change_db() prototype;
        2. Polishing.
      sql/sp.cc:
        Polishing.
      sql/sp_head.cc:
        Polishing.
      sql/sql_db.cc:
        1. Polishing.
        2. Fix mysql_change_db().
      sql/sql_parse.cc:
        Polishing.
      sql/sql_show.cc:
        Polishing.
      73664252
  2. 24 Mar, 2007 9 commits
  3. 23 Mar, 2007 19 commits
    • unknown's avatar
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel · 8b4144b8
      unknown authored
      into  sin.intern.azundris.com:/home/tnurnberg/26817/50-26817
      
      
      sql/sql_view.cc:
        Auto merged
      8b4144b8
    • unknown's avatar
      Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 · 6197de24
      unknown authored
      into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
      
      
      mysys/thr_alarm.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      6197de24
    • unknown's avatar
      reverted linuxthreads thr_client_alarm fix (not future-proof) · 6d84317a
      unknown authored
      fixed differently: wake up select_thread with THR_SERVER_ALARM instead
      
      
      mysys/thr_alarm.c:
        reverted linuxthreads thr_client_alarm fix (not future-proof)
      6d84317a
    • unknown's avatar
      Bug #26817: mysqldump fails to backup database containing view with invalid definer · 35f8f3fc
      unknown authored
      give some leeway on required permissions for SHOW FIELDS on views so
      an unknonwn DEFINER will no longer break mysqldump
      
      
      client/client_priv.h:
        Bug #26817: mysqldump fails to backup database containing view with invalid definer
        
        New option for mysqldump: redirect stderr to file ("2> for Windows")
      client/mysqldump.c:
        Bug #26817: mysqldump fails to backup database containing view with invalid definer
        
        New option for mysqldump: redirect stderr to file ("2> for Windows")
      mysql-test/r/information_schema_db.result:
        Bug #26817: mysqldump fails to backup database containing view with invalid definer
        
        New option for mysqldump: redirect stderr to file ("2> for Windows")
      mysql-test/t/information_schema_db.test:
        Bug #26817: mysqldump fails to backup database containing view with invalid definer
        
        New option for mysqldump: redirect stderr to file ("2> for Windows")
      sql/sql_base.cc:
        Bug #26817: mysqldump fails to backup database containing view with invalid definer
        
        be a little more lenient for SHOW FIELDS FROM
      sql/sql_parse.cc:
        Bug #26817: mysqldump fails to backup database containing view with invalid definer
        
        be a little more lenient for SHOW FIELDS FROM on views on views
      sql/sql_view.cc:
        Bug #26817: mysqldump fails to backup database containing view with invalid definer
        
        give SHOW FIELDS the same perks as SHOW CREATE
      sql/table.cc:
        Bug #26817: mysqldump fails to backup database containing view with invalid definer
        
        give SHOW FIELDS the same perks as SHOW CREATE
      35f8f3fc
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel · 962f5509
      unknown authored
      into  andrepl.(none):/home/elkin/MySQL/MAIN/5.0-marvel-bug23333_sf_side_eff_binlog
      
      962f5509
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel · a17a087e
      unknown authored
      into  andrepl.(none):/home/elkin/MySQL/MAIN/mysql-5.0-marvel
      
      a17a087e
    • unknown's avatar
      Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build · 98b92dc2
      unknown authored
      into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      
      client/mysqlbinlog.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      mysql-test/r/view_grant.result:
        merged
      mysql-test/t/view_grant.test:
        merged
      98b92dc2
    • unknown's avatar
      Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() · 25dc1f57
      unknown authored
      thd->options' OPTION_STATUS_NO_TRANS_UPDATE bit was not restored at the end of SF() invocation, where
      SF() modified non-ta table.
      As the result of this artifact it was not possible to detect whether there were any side-effects when
      top-level query ends. 
      If the top level query table was not modified and the bit is lost there would be no binlogging.
      
      Fixed with preserving the bit inside of thd->no_trans_update struct. The struct agregates two bool flags
      telling whether the current query and the current transaction modified any non-ta table.
      The flags stmt, all are dropped at the end of the query and the transaction.
      
      
      mysql-test/r/sp_trans.result:
        results will be changed once again after bug#23333 will be fixed.
      mysql-test/t/sp_trans.test:
        regression test added
      sql/ha_ndbcluster.cc:
        replacing thd->options' OPTION_STATUS_NO_TRANS_UPDATE bit and bool thd->no_trans_update
        with thd->no_trans_update as struct
      sql/handler.cc:
        replacing operations with thd->options' OPTION_STATUS_NO_TRANS_UPDATE bit
        with the member thd->no_trans_update.all;
        converting thd->no_trans_update into struct of bools.
      sql/log.cc:
        replacing operations with thd->options' OPTION_STATUS_NO_TRANS_UPDATE bit
        with the member thd->no_trans_update.all;
        converting thd->no_trans_update into struct of bools.
      sql/set_var.cc:
        replacing operations with thd->options' OPTION_STATUS_NO_TRANS_UPDATE bit
        with the member thd->no_trans_update.all;
        converting thd->no_trans_update into struct of bools.
      sql/sp_head.cc:
        replacing operations with thd->options' OPTION_STATUS_NO_TRANS_UPDATE bit
        with the member thd->no_trans_update.all;
        converting thd->no_trans_update into struct of bools.
      sql/sql_class.h:
        replacing operations with thd->options' OPTION_STATUS_NO_TRANS_UPDATE bit
        with the member thd->no_trans_update.all;
        converting thd->no_trans_update into struct of bools.
      sql/sql_delete.cc:
        replacing operations with thd->options' OPTION_STATUS_NO_TRANS_UPDATE bit
        with the member thd->no_trans_update.all;
        converting thd->no_trans_update into struct of bools.
      sql/sql_insert.cc:
        replacing operations with thd->options' OPTION_STATUS_NO_TRANS_UPDATE bit
        with the member thd->no_trans_update.all;
        converting thd->no_trans_update into struct of bools.
      sql/sql_load.cc:
        replacing operations with thd->options' OPTION_STATUS_NO_TRANS_UPDATE bit
        with the member thd->no_trans_update.all;
        converting thd->no_trans_update into struct of bools.
      sql/sql_parse.cc:
        replacing operations with thd->options' OPTION_STATUS_NO_TRANS_UPDATE bit
        with the member thd->no_trans_update.all;
        converting thd->no_trans_update into struct of bools.
      sql/sql_table.cc:
        replacing operations with thd->options' OPTION_STATUS_NO_TRANS_UPDATE bit
        with the member thd->no_trans_update.all;
        converting thd->no_trans_update into struct of bools.
      sql/sql_update.cc:
        replacing operations with thd->options' OPTION_STATUS_NO_TRANS_UPDATE bit
        with the member thd->no_trans_update.all;
        converting thd->no_trans_update into struct of bools.
      25dc1f57
    • unknown's avatar
      Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 · 7bb27cdf
      unknown authored
      into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
      
      
      mysys/thr_alarm.c:
        Auto merged
      sql/mysqld.cc:
        SCCS merged
      7bb27cdf
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · c33e4a80
      unknown authored
      into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
      
      c33e4a80
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel · 9a62d9d8
      unknown authored
      into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      
      client/mysqlbinlog.cc:
        Auto merged
      9a62d9d8
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-build · a4e2b11a
      unknown authored
      into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      a4e2b11a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · b2ce47f2
      unknown authored
      into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      
      mysys/thr_alarm.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      b2ce47f2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 839dc8bf
      unknown authored
      into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/mysqld.cc:
        merged
      839dc8bf
    • unknown's avatar
      move thr_client_alarm initialization to mysqld.cc · d5326e78
      unknown authored
      (in thr_alarm.cc it happened too late).
      
      
      mysys/thr_alarm.c:
        move thr_client_alarm initialization to mysqld.cc
        (here it happened too late)
      sql/mysqld.cc:
        move thr_client_alarm initialization to mysqld.cc
        (in thr_alarm.cc it happened too late).
        moved thr_kill_signal initialization to init_signals()
      d5326e78
    • unknown's avatar
      Fix for BUG#9504: Stored procedures: execute privilege doesn't · b77b84f4
      unknown authored
      make 'use database' okay.
      
      The problem was that we didn't check stored-routine privileges
      in check_grant_db().
      
      The patch adds this check.
      
      
      mysql-test/r/grant.result:
        Update result file.
      mysql-test/r/sp-security.result:
        Update result fil.
      mysql-test/t/grant.test:
        Added test case for BUG#9504.
      mysql-test/t/sp-security.test:
        Update test.
      sql/sql_acl.cc:
        Check stored routines privileges.
      b77b84f4
    • unknown's avatar
      Merge trift2.:/MySQL/M50/clone-5.0 · 19cf8389
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      sql/sql_class.cc:
        Auto merged
      19cf8389
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · d820a81e
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      d820a81e
  4. 22 Mar, 2007 11 commits