1. 29 Aug, 2006 1 commit
    • unknown's avatar
      Merge moonbone.local:/work/tmp_merge-5.0-mysql · f5738219
      unknown authored
      into  moonbone.local:/work/tmp_merge-5.1-opt-mysql
      
      
      BUILD/check-cpu:
        Auto merged
      include/config-netware.h:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/group_by.result:
        Auto merged
      mysql-test/r/join_outer.result:
        Auto merged
      mysql-test/r/ndb_condition_pushdown.result:
        Auto merged
      mysql-test/r/range.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/r/user_var.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/range.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysql-test/t/type_datetime.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      storage/innobase/btr/btr0btr.c:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/dict/dict0dict.c:
        Auto merged
      storage/innobase/fil/fil0fil.c:
        Auto merged
      storage/innobase/fsp/fsp0fsp.c:
        Auto merged
      storage/innobase/include/buf0buf.ic:
        Auto merged
      storage/innobase/log/log0log.c:
        Auto merged
      storage/innobase/log/log0recv.c:
        Auto merged
      storage/innobase/os/os0file.c:
        Auto merged
      storage/innobase/row/row0sel.c:
        Auto merged
      storage/innobase/srv/srv0start.c:
        Auto merged
      storage/innobase/ut/ut0dbg.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      client/mysqltest.c:
        Manual merge
      mysql-test/r/innodb_mysql.result:
        Manual merge
      mysql-test/t/innodb_mysql.test:
        Manual merge
      mysql-test/t/join_outer.test:
        Manual merge
      sql/item_cmpfunc.cc:
        Manual merge
      sql/mysql_priv.h:
        Manual merge
      sql/opt_range.cc:
        Manual merge
      sql/sql_base.cc:
        Manual merge
      storage/innobase/include/btr0cur.ic:
        Manual merge
      storage/innobase/row/row0mysql.c:
        Manual merge
      f5738219
  2. 26 Aug, 2006 4 commits
  3. 25 Aug, 2006 3 commits
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 7e9ed378
      unknown authored
      into  mysql.com:/home/psergey/mysql-5.0-bug16255-merge
      
      
      7e9ed378
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 75865af6
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.0-opt
      
      
      75865af6
    • unknown's avatar
      Fixed bug #21390: wrong estimate of rows after elimination of · f121994d
      unknown authored
      const tables. This resulted in choosing extremely inefficient
      execution plans in same cases when distribution of data in
      joined were skewed (see the customer test case for the bug).
      
      
      
      mysql-test/r/select.result:
        Added a test case for bug #21390: wrong estimate of rows
        after elimination of const tables.
        Includded a test case that checks the code added by the patch
        that handles outer joins with no matches after substitution of
        a const table in an efficient way.
      mysql-test/t/select.test:
        Added a test case for bug #21390: wrong estimate of rows
        after elimination of const tables.
        Included a test case that checks the code added by the patch
        that handles outer joins with no matches after substitution of
        a const table in an efficient way.
      sql/sql_select.cc:
        Fixed bug #21390: wrong estimate of rows after elimination of
        const tables. This resulted in choosing extremely inefficient
        execution plans in same cases when distribution of data in
        joined were skewed (see the customer test case for the bug).
        Also added the code to handle outer joins with no matches after
        substitution of a const table in an efficient way. 
        Corrected calculation of the null rejecting key conditions.
      f121994d
  4. 24 Aug, 2006 7 commits
  5. 23 Aug, 2006 5 commits
    • unknown's avatar
      view.result, view.test: · d0394c70
      unknown authored
        Corrected test case for the bug#21261
      sql_parse.cc:
        Corrected fix for bug#21261
      
      
      mysql-test/t/view.test:
        Corrected test case for the bug#21261
      mysql-test/r/view.result:
        Corrected test case for the bug#21261
      sql/sql_parse.cc:
        Corrected fix for bug#21261
      d0394c70
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 9a770f53
      unknown authored
      into  example.com:/work/mysql-5.1-runtime
      
      
      9a770f53
    • unknown's avatar
      Fix for bug #20665 All commands supported in Stored Procedures · 7a37eeae
      unknown authored
      should work in Prepared Statements. Post-review changeset.
      
      Problem: There are some commands which are avaiable to be executed in SP
               but cannot be prepared. This patch fixes this and makes it possible
               prepare these statements.
      
      Changes: The commands later are made available in PS. RESET has been forbidden
               in SF/Trigger.
      
      Solution: All current server commands where checked and those missing (see later)
                we added. Tests for all of the commands with repeated executions were
                added - testing with SP, SF and PS.
      
      SHOW BINLOG EVENTS
      SHOW (MASTER | SLAVE) STATUS
      SHOW (MASTER | BINARY) LOGS
      SHOW (PROCEDURE | FUNCTION) CODE (parsable only in debug builds)
      SHOW CREATE (PROCEDURE | FUNCTION | EVENT | TABLE | VIEW)
      SHOW (AUTHORS | CONTRIBUTORS | WARNINGS | ERRORS)
      CHANGE MASTER
      RESET (MASTER | SLAVE | QUERY CACHE)
      SLAVE (START | STOP)
      CHECKSUM (TABLE | TABLES)
      INSTALL PLUGIN
      UNINSTALL PLUGIN
      CACHE INDEX
      LOAD INDEX INTO CACHE
      GRANT
      REVOKE
      KILL
      (CREATE | RENAME | DROP) DATABASE
      (CREATE | RENAME | DROP) USER
      FLUSH (TABLE | TABLES | TABLES WITH READ LOCK | HOSTS | PRIVILEGES |
             LOGS | STATUS | MASTER | SLAVE | DES_KEY_FILE | USER_RESOURCES)
      
      
      mysql-test/r/ps.result:
        update result
      mysql-test/r/ps_1general.result:
        update result
      mysql-test/r/ps_grant.result:
        update result
      mysql-test/r/sp-dynamic.result:
        update result
      mysql-test/t/ps.test:
        Add more statements, probably all currently missing which are possible in
        a SP but not preparable.
        Every statement is tested in a SP, in a SF and attempted to prepare.
      mysql-test/t/ps_1general.test:
        - Enable some of the statements, which are already possible in SP.
        - 1295 -> ER_UNSUPPORTED_PS
      mysql-test/t/ps_grant.test:
        Enable statements already possible in SP.
      sql/sp_head.cc:
        - Reorder to keep some alphabet order.
        - Add missing SHOW_SCHEDULER_STATUS.
      sql/sql_prepare.cc:
        Add possibility to prepare statements, which are already allowed in SP.
      7a37eeae
    • unknown's avatar
      Merge mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin · d08dd523
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
      
      
      storage/csv/ha_tina.cc:
        merge later
      mysql-test/r/csv.result:
        manual merge
      mysql-test/t/csv.test:
        manual merge
      d08dd523
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 118677a2
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      sql/handler.cc:
        manual merge
      118677a2
  6. 22 Aug, 2006 16 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · e8bb0c92
      unknown authored
      into  moonbone.local:/work/21475-fix-5.0-opt-mysql
      
      
      e8bb0c92
    • unknown's avatar
      item_cmpfunc.cc, item.cc: · d8c9de79
      unknown authored
        Additional fix for bug #21475
      item_func.h, item_func.cc:
        Additional fix for bug#16861
      
      
      sql/item_func.h:
        Additional fix for bug#16861
      sql/item_func.cc:
        Additional fix for bug#16861
      sql/item_cmpfunc.cc:
        Additional fix for bug #21475
      sql/item.cc:
        Additional fix for bug #21475
      d8c9de79
    • unknown's avatar
      Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411 · f40b6c27
      unknown authored
      into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
      
      
      f40b6c27
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · e0a6e183
      unknown authored
      into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
      
      
      e0a6e183
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint · 7d70273e
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
      
      
      7d70273e
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · bbda4dd3
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.0-opt
      
      
      bbda4dd3
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 3a23139a
      unknown authored
      into  sunlight.local:/local_work/16861-bug-5.0-mysql
      
      
      sql/sql_select.cc:
        Auto merged
      3a23139a
    • unknown's avatar
      Fixed bug#16861: User defined variable can have a wrong value if a tmp table was · c623e54f
      unknown authored
      used.
      
      Sorting by RAND() uses a temporary table in order to get a correct results.
      User defined variable was set during filling the temporary table and later
      on it is substituted for its value from the temporary table. Due to this
      it contains the last value stored in the temporary table.
      
      Now if the result_field is set for the Item_func_set_user_var object it 
      updates variable from the result_field value when being sent to a client.
      
      The Item_func_set_user_var::check() now accepts a use_result_field
      parameter. Depending on its value the result_field or the args[0] is used
      to get current value.
      
      
      mysql-test/r/user_var.result:
        Added a test case for bug#16861: User defined variable can have a wrong value if a tmp table was used.
      mysql-test/t/user_var.test:
        Added a test case for bug#16861: User defined variable can have a wrong value if a tmp table was used.
      sql/item_func.cc:
        Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
        Now if the result_field is set for the Item_func_set_user_var object it 
        updates variable from the result_field value when being sent to a client.
        
        The Item_func_set_user_var::check() now accepts a use_result_field
        parameter. Depending on its value the result_field or the args[0] is used
        to get current value.
      sql/item_func.h:
        Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
        Added a new SUSERVAR_FUNC function type.
        Updated the Item_func_set_user_var::check() function declaration.
        Added the Item_func_set_user_var::send() member function.
      sql/set_var.cc:
        Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
        Modified to use updated Item_func_set_user_var::check() function.
      sql/sql_class.cc:
        Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
        Modified to use updated Item_func_set_user_var::check() function.
      sql/sql_select.cc:
        Fixed bug#16861: User defined variable can have a wrong value if a tmp table was used.
        Now an Item_func_set_user_var object isn't substituted for an Item_field object after filling a temporary table.
      c623e54f
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8776a1e1
      unknown authored
      into  moonbone.local:/work/21475-bug-5.0-opt-mysql
      
      
      8776a1e1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · cdd9147e
      unknown authored
      into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411
      
      
      sql/sql_acl.cc:
        Auto merged
      cdd9147e
    • unknown's avatar
      Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both · 97e0f59b
      unknown authored
      when X.509 subject was required for a connect, we tested whether it was the right
      one, but did not refuse the connexion if not. fixed.
      
      (corrected CS now --replace_results socket-path)
      
      
      mysql-test/r/openssl_1.result:
        Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
        
        test not only whether we can connect with a correct X.509 subject when one is
        required, but also assure that we can't without one.
      mysql-test/t/openssl_1.test:
        Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
        
        test not only whether we can connect with a correct X.509 subject when one is
        required, but also assure that we can't without one.
      sql/sql_acl.cc:
        Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
        
        actually refuse connexion if X.509 is required, but does not match. kudos to Al Smith.
      97e0f59b
    • unknown's avatar
      Update result file for "grant" to 5.1 version · a649c631
      unknown authored
      
      mysql-test/r/grant.result:
        Update result file format to 5.1 version
      a649c631
    • unknown's avatar
      Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-4.1-maint-20987 · 4f630bf3
      unknown authored
      into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
      
      
      sql/item_timefunc.cc:
        Auto merged
      mysql-test/r/func_time.result:
        manual merge
      mysql-test/t/func_time.test:
        manual merge
      4f630bf3
    • unknown's avatar
      Fixed bug 16201: a memory corruption causing crashes due to a too small · 38558705
      unknown authored
      buffer for a MY_BITMAP temporary buffer allocated on stack in the
      function get_best_covering_ror_intersect().
      Now the buffer of a proper size is allocated by a request from this
      function in mem_root.
      
      We succeeded to demonstrate the bug only on Windows with a very large
      database. That's why no test case is provided for in the patch.
      
      
      sql/opt_range.cc:
        Fixed bug 16201: a memory corruption causing crashes due to a too small 
        buffer for a MY_BITMAP temporary buffer allocated on stack in the
        function get_best_covering_ror_intersect().
        Now the buffer of a proper size is allocated by a request from this
        function in mem_root.
      38558705
    • unknown's avatar
      adb31669
    • unknown's avatar
      Bug#21757: mysql_client_test fails in testcase when reading master.log file · ad0f34e3
      unknown authored
      
      tests/mysql_client_test.c:
        Replace fopen with my_fopen and specify O_BINARY. Replace fclose with my_fclose.
      ad0f34e3
  7. 21 Aug, 2006 4 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 1b6858ea
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      1b6858ea
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · bfaef559
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      bfaef559
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 · 167aaaa5
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/mysql_client_test.test:
        Auto merged
      server-tools/instance-manager/listener.cc:
        Auto merged
      server-tools/instance-manager/portability.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      client/mysql.cc:
        Manual merge.
      mysql-test/mysql-test-run.pl:
        Manual merge.
      167aaaa5
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · a6113078
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      mysql-test/r/func_time.result:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      mysql-test/t/func_time.test:
        Manual merge.
      a6113078