1. 02 Feb, 2007 5 commits
  2. 01 Feb, 2007 4 commits
    • 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
  3. 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
  4. 30 Jan, 2007 2 commits
    • 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
  5. 29 Jan, 2007 1 commit
    • 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
  6. 26 Jan, 2007 1 commit
  7. 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
  8. 24 Jan, 2007 6 commits
  9. 23 Jan, 2007 2 commits
  10. 22 Jan, 2007 9 commits
    • unknown's avatar
      Fixed bug #25637: LEFT JOIN with BOOLEAN FULLTEXT loses left table matches. · 6d04643a
      unknown authored
      The bug is actually a duplicate of the bug 14708.
      Down-ported the fix for 14708 from 5.0.  
      Merged the test case for bug 14708 from 5.0.
      
      
      mysql-test/r/fulltext_left_join.result:
        Added a test case for bug #25637 (duplicate .of bug 14708).
        Merged the test case for bug 14708 from 5.0.
      mysql-test/t/fulltext_left_join.test:
        Added a test case for bug #25637 (duplicate of bug 14708).
        Merged the test case for bug 14708 from 5.0.
      sql/item_func.cc:
        Fixed bug #25637: LEFT JOIN with BOOLEAN FULLTEXT loses left table matches.
        The bug is actually a duplicate of the bug 14708.
        Down-ported the fix for 14708 from 5.0.
      6d04643a
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 4dcb54a8
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      4dcb54a8
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780 · 45b9381f
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
      
      
      scripts/mysqld_multi.sh:
        Auto merged
      45b9381f
    • unknown's avatar
      after-merge fix · 4f69569d
      unknown authored
      4f69569d
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061 · 747ec6f9
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
      
      
      BUILD/check-cpu:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      747ec6f9
    • unknown's avatar
      BUG#24401 - MySQL server crashes if you try to retrieve data from · fde52a2f
      unknown authored
                  corrupted table
      
      Accessing a table with corrupted column definition results in server
      crash.
      
      This is fixed by refusing to open such tables. Affects MyISAM only.
      No test case, since it requires crashed table.
      
      
      myisam/mi_open.c:
        Refuse to open MyISAM table with summary columns length bigger than
        length of the record.
      fde52a2f
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build · db3534e2
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      db3534e2
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · 077840fa
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
      
      
      include/thr_alarm.h:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      BUILD/SETUP.sh:
        Merged from 4.0
      configure.in:
        Merged from 4.0
      include/my_global.h:
        Merged from 4.0
      include/my_pthread.h:
        Merged from 4.0
      mysys/thr_alarm.c:
        Merged from 4.0
      sql/mysqld.cc:
        Merged from 4.0
      BUILD/SETUP.sh.rej:
        Merged from 4.0
      configure.in.rej:
        Merged from 4.0
      include/my_global.h.rej:
        Merged from 4.0
      include/my_pthread.h.rej:
        Merged from 4.0
      mysys/thr_alarm.c.rej:
        Merged from 4.0
      sql/mysqld.cc.rej:
        Merged from 4.0
      077840fa
    • unknown's avatar
      Fix for configure to detect library correctly. · 454c763c
      unknown authored
      Fix to check library in use during runtime.
      Fix for Bug#16995, "idle connections not being killed due to timeout when NPTL is used".
      
      
      BUILD/SETUP.sh:
        To avoid warnings during compilation.
      configure.in:
        Fixed configure so that it can correctly detect
        between NPTL and Linuxthreads.
      include/my_global.h:
        Fix for Linuxthreads.
      include/my_pthread.h:
        Added defines for different libraries that can be detected.
        Currently only 'other', 'nptl', and 'lt' (linuxthreads) are
        being used.
        
        changed sigset() and signal() to my_sigset() and my_signal()
      include/thr_alarm.h:
        Removed defines for Linuxthreads. This is now detected during
        runtime and handled in the thr_alarm.c
      mysys/my_pthread.c:
        Runtime check for library.
      mysys/thr_alarm.c:
        Runtime checks for library and corresponding
        signals.
      sql/mysqld.cc:
        Added function for detecting thread library in use
        during start-up.
        
        THR_KILL_SIGNAL removed, setting signals during runtime.
      454c763c
  11. 18 Jan, 2007 7 commits