1. 12 Feb, 2007 2 commits
  2. 08 Feb, 2007 1 commit
  3. 07 Feb, 2007 1 commit
  4. 05 Feb, 2007 1 commit
    • unknown's avatar
      Test and bug fixes and removed unneccessary files. · 9946ed16
      unknown authored
      
      mysys/my_getopt.c:
        Fixes problem with getting output lines from
        my_getopt in random places in tests.
      sql/sql_prepare.cc:
        Fixes problem with failing mysql_client_test
        on some machines. This is actually a problem
        with prepared statements.
      9946ed16
  5. 02 Feb, 2007 5 commits
  6. 01 Feb, 2007 5 commits
    • unknown's avatar
      Merge dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb-bj · bdd52e89
      unknown authored
      into  dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb
      
      
      bdd52e89
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5698114c
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-axmrg
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      5698114c
    • unknown's avatar
      Valgrind error fixes · 2df29225
      unknown authored
      Notes:
      This patch doesn't fix all issues in the tree and we need jani's fix for that
      This patch shoud not be merged into 5.0
      
      
      mysql-test/r/ps.result:
        result fix
      mysql-test/r/symlink.result:
        result fix
      mysql-test/t/ps.test:
        test is moved to 'symlink' test
      mysql-test/t/symlink.test:
        test from 'ps' test
      sql/field_conv.cc:
        valgrind error fix: backport from 5.0
      sql/mysqld.cc:
        release of ssl_context
      vio/viosslfactories.c:
        release of ssl_context
      mysql-test/valgrind.supp:
        New BitKeeper file ``mysql-test/valgrind.supp''
        This file is backported from 5.0, added suppressing of OpenSSL errors
      2df29225
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.0-axmrg · 62fdcb54
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-axmrg
      
      
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      include/thr_alarm.h:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/thr_alarm.c:
        Auto merged
      mysys/my_thr_init.c:
        Manual merged
      sql/mysqld.cc:
        Manual merged
      62fdcb54
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · a94b1b50
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-axmrg
      
      
      a94b1b50
  7. 31 Jan, 2007 2 commits
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines · ab3abe12
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines
      
      
      ab3abe12
    • unknown's avatar
      WL#3567 - MERGE engine: a check for underlying table conformance · f7b3c7c5
      unknown authored
      When a merge table is opened compare column and key definition of
      underlying tables against column and key definition of merge table.
      
      If any of underlying tables have different column/key definition
      refuse to open merge table.
      
      
      mysql-test/r/merge.result:
        A test case for WL#3456.
      mysql-test/t/merge.test:
        A test case for WL#3456.
      sql/ha_myisam.cc:
        Moved a part of code that converts TABLE object to MyISAM key and column
        definition to a separate function.
        
        Added check_definition() function that compares MyISAM table definitions.
      sql/ha_myisammrg.cc:
        Check if underlying table definition conforms to merge table definition,
        and in case underlying table definition differs, refuse to open merge
        table.
      f7b3c7c5
  8. 30 Jan, 2007 3 commits
    • unknown's avatar
      Fixed bug #24987. · 1944b4ca
      unknown authored
      Made the function opt_sum_query to return HA_ERR_KEY_NOT_FOUND when
      no matches were found (instead of -1 it returned prior this patch).
      This changes allow us to avoid possible conflicts with return values
      from user-defined handler methods which also may return -1. 
      No particular test cases are provided with this fix.
      
      
      sql/opt_sum.cc:
        Fixed bug #24987.
        Made the function opt_sum_query to return HA_ERR_KEY_NOT_FOUND when
        no matches were found (instead of -1 it returned prior this patch).
        This changes allow us to avoid possible conflicts with return values
        from user-defined handler methods which also may return -1.
      sql/sql_select.cc:
        Fixed bug #24987.
        Made the function opt_sum_query to return HA_ERR_KEY_NOT_FOUND when
        no matches were found (instead of -1 it returned prior this patch).
        This changes allow us to avoid possible conflicts with return values
        from user-defined handler methods which also may return -1.
      1944b4ca
    • unknown's avatar
      Merge bk://localhost:5559 · 7be3cad4
      unknown authored
      into  production.mysql.com:/usersnfs/jamppa/mysql-4.0
      
      
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      mysys/thr_alarm.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      7be3cad4
    • unknown's avatar
      Cleanup of thread-type (linuxthread or NTPL) detection code · cdf6001a
      unknown authored
      Move get_thread_lib to mysys/my_pthread.c
      Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
      
      
      include/my_global.h:
        Fixed to be same as in 5.1
      include/my_pthread.h:
        Move things around to be more in line with rest of code
      mysys/default.c:
        Fixed two wrong pointer incrementations.
      mysys/my_pthread.c:
        Cleanup: Use variable thr_client_alarm
      mysys/my_thr_init.c:
        Detect thread library at startup.
        Set also thr_client_alarm signal here, so that we get
        it in init_signals() in mysqld
      mysys/thr_alarm.c:
        Set thr_client_alarm depending on which thread library we are using
      sql/mysqld.cc:
        Move get_thread_lib to mysys/my_pthread.c
      cdf6001a
  9. 29 Jan, 2007 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · d3087993
      unknown authored
      into  chilla.local:/home/mydev/mysql-4.1-axmrg
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      mysql-test/r/myisam.result:
        Manual merged
      mysql-test/t/myisam.test:
        Manual merged
      d3087993
    • unknown's avatar
      bug #25492 (Invalid deallocation in mysql_stmt_fetch) · 925d4fb9
      unknown authored
      Operating with the prepared statements we don't alloc MYSQL_DATA structure,
      but use MYSQL_STMT's field instead (to increase performance by reducing
      malloc calls).
      So we shouldn't free this structure as we did before.
      
      
      libmysqld/lib_sql.cc:
        we only should free data->alloc here, as the 'data' is a member
        of STMT structure
      925d4fb9
  10. 26 Jan, 2007 2 commits
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · fddf3c39
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/4.1
      
      
      sql/item_func.cc:
        Auto merged
      fddf3c39
    • unknown's avatar
      Fixed bug #24653. · da561a80
      unknown authored
      The bug report has demonstrated the following two problems.
      1. If an ORDER/GROUP BY list includes a constant expression being 
      optimized away and, at the same time, containing single-row
      subselects that return more that one row, no error is reported.
      Strictly speaking the standard allows to ignore error in this case.
      Yet, now a corresponding fatal error is reported in this case.
      2. If a query requires sorting by expressions containing single-row
      subselects that, however, return more than one row, then the execution
      of the query may cause a server crash. 
      To fix this some code has been added that blocks execution of a subselect
      item in case of a fatal error in the method Item_subselect::exec.
      
      
      mysql-test/r/subselect.result:
        Added a test cases for bug #24653.
      mysql-test/t/subselect.test:
        Added a test cases for bug #24653.
      sql/filesort.cc:
        Fixed bug #24653.
        Added a check for fatal error after reading the next row from the table
        in the function find_all_keys.
      sql/item.cc:
        Fixed bug #24653.
        Down-ported calculation of the attribute with_subselect of for Item objects.
      sql/item.h:
        Fixed bug #24653.
        Down-ported calculation of the attribute with_subselect of for Item objects.
      sql/item_cmpfunc.cc:
        Fixed bug #24653.
        Down-ported calculation of the attribute with_subselect of for Item objects.
      sql/item_cmpfunc.h:
        Fixed bug #24653.
        Down-ported calculation of the attribute with_subselect of for Item objects.
      sql/item_func.cc:
        Fixed bug #24653.
        Down-ported calculation of the attribute with_subselect of for Item objects.
      sql/item_subselect.cc:
        Fixed bug #24653.
        Added a check for fatal error in the method Item_subselect::exec
        to block evaluation of subselects in erroneous situations.
        Down-ported calculation of the attribute with_subselect of for Item objects.
      sql/sql_select.cc:
        Fixed bug #24653.
        Added a check to verify that any constant expression used
        in ORDER BY and/or GROUP BY lists which is optimized away
        does not contain subselects returning more than one row.
        If it does a fatal error is reported.
      da561a80
  11. 25 Jan, 2007 1 commit
    • unknown's avatar
      Cleanup of thread-type (linuxthread or NTPL) detection code · 2ec2fa6d
      unknown authored
      Move get_thread_lib to mysys/my_pthread.c
      Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
      
      
      
      include/my_global.h:
        Fixed to be same as in 5.1
      include/my_pthread.h:
        Move things around to be more in line with rest of code
      include/thr_alarm.h:
        extern of thr_client_alarm
      mysys/default.c:
        Fixed two wrong pointer incrementations.
      mysys/my_pthread.c:
        Cleanup: Use variable thr_client_alarm
      mysys/my_thr_init.c:
        Detect thread library at startup
      mysys/thr_alarm.c:
        Set thr_client_alarm depending on which thread library we are using
      sql/mysqld.cc:
        Move get_thread_lib to mysys/my_pthread.c
      2ec2fa6d
  12. 24 Jan, 2007 6 commits
  13. 23 Jan, 2007 2 commits
  14. 22 Jan, 2007 7 commits