1. 03 Jun, 2007 6 commits
  2. 02 Jun, 2007 4 commits
  3. 01 Jun, 2007 6 commits
  4. 31 May, 2007 24 commits
    • gshchepa/uchum@gleb.loc's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · 3cb5a020
      gshchepa/uchum@gleb.loc authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
      3cb5a020
    • gshchepa/uchum@gleb.loc's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 5d15377d
      gshchepa/uchum@gleb.loc authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
      5d15377d
    • gshchepa/uchum@gleb.loc's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-27827-fresh · 92737068
      gshchepa/uchum@gleb.loc authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
      92737068
    • gshchepa/uchum@gleb.loc's avatar
      sql_view.cc: · d6a0bbf2
      gshchepa/uchum@gleb.loc authored
        Additional patch for bug #28244 to workaround valgrind warnings.
      d6a0bbf2
    • evgen@moonbone.local's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · df3b7082
      evgen@moonbone.local authored
      into  moonbone.local:/mnt/gentoo64/work/28494-bug-5.0-opt-mysql
      df3b7082
    • evgen@moonbone.local's avatar
      Bug#28494: Grouping by Item_func_set_user_var produces incorrect result. · f70ae3a6
      evgen@moonbone.local 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.
      f70ae3a6
    • gshchepa/uchum@gleb.loc's avatar
      Fixed bug #27827. · cab4ca9c
      gshchepa/uchum@gleb.loc 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.
      cab4ca9c
    • gshchepa/uchum@gleb.loc's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · 0951a099
      gshchepa/uchum@gleb.loc authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
      0951a099
    • gshchepa/uchum@gleb.loc's avatar
      sql_select.cc: · 78a5f9e6
      gshchepa/uchum@gleb.loc authored
        Patch to eliminate compilation error.
      78a5f9e6
    • jani@a88-113-38-195.elisa-laajakaista.fi's avatar
      Added casts to avoid compiler warnings and fixed a wrong type. · 2c8f4f97
      ```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.
      2c8f4f97
    • gshchepa/uchum@gleb.loc's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · 55833d3a
      gshchepa/uchum@gleb.loc authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28244
      55833d3a
    • gshchepa/uchum@gleb.loc's avatar
      sql_view.cc: · f690d759
      gshchepa/uchum@gleb.loc authored
        Patch to eliminate compilation warning.
      f690d759
    • gshchepa/uchum@gleb.loc's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 36244941
      gshchepa/uchum@gleb.loc authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
      36244941
    • gshchepa/uchum@gleb.loc's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · 19d513de
      gshchepa/uchum@gleb.loc authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28244
      19d513de
    • gshchepa/uchum@gleb.loc's avatar
      Fixed bug #28244. · 12d43d55
      gshchepa/uchum@gleb.loc 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.
      12d43d55
    • mhansson@dl145s.mysql.com's avatar
      Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug27741/my50-bug27741 · 93cd86fc
      mhansson@dl145s.mysql.com authored
      into  dl145s.mysql.com:/users/mhansson/mysql/push/bug27741/my51-bug27741
      93cd86fc
    • mhansson@dl145s.mysql.com's avatar
      bug#27741: udf test fails on AIX < 5.3 · 3ee16518
      mhansson@dl145s.mysql.com authored
      problem #1: udf_example.so does not get built on AIX
      
      solution#1: build it yourself using
      cd sql; gcc  -g -I ../include/ -I /usr/include/ -lpthread  \
      -shared -o udf_example.so udf_example.c; mv udf_example.so \
      .libs/ 
      
      problem#2 (the bug): udf_example fails because it does not
      recognize the variable LD_LIBRARY_PATH when doing dl_open(),
      it looks at LIBPATH
      
      solution#2: add the library path to LIBPATH
      
      problem#3: udf_example returns the wrong result length since 
      it relies on strmov to return a pointer to the end of the 
      string that it copies. On AIX builds, where m_string.h is not
      included (m_string defines a macro expanding strmov to stpcpy),
      there is a macro expanding strmov to strcpy, which returns a 
      pointer to the first character.
      
      solution#3: define strmov as stpcpy.
      
      problem#4: #2 applies on hp-ux as well, but this platform
      looks at SHLIB_PATH
      
      solution#4: added the library path to SHLIB_PATH
      3ee16518
    • holyfoot/hf@mysql.com/hfmain.(none)'s avatar
      merging · 04bdecfe
      holyfoot/hf@mysql.com/hfmain.(none) authored
      04bdecfe
    • holyfoot/hf@hfmain.(none)'s avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · cdda302f
      holyfoot/hf@hfmain.(none) authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      cdda302f
    • gshchepa/uchum@gleb.loc's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 7b4ed800
      gshchepa/uchum@gleb.loc authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
      7b4ed800
    • gshchepa/uchum@gleb.loc's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · 89a4d89c
      gshchepa/uchum@gleb.loc authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
      89a4d89c
    • gshchepa/uchum@gleb.loc's avatar
      Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · be69f13d
      gshchepa/uchum@gleb.loc authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28598
      be69f13d
    • gshchepa/uchum@gleb.loc's avatar
      Fixed bug #28598. · e16953df
      gshchepa/uchum@gleb.loc 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.
      e16953df
    • igor@olga.mysql.com's avatar
      Post merge fix. · 4fb062de
      igor@olga.mysql.com authored
      4fb062de