1. 03 Aug, 2007 1 commit
    • unknown's avatar
      WL#3228 (NDB) : RBR using different table defs on slave/master · 6df75c85
      unknown authored
        
      This patch removes a portion of the last patch to Field_blob::copy
      after problems found during testing of tests using distinct operations.
      
      
      sql/field.h:
        WL#3228 (NDB) : RBR using different table defs on slave/master
          
        This patch removes a portion of the last patch to Field_blob::copy
        after problems found during testing of tests using distinct operations.
        
        The code uses the old version of teh get_length() method.
      6df75c85
  2. 02 Aug, 2007 23 commits
    • unknown's avatar
      WL#3228 (NDB) : RBR using different table defs on slave/master · 33943431
      unknown authored
      This patch corrects a problem found during testing on Solaris. The code
      changes how length values are retrieved on big endian machines. The
      patch allows the rpl_extraColmaster tests to run on these machines.
      
      
      mysql-test/suite/rpl/r/rpl_row_create_table.result:
        WL#3228 (NDB) : RBR using different table defs on slave/master
        
        New result file with changes from merge of 5.1 main.
      mysql-test/suite/rpl/t/disabled.def:
        WL#3228 (NDB) : RBR using different table defs on slave/master
        
        Disable the rpl_rwo_extraColmaster_ndb test (WL#3915) because the code
        fails on Big Endian machines. See BUG#29549 for more details.
      sql/field.cc:
        WL#3228 (NDB) : RBR using different table defs on slave/master
        
        This patch corrects a problem found during testing on Solaris. The code
        changes how the store_length method processes requests for values on
        big endian machines.
      sql/field.h:
        WL#3228 (NDB) : RBR using different table defs on slave/master
        
        This patch corrects a problem found during testing on Solaris. The code
        changes how the store_length method processes requests for values on
        big endian machines. It also changes the get_packed_length() method to
        use the endian-ness of the host in getting the length + packlength.
      sql/rpl_record.cc:
        WL#3228 (NDB) : RBR using different table defs on slave/master
        
        This patch turns on the little endian switch (db_low_byte_first) in 
        order to ensure the values are unpack correctly from binlog as they
        are stored in little endian format in binlog.
      sql/rpl_utility.cc:
        WL#3228 (NDB) : RBR using different table defs on slave/master
        
        This patch corrects a problem found during testing on Solaris. The code
        changes how the calculated field size method processes requests for 
        values on big endian machines.
      33943431
    • unknown's avatar
      Merge mysql_cab_desk.:C:/source/c++/mysql-5.1 · 9eea112d
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge
      
      
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      mysql-test/suite/rpl/r/rpl_row_create_table.result:
        Merge with 5.1 main.
      9eea112d
    • unknown's avatar
      Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1 · ec73a9b0
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.1
      
      
      BitKeeper/deleted/.del-.del-README.txt:
        Delete: BitKeeper/deleted/.del-README.txt
      ec73a9b0
    • unknown's avatar
      After-merge fix: result adjusted. · 6f88aa45
      unknown authored
      6f88aa45
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b30088/b30088.5.0 · 2a20aa7f
      unknown authored
      into  mysql.com:/home/ram/work/b30088/b30088.5.1
      
      
      sql/mysqld.cc:
        Auto merged
      mysql-test/t/show_check.test:
        SCCS merged
      2a20aa7f
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b30200/b30200.5.0 · 8b9e7c14
      unknown authored
      into  mysql.com:/home/ram/work/b30200/b30200.5.1
      
      
      sql/item_func.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/item_create.cc:
        manual merge.
      8b9e7c14
    • unknown's avatar
      Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol · 898333f8
      unknown authored
      Problem: thd->thread_specific_used flag is not set executing a statement
      containig connection_id() function using PS protocol, that leads to 
      improper binlog event creation.
      
      Fix: set the flag in the Item_func_connection_id::fix_fields().
      
      
      sql/item_create.cc:
        Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
          - set the thd->thread_specific_used flag in the Item_func_connection_id::fix_fields()
            to have it properly set using PS protocol as well.
      sql/item_func.cc:
        Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
          - set the thd->thread_specific_used flag in the Item_func_connection_id::fix_fields()
            to have it properly set using PS protocol as well.
      sql/sql_parse.cc:
        Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
          - reset the thd->thread_specific_used flag in the mysql_reset_thd_for_next_command().
      898333f8
    • unknown's avatar
      Post-merge fix. Update some test results, and add an InnoDB-only · c7419deb
      unknown authored
      compatibility hook, thd_mark_transaction_to_rollback().
      
      
      mysql-test/r/ps.result:
        Post-merge fix.   Changes for WL 3984 (Revise locking
        of mysql.general_log and mysql.slow_log) cause some test
        result differences.
      mysql-test/r/show_check.result:
        Post-merge fix.   Changes for WL 3984 (Revise locking
        of mysql.general_log and mysql.slow_log) cause some test
        result differences.
      sql/sql_class.cc:
        Post-merge fix, add InnoDB compatibility hook (defined for
        InnoDB only), thd_mark_transaction_to_rollback().
      storage/innobase/handler/ha_innodb.cc:
        Post-merge fix, add InnoDB compatibility hook (defined for
        InnoDB only), thd_mark_transaction_to_rollback().
      storage/innobase/handler/ha_innodb.h:
        Post-merge fix, add InnoDB compatibility hook (defined for
        InnoDB only), thd_mark_transaction_to_rollback().
      c7419deb
    • unknown's avatar
      Merge 50 -> 51 (-opt changesets) · 48eb7f8c
      unknown authored
      
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_rcontext.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/include/read_many_rows.inc:
        Manual merge
      mysql-test/r/read_many_rows_innodb.result:
        Manual merge
      sql/sql_class.cc:
        Manual merge
      sql/sql_class.h:
        Manual merge
      storage/innobase/handler/ha_innodb.cc:
        Manual merge
      48eb7f8c
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · d0738596
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      d0738596
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 15835a56
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      15835a56
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 90d62296
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      sql/handler.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      90d62296
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · cbbc8bb3
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
      
      
      cbbc8bb3
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 7756406f
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      configure.in:
        Auto merged
      7756406f
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · 7b1f5425
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      7b1f5425
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · c2fa38b9
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      BitKeeper/deleted/.del-CMakeLists.txt~1:
        Auto merged
      CMakeLists.txt:
        Auto merged
      configure.in:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      c2fa38b9
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 159da8b8
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      configure.in:
        Auto merged
      159da8b8
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-build · e399ae5a
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
      
      
      e399ae5a
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 5161bc9e
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/federated/ha_federated.h:
        Auto merged
      mysql-test/include/mix1.inc:
        SCCS merged
      mysql-test/r/innodb_mysql.result:
        use local
      5161bc9e
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · 9436e186
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      9436e186
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · 4ea92b81
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      mysql-test/include/mix1.inc:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      4ea92b81
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · 41ac5d83
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      sql/ha_federated.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Manual merge
      mysql-test/t/innodb_mysql.test:
        Manual merge
      41ac5d83
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/41 · e65f8f84
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
      
      
      e65f8f84
  3. 01 Aug, 2007 16 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/51 · 2098f43a
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51
      
      
      2098f43a
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 6622bcdb
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      configure.in:
        Auto merged
      6622bcdb
    • unknown's avatar
      Remove some redundant or unused code from InnoDB (feedback from · 971050de
      unknown authored
      Marko after applying latest snapshot).
      
      
      storage/innobase/handler/ha_innodb.cc:
        Remove redundant assignment to thd_to_trx(thd); trx is
        declared as a reference to thd_to_trx(thd) at the top
        of the function, so this assignment isn't useful.
      storage/innobase/include/trx0trx.h:
        Remove two unused members from struct trx_struct.  allow_duplicates
        and replace_duplicates are not used; a single duplicates member is
        used instead to represent both flags.
      971050de
    • unknown's avatar
      Fix a valgrind warning. For some reason it never popped up before. · ccada6ff
      unknown authored
      
      sql/sql_class.cc:
        Fix a valgrind warning (row_count_func is used before it was initialized
        in SQLCOM_CALL)
      ccada6ff
    • unknown's avatar
      Merge trift2.:/MySQL/M51/funcs2-5.1 · a328234f
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      a328234f
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1b04b4b1
      unknown authored
      into  mysql.com:/home/ram/work/b29928.new/b29928.new.5.0
      
      
      1b04b4b1
    • unknown's avatar
      After-merge fixup. · be4cfe50
      unknown authored
        - THD::tmp_table_used removed, THD::thread_specific_used used instead.
      
      
      be4cfe50
    • unknown's avatar
      Fix a bad BitKeeper dependency structure for the "funcs_2" suite: · fce3a8a3
      unknown authored
      The files below "mysql-test/suite/funcs_2" in version 5.1
      did not depend on the equivalent ones in 5.0,
      probably because they had been checked in independent of each other
      in both versions.
      
      Foreach file F in the suite that has a "deleted" counterpart D, use
          bk rm $F
          bk mv $D $F
          bk edit $F
      to get those files into the 5.1 suite that (for BK) depend on 5.0.
      
      There is only one file whose contents differs between 5.0 and 5.1,
      restore its current 5.1 contents:
         mysql-test/suite/funcs_2/r/ndb_charset.result
      
      
      BitKeeper/deleted/.del-charset_master.test~3ac6827798431a7:
        Delete: mysql-test/suite/funcs_2/charset/charset_master.test
      mysql-test/suite/funcs_2/charset/charset_master.test:
        Rename: BitKeeper/deleted/.del-charset_master.test -> mysql-test/suite/funcs_2/charset/charset_master.test
      BitKeeper/deleted/.del-charset_utf8.txt~c8409ddc3d216d4:
        Delete: mysql-test/suite/funcs_2/data/charset_utf8.txt
      BitKeeper/deleted/.del-check_charset.inc~1328722ebe51ab2b:
        Delete: mysql-test/suite/funcs_2/include/check_charset.inc
      mysql-test/suite/funcs_2/data/charset_utf8.txt:
        Rename: BitKeeper/deleted/.del-charset_utf8.txt -> mysql-test/suite/funcs_2/data/charset_utf8.txt
      mysql-test/suite/funcs_2/include/check_charset.inc:
        Rename: BitKeeper/deleted/.del-check_charset.inc -> mysql-test/suite/funcs_2/include/check_charset.inc
      BitKeeper/deleted/.del-check_charset_ucs2.inc~fbcdbb34f38ce9f1:
        Delete: mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
      BitKeeper/deleted/.del-check_charset_utf8.inc~703a0b77d86f514e:
        Delete: mysql-test/suite/funcs_2/include/check_charset_utf8.inc
      BitKeeper/deleted/.del-gen_charset_utf8.pl~ff00332572f0f0b6:
        Delete: mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
      mysql-test/suite/funcs_2/include/check_charset_ucs2.inc:
        Rename: BitKeeper/deleted/.del-check_charset_ucs2.inc -> mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
      mysql-test/suite/funcs_2/include/check_charset_utf8.inc:
        Rename: BitKeeper/deleted/.del-check_charset_utf8.inc -> mysql-test/suite/funcs_2/include/check_charset_utf8.inc
      BitKeeper/deleted/.del-innodb_charset.result~5a9b45c455263e16:
        Delete: mysql-test/suite/funcs_2/r/innodb_charset.result
      BitKeeper/deleted/.del-memory_charset.result~3e27ebf0471b3472:
        Delete: mysql-test/suite/funcs_2/r/memory_charset.result
      mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl:
        Rename: BitKeeper/deleted/.del-gen_charset_utf8.pl -> mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
      mysql-test/suite/funcs_2/r/innodb_charset.result:
        Rename: BitKeeper/deleted/.del-innodb_charset.result -> mysql-test/suite/funcs_2/r/innodb_charset.result
      BitKeeper/deleted/.del-myisam_charset.result~e86d46123a579771:
        Delete: mysql-test/suite/funcs_2/r/myisam_charset.result
      BitKeeper/deleted/.del-ndb_charset.result~37be292ee7801689:
        Delete: mysql-test/suite/funcs_2/r/ndb_charset.result
      mysql-test/suite/funcs_2/r/memory_charset.result:
        Rename: BitKeeper/deleted/.del-memory_charset.result -> mysql-test/suite/funcs_2/r/memory_charset.result
      mysql-test/suite/funcs_2/r/myisam_charset.result:
        Rename: BitKeeper/deleted/.del-myisam_charset.result -> mysql-test/suite/funcs_2/r/myisam_charset.result
      BitKeeper/deleted/.del-innodb_charset.test~4555b7e4a5caa39:
        Delete: mysql-test/suite/funcs_2/t/innodb_charset.test
      BitKeeper/deleted/.del-memory_charset.test~4f055ebb453f58fd:
        Delete: mysql-test/suite/funcs_2/t/memory_charset.test
      BitKeeper/deleted/.del-myisam_charset.test~f859c5b56700de58:
        Delete: mysql-test/suite/funcs_2/t/myisam_charset.test
      mysql-test/suite/funcs_2/t/innodb_charset.test:
        Rename: BitKeeper/deleted/.del-innodb_charset.test -> mysql-test/suite/funcs_2/t/innodb_charset.test
      mysql-test/suite/funcs_2/t/memory_charset.test:
        Rename: BitKeeper/deleted/.del-memory_charset.test -> mysql-test/suite/funcs_2/t/memory_charset.test
      mysql-test/suite/funcs_2/t/myisam_charset.test:
        Rename: BitKeeper/deleted/.del-myisam_charset.test -> mysql-test/suite/funcs_2/t/myisam_charset.test
      BitKeeper/deleted/.del-ndb_charset.test~354cbaeb1bc2f75d:
        Delete: mysql-test/suite/funcs_2/t/ndb_charset.test
      BitKeeper/deleted/.del-readme.txt~e8399f1a3f34d433:
        Delete: mysql-test/suite/funcs_2/readme.txt
      mysql-test/suite/funcs_2/readme.txt:
        Rename: BitKeeper/deleted/.del-readme.txt~2 -> mysql-test/suite/funcs_2/readme.txt
      mysql-test/suite/funcs_2/t/ndb_charset.test:
        Rename: BitKeeper/deleted/.del-ndb_charset.test -> mysql-test/suite/funcs_2/t/ndb_charset.test
      mysql-test/suite/funcs_2/r/ndb_charset.result:
        Fix a bad BitKeeper dependency structure for the "funcs_2" suite:
        
        Restore the 5.1 contents into the 5.0-dependent file.
      fce3a8a3
    • unknown's avatar
      Fix an unstable test. · d2b9c8c2
      unknown authored
      
      mysql-test/r/log_tables.result:
        Update results.
      mysql-test/t/log_tables.test:
        Silence a race condition: TRUNCATE code issues mysql_frm_type without
        a metadata lock, and finds no table if hits the moment when
        ALTER is swapping two tables.
      d2b9c8c2
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b29928.new/b29928.new.5.0 · d4ba395a
      unknown authored
      into  mysql.com:/home/ram/work/b29928.new/b29928.new.5.1
      
      
      mysql-test/r/mysqlbinlog.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        manual merge
      d4ba395a
    • unknown's avatar
      Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect · f87acb59
      unknown authored
      restores from mysqlbinlog out
      
      Problem: using "mysqlbinlog | mysql" for recoveries the connection_id() 
      result may differ from what was used when issuing the statement.
      
      Fix: if there is a connection_id() in a statement, write to binlog
      SET pseudo_thread_id= XXX; before it and use the value later on.
      
      
      mysql-test/r/mysqlbinlog.result:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - test result.
      mysql-test/t/mysqlbinlog.test:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - test case.
      sql/item_create.cc:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - set thread_specific_used flag for the connection_id() function.
      sql/item_func.cc:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - always return thd->variables.pseudo_thread_id as a connection_id() 
        result, as it contains a proper value for both master and slave.
      sql/log_event.cc:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - set LOG_EVENT_THREAD_SPECIFIC_F event flag if thread_specific_used
        is set.
      sql/sql_class.cc:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - thd->thread_specific_used introduced, which is set if thread specific 
        value(s) used in a statement.
      sql/sql_class.h:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - thd->thread_specific_used introduced, which is set if thread specific 
        value(s) used in a statement.
      f87acb59
    • unknown's avatar
      Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · ce045a82
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
      
      
      ce045a82
    • unknown's avatar
      Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint · 06cffaab
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.1-maint
      
      
      06cffaab
    • unknown's avatar
      Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint · 12235197
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
      
      
      12235197
    • unknown's avatar
      Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · bb88e1ee
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint
      
      
      bb88e1ee
    • unknown's avatar
      Option 6 tries to grant global privileges at the database level · c517fea5
      unknown authored
      which does not work.  Removing these attempted privileges makes
      this identical to option 5 so remove it completely.  The spirit
      of the program appears to be aimed at database privileges, so do
      not add another option for granting global privileges as it may
      be unexpected.  Fixes bug#14618 (same as previous patch, this
      time applied to -maint tree).
      
      
      scripts/mysql_setpermission.sh:
        Option 6 tries to apply global privileges at the database
        level which does not work - remove it.
      c517fea5