1. 10 May, 2006 2 commits
  2. 09 May, 2006 8 commits
  3. 08 May, 2006 5 commits
    • unknown's avatar
      No commit message · 42f20d75
      unknown authored
      No commit message
      42f20d75
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · db122e94
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      configure.in:
        Auto merged
      db122e94
    • unknown's avatar
      Remove valgrind and compiler warnings · bc324937
      unknown authored
      Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.
      
      
      include/violite.h:
        Import patch warnings.patch
      libmysql/libmysql.c:
        Import patch warnings.patch
      sql/mysqld.cc:
        Import patch warnings.patch
      vio/test-ssl.c:
        Import patch warnings.patch
      vio/test-sslclient.c:
        Import patch warnings.patch
      vio/test-sslserver.c:
        Import patch warnings.patch
      vio/vio.c:
        Import patch warnings.patch
      vio/viosslfactories.c:
        Import patch warnings.patch
      bc324937
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/my50-maint-bug18474 · c593d1f1
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      c593d1f1
    • unknown's avatar
      Merge 192.168.0.20:mysql/my50-maint-yassl · fa91c7bc
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      extra/yassl/src/ssl.cpp:
        Auto merged
      extra/yassl/taocrypt/src/make.bat:
        Auto merged
      extra/yassl/testsuite/test.hpp:
        Auto merged
      fa91c7bc
  4. 07 May, 2006 11 commits
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 47302570
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.0
      
      
      mysql-test/r/rpl_user_variables.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/t/rpl_user_variables.test:
        Manual merge
      47302570
    • unknown's avatar
      Post-merge fixes. · 5aa69d34
      unknown authored
      5aa69d34
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 · 30a7094f
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      mysql-test/r/having.result:
        Auto merged
      mysql-test/t/having.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      mysql-test/r/rpl_user_variables.result:
        Manual merge
      mysql-test/t/rpl_user_variables.test:
        Manual merge
      sql/sql_lex.cc:
        Manual merge
      sql/sql_prepare.cc:
        Manual merge
      sql/sql_select.cc:
        Manual merge
      30a7094f
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · e4e67d58
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-4.1
      
      
      e4e67d58
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · c438e490
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0-bug19136
      
      
      sql/sql_select.cc:
        Auto merged
      c438e490
    • unknown's avatar
      Bug#19136: Crashing log-bin and uninitialized user variables in a derived table · a910a0bf
      unknown authored
      recalculating results
      
      
      mysql-test/r/rpl_user_variables.result:
        fixing results
      a910a0bf
    • unknown's avatar
    • unknown's avatar
      Refactoring: Factor out common code from find_best() and best_access_path(): make · 7139089a
      unknown authored
      find_best() call best_access_path().
      
      
      7139089a
    • unknown's avatar
      Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1 · 048469eb
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0-bug19136
      
      
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/rpl_user_variables.result:
        manual merge use local
      mysql-test/t/rpl_user_variables.test:
        manual merge use version 5.0's "show binlog events from 98"
      048469eb
    • unknown's avatar
      Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1 · ce6a2d32
      unknown authored
      into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/4.1-bug19136_unass_user_var
      
      
      sql/item_func.cc:
        Auto merged
      ce6a2d32
    • unknown's avatar
      Fixed bug #14927. · 375749b8
      unknown authored
      A query with a group by and having clauses could return a wrong
      result set if the having condition contained a constant conjunct 
      evaluated to FALSE.
      It happened because the pushdown condition for table with
      grouping columns lost its constant conjuncts.
      Pushdown conditions are always built by the function make_cond_for_table
      that ignores constant conjuncts. This is apparently not correct when
      constant false conjuncts are present.
      
      
      
      mysql-test/r/having.result:
        Added a test case for bug #14927.
      mysql-test/t/having.test:
        Added a test case for bug #14927.
      sql/sql_lex.cc:
        Fixed bug #14927.
        Initialized fields for having conditions in  st_select_lex::init_query().
      sql/sql_lex.h:
        Fixed bug #14927.
        Added a field to restore having condititions for execution in SP and PS.
      sql/sql_prepare.cc:
        Fixed bug #14927.
        Added code to restore havinf conditions for execution in SP and PS.
      sql/sql_select.cc:
        Fixed bug #14927.
        Performed evaluation of constant expressions in having clauses.
        If the having condition contains a constant conjunct that is always false
        an empty result set is returned after the optimization phase.
        In this case the corresponding EXPLAIN command now returns 
        "Impossible HAVING" in the last column.
      375749b8
  5. 06 May, 2006 14 commits