An error occurred fetching the project authors.
  1. 02 Jun, 2007 1 commit
  2. 01 Jun, 2007 5 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · a5128d70
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.1-opt
      
      
      sql/mysqld.cc:
        Auto merged
      a5128d70
    • unknown's avatar
      Bug#28427: Columns were renamed instead of moving by ALTER TABLE. · cfd1e67a
      unknown authored
      To avoid unnecessary work the mysql_alter_table function takes the
      list of table fields and applies all changes to it (drops/moves/renames/etc).
      Then this function compares the new list and the old one. If the changes
      require only .frm to be modified then the actual data isn't copied. To detect
      changes all columns attributes but names are compared. When a column has been
      moved and has replaced another column with the same attributes except name
      the mysql_alter_table function wrongly decides that two fields has been just
      renamed. As a result the data from the moved column and from all columns
      after it is not copied.
      
      Now the mysql_alter_table function forces table data copying by setting
      the need_copy_table flag when it finds a moved column. The flag is set at
      the stage when the modified fields are created.
      
      
      
      sql/sql_table.cc:
        Bug#28427: Columns were renamed instead of moving by ALTER TABLE.
        Now the mysql_alter_table function forces table data copying by setting
        the need_copy_table flag when it finds a moved column. The flag is set at
        the stage when the modified fields are created.
      mysql-test/r/alter_table.result:
        Added a test case for the bug#28427: Columns were renamed instead of moving by ALTER TABLE.
      mysql-test/t/alter_table.test:
        Added a test case for the bug#28427: Columns were renamed instead of moving by ALTER TABLE.
      cfd1e67a
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 865f294f
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28366-5.0-opt-win
      
      
      865f294f
    • unknown's avatar
      Post-merge fix. · 77ea801d
      unknown authored
      77ea801d
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 81ffede7
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/my_decimal.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      strings/decimal.c:
        Auto merged
      sql/sql_update.cc:
        Manual merge
      81ffede7
  3. 31 May, 2007 22 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · 5d5c66fb
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
      
      
      mysql-test/r/user_var.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/user_var.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      mysql-test/t/view.test:
        Merge with 5.0-opt.
      5d5c66fb
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9fa12a38
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
      
      
      9fa12a38
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-27827-fresh · e8bf6c5b
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
      
      
      mysql-test/r/view.result:
        Merge with bug #27827 fix.
      mysql-test/t/view.test:
        Merge with bug #27827 fix.
      e8bf6c5b
    • unknown's avatar
      sql_view.cc: · 8fe16346
      unknown authored
        Additional patch for bug #28244 to workaround valgrind warnings.
      
      
      sql/sql_view.cc:
        Additional patch for bug #28244 to workaround valgrind warnings.
      8fe16346
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · d1733069
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/28494-bug-5.0-opt-mysql
      
      
      d1733069
    • unknown's avatar
      Bug#28494: Grouping by Item_func_set_user_var produces incorrect result. · b4a35cd7
      unknown authored
      The end_update() function uses the Item::save_org_in_field() function to
      save original values of items into the group buffer. But for the 
      Item_func_set_user_var this method was mapped to the save_in_field method.
      The latter function wrongly decides to use the result_field. This leads to
      saving incorrect value in the grouping buffer and wrong result of the whole
      query.
      
      The can_use_result_field argument of the bool type is added to the
      Item_func_set_user_var::save_in_field() function. If it is set to FALSE
      then the item's result field won't be used. Otherwise it will be detected
      whether the result field will be used (old behaviour).
      Two wrapping functions for the function above are added to the 
      Item_func_set_user_var class:
      the save_in_field(Field *field, bool no_conversions) - it calls the above
      function with the can_use_result_field set to TRUE.
      the save_org_in_field(Field *field) - same, but the can_use_result_field
      is set to FALSE.
      
      
      mysql-test/t/user_var.test:
        Added a test case for the bug#28494: Grouping by Item_func_set_user_var
        produces incorrect result.
      mysql-test/r/user_var.result:
        Added a test case for the bug#28494: Grouping by Item_func_set_user_var
        produces incorrect result.
      sql/item_func.cc:
        Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
        The can_use_result_field argument of the bool type is added to the
        Item_func_set_user_var::save_in_field() function. If it is set to FALSE
        then the item's result field won't be used. Otherwise it will be detected
        whether the result field will be used (old behaviour).
      sql/item_func.h:
        Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
        The can_use_result_field argument of the bool type is added to the
        Item_func_set_user_var::save_in_field() function.
        Two wrapping functions for the function above are added to the 
        Item_func_set_user_var class:
        the save_in_field(Field *field, bool no_conversions) - it calls the above
        function with the can_use_result_field set to TRUE.
        the save_org_in_field(Field *field) - same, but the can_use_result_field
        is set to FALSE.
      b4a35cd7
    • unknown's avatar
      Fixed bug #27827. · e2c7a5b0
      unknown authored
      ON conditions from JOIN expression were ignored at CHECK OPTION
      check when updating a multi-table view with CHECK OPTION.
      
      The st_table_list::prep_check_option function has been
      modified to to take into account ON conditions at CHECK OPTION check
      It was also changed to build the check option condition only once
      for any update used in PS/SP.
      
      
      sql/table.h:
        Fixed bug #27827.
        The st_table_list::check_option_processed variable has been added
        to build the check option condition only once for any update used
        in PS/SP.
      sql/table.cc:
        Fixed bug #27827.
        The st_table_list::prep_check_option function has been
        modified to to take into account ON conditions at CHECK OPTION check
        It was also changed to build the check option condition only once
        for any update used in PS/SP.
      mysql-test/t/view.test:
        Updated test case for bug #27827.
      mysql-test/r/view.result:
        Updated test case for bug #27827.
      e2c7a5b0
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · 50b789c3
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
      
      
      mysql-test/r/rpl_view.result:
        Auto merged
      mysql-test/t/rpl_view.test:
        Auto merged
      sql/sql_view.cc:
        e
        e
      50b789c3
    • unknown's avatar
      sql_select.cc: · 90ed3d67
      unknown authored
        Patch to eliminate compilation error.
      
      
      sql/sql_select.cc:
        Patch to eliminate compilation error.
      90ed3d67
    • unknown's avatar
      Added casts to avoid compiler warnings and fixed a wrong type. · c6ff8a65
      unknown authored
      ```yaml
      Added casts and fixed wrong type.
      ```
      
      Added casts and fixed wrong type.
      ---
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      ---
      Don't give warning that readonly variable is forced to be readonly
      mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
      Fixed wrong reference to the mysql manual
      Fixed wrong prototype that caused some tests to fail on 64 bit platforms
      ---
      Disabled compiler warnings mainly for Win 64.
      ---
      Added casts to remove compiler warnings on windows
      Give warnings also for safe_mutex errors found by test system
      Added some warnings from different machines in pushbuild
      ---
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
      into  mysql.com:/home/my/mysql-5.1
      ---
      Added escapes for double quotes and parenthesis.
      ---
      Archive db fix plus added non-critical warnings
      in ignore list.
      ---
      Fixed previously added patch and added new ignored warning.
      
      
      client/mysqltest.c:
        Added casts to avoid compiler warnings.
        ---
        Added casts to avoid compiler warnings.
      mysql-test/lib/mtr_report.pl:
        Test run now fails if we have [Warning] and [ERROR] as tags in .err file
        Added list of all common 'not fatal' errors to ignore error list
        ---
        Give warnings also for safe_mutex errors
        Added some warnings from different machines in pushbuild
        ---
        Added escapes for double quotes and parenthesis.
        ---
        Added non-critical warnings to be ignored.
        ---
        Fixed a wrong regexp
        Added new non-critical warning
      mysql-test/mysql-test-run-shell.sh:
        Fixed some wrong startup options
      mysql-test/r/func_misc.result:
        Test case for archive db fix.
      mysql-test/t/disabled.def:
        Disable instance manager tests because they generate warnings (and probably don't read the option files correctly)
      mysql-test/t/func_misc.test:
        Test case for archive db fix.
      mysys/array.c:
        Added casts to avoid compiler warnings.
      mysys/hash.c:
        Added casts to avoid compiler warnings.
      mysys/my_compress.c:
        Added casts to remove compiler warnings on windows
      mysys/my_conio.c:
        To avoid a warning from compiler.
      mysys/my_pread.c:
        Archive db fix.
      mysys/my_quick.c:
        Added cast to avoid compiler warning.
        ---
        Added cast to avoid compiler warning.
      sql/ha_ndbcluster_binlog.cc:
        Ensure we log all binglog errors with the "NDB Binlog" tag
      sql/ha_partition.cc:
        result is type bool, so calculation should be forced to
        that also.
      sql/log.cc:
        Fixed compiler problem on Solaris.
      sql/slave.cc:
        Make errors uniform
      sql/sql_class.cc:
        Added cast to remove compiler warnings on windows
      sql/sql_map.cc:
        Added casts to avoid compiler warnings.
        ---
        Added casts to avoid compiler warnings.
      sql/sql_plugin.cc:
        Fixed wrong type.
        ---
        Don't give warning that readonly variable is forced to be readonly
      sql/stacktrace.c:
        Corrected manual reference
      storage/archive/azio.c:
        Archive db fix.
        ---
        Fixed previously added patch.
      storage/blackhole/ha_blackhole.cc:
        Fixed wrong prototype that caused test to fail on 64 bit platforms
      storage/example/ha_example.cc:
        Fixed wrong prototype that caused test to fail on 64 bit platforms
      strings/ctype-ucs2.c:
        Fixed wrong type.
        ---
        Fixed wrong type.
      support-files/compiler_warnings.supp:
        Added new disabled warnings for Win 64.
      c6ff8a65
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · b33ae435
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28244
      
      
      b33ae435
    • unknown's avatar
      sql_view.cc: · 9d37b35c
      unknown authored
        Patch to eliminate compilation warning.
      
      
      sql/sql_view.cc:
        Patch to eliminate warning.
      9d37b35c
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 88423fae
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
      
      
      88423fae
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · 91724298
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28244
      
      
      91724298
    • unknown's avatar
      Fixed bug #28244. · d22c3399
      unknown authored
      When the same VIEW was created at the master side twice,
      malformed (truncated after the word 'AS') query string 
      was forwarded to client side, so error messages on the
      master and client was different, and replication was
      broken.
      
      The mysql_register_view function call failed
      too early: fields of `view' output argument of this 
      function was not filled yet with correct data required
      for query replication.
      The mysql_register_view function also copied pointers to 
      local buffers into a memory allocated by the caller.
      
      
      sql/sql_view.cc:
        Fixed bug #28244.
        Checking of existence of VIEW .frm file has been
        moved down to the place, when `view' argument is
        completely filled with proper data.
        view->query.str and view->query.md5 pointers has been
        set to the NULL before return from the mysql_register_view
        function.
      mysql-test/t/rpl_view.test:
        Updated test case for bug #28244.
      mysql-test/r/rpl_view.result:
        Updated test case for bug #28244.
      d22c3399
    • unknown's avatar
      merging · 55f81e35
      unknown authored
      55f81e35
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 0f6df3f6
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      mysql-test/r/auto_increment.result:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/insert.result:
        Auto merged
      mysql-test/r/insert_select.result:
        Auto merged
      mysql-test/r/insert_update.result:
        Auto merged
      mysql-test/r/key.result:
        Auto merged
      mysql-test/r/kill.result:
        Auto merged
      mysql-test/r/null.result:
        Auto merged
      mysql-test/r/null_key.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/kill.test:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      mysql-test/r/type_enum.result:
        merging
      mysql-test/r/warnings.result:
        merging
      mysql-test/t/type_enum.test:
        merging
      sql/sql_select.cc:
        merging
      0f6df3f6
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 7312fd0c
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
      
      
      mysql-test/r/view.result:
        Merge with 5.0-opt.
      mysql-test/t/view.test:
        Merge with 5.0-opt.
      7312fd0c
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · 9f670c86
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
      
      
      sql/sql_class.h:
        Auto merged
      mysql-test/r/view.result:
        Merge with 5.0-opt.
      mysql-test/t/view.test:
        Merge with 5.0-opt.
      sql/sql_update.cc:
        Merge with 5.0-opt.
      9f670c86
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · cde3be86
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28598
      
      
      sql/sql_select.cc:
        Auto merged
      cde3be86
    • unknown's avatar
      Fixed bug #28598. · ebedff77
      unknown authored
      mysqld crashed when a long-running explain query was killed from
      another connection.
      
      When the current thread caught a kill signal executing the function
      best_extension_by_limited_search it just silently returned to  
      the calling function greedy_search without initializing elements of
      the join->best_positions array.
      However, the greedy_search function ignored thd->killed status
      after a calls to the best_extension_by_limited_search function, and
      after several calls the greedy_search function used an uninitialized
      data from the join->best_positions[idx] to search position in the
      join->best_ref array. 
      That search failed, and greedy_search tried to call swap_variables
      function with NULL argument - that caused a crash.
      
      
      sql/sql_select.cc:
        Fixed bug #28598.
        choose_plan(), greedy_search(), best_extension_by_limited_search()
        and find_best() functions have been changed to return TRUE in case
        of fatal error.
      mysql-test/t/kill.test:
        Updated test case for bug #28598.
      mysql-test/r/kill.result:
        Updated test case for bug #28598.
      ebedff77
    • unknown's avatar
      Post merge fix. · 73f436b5
      unknown authored
      73f436b5
  4. 30 May, 2007 12 commits
    • unknown's avatar
      Bug#28729: Field_enum wrongly reported an error while storing an empty string. · a7cf92bb
      unknown authored
      ENUM fields internally store their values as integers and may use integer
      values as indexes to their values. Invalid values are mapped to zero value.
      When storing an empty string the ENUM field fails to find an appropriate value
      and tries to convert the provided string to integer. The conversion also
      fails and error is returned even if the thd->count_cuted_fields is set to
      CHECK_FIELD_IGNORE. This makes the range optimizer wrongly decide that an
      impossible range is present.
      
      Now the Field_enum::store() returns error while storing an empty string only
      if the thd->count_cuted_fields isn't set to CHECK_FIELD_IGNORE.
      
      
      sql/field.cc:
        Bug#28729: Field_enum wrongly reported an error while storing an empty string.
        Now the Field_enum::store() returns error while storing an empty string only
        if the thd->count_cuted_fields isn't set to CHECK_FIELD_IGNORE.
      mysql-test/r/type_enum.result:
        Added a test case for the bug#28729: Field_enum wrongly reported an error
        while storing an empty string.
      mysql-test/t/type_enum.test:
        Added a test case for the bug#28729: Field_enum wrongly reported an error
        while storing an empty string.
      a7cf92bb
    • unknown's avatar
      sp.result, analyse.result: · 6ea2a569
      unknown authored
        Post merge fix.
      
      
      mysql-test/r/sp.result:
        Post merge fix.
      mysql-test/r/analyse.result:
        Post merge fix.
      6ea2a569
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt · 937d5f89
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
      
      
      mysql-test/r/olap.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/analyse.result:
        Manual merge
      mysql-test/r/sp.result:
        Manual merge
      sql/item_timefunc.cc:
        Manual merge
      937d5f89
    • unknown's avatar
      Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b79b4909
      unknown authored
      into  dl145s.mysql.com:/users/mhansson/mysql/autopush/my50-bug28250
      
      
      sql/item_func.cc:
        Auto merged
      b79b4909
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 7d944077
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      mysql-test/r/view.result:
        Auto merged
      7d944077
    • unknown's avatar
      backport of Bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL · 11b08410
      unknown authored
      mysql-test/r/auto_increment.result:
        result fix
      mysql-test/r/create.result:
        result fix
      mysql-test/r/insert.result:
        result fix
      mysql-test/r/insert_select.result:
        result fix
      mysql-test/r/insert_update.result:
        result fix
      mysql-test/r/key.result:
        result fix
      mysql-test/r/null.result:
        result fix
      mysql-test/r/null_key.result:
        result fix
      mysql-test/r/ps_2myisam.result:
        result fix
      mysql-test/r/ps_3innodb.result:
        result fix
      mysql-test/r/ps_4heap.result:
        result fix
      mysql-test/r/ps_5merge.result:
        result fix
      mysql-test/r/ps_6bdb.result:
        result fix
      mysql-test/r/ps_7ndb.result:
        result fix
      mysql-test/r/strict.result:
        result fix
      mysql-test/r/view.result:
        result fix
      mysql-test/r/warnings.result:
        result fix
      mysql-test/t/strict.test:
        test fix
      11b08410
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · 6e330800
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28716
      
      
      6e330800
    • unknown's avatar
      sql_update.cc: · 01f20504
      unknown authored
        Fixed bug #28716: additional patch to eliminate compilation
        error under Windows.
      
      
      sql/sql_update.cc:
        Fixed bug #28716: additional patch to eliminate compilation
        error under Windows.
      01f20504
    • unknown's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 6fa44b38
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
      
      
      mysql-test/r/view.result:
        Auto merged
      6fa44b38
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · a5c232a0
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28716
      
      
      sql/sql_class.h:
        Auto merged
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      a5c232a0
    • unknown's avatar
      Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · d9426a89
      unknown authored
      into  dl145s.mysql.com:/users/mhansson/mysql/autopush/my51-bug28250
      
      
      sql/item_func.cc:
        Auto merged
      d9426a89
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 98b5043a
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28492-5.0-opt
      
      
      mysql-test/r/sp.result:
        Auto merged
      98b5043a