1. 18 Oct, 2006 1 commit
    • unknown's avatar
      bug #23369 (Embedded library can't be linked) · c7ccb5ff
      unknown authored
      Problem is that some files moved to storage/*/ still are dependent
      on sql/ code (usually use members of THD structure)
      that can get different being compiled with another #define-s
      Code added to recompile these for the embedded server
      
      
      config/ac-macros/plugins.m4:
        macros added to check if the storage has sql/ - dependent code
      libmysqld/Makefile.am:
        symlink files from storage/*/ needed to be recompiled
        with EMBEDDED_LIBRARY
      storage/federated/plug.in:
        ha_federated.cc uses THD structure
      storage/heap/plug.in:
        ha_heap.cc uses THD structure
      storage/innobase/plug.in:
        ha_innodb.cc uses THD structure
      storage/myisam/plug.in:
        ha_myisam.cc uses THD structure
      storage/myisammrg/plug.in:
        ha_myisammrg.cc uses THD structure
      c7ccb5ff
  2. 17 Oct, 2006 2 commits
  3. 16 Oct, 2006 2 commits
    • unknown's avatar
      ndb - fix some ndb strict-alias problems · f6fb6ff7
      unknown authored
        found with gcc 4.0.2 on Itanium2
        (ndb_dd_* failures)
      
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
        Fix some potentil alias problems
      storage/ndb/src/kernel/vm/Pool.hpp:
        Fix potential alias problem
      f6fb6ff7
    • unknown's avatar
      make_binary_distribution.sh: · bae19fbe
      unknown authored
        Split copy of result files to avoid shell limit.
        Added copy of mysql-test/std_data/ndb_backup5{0,1}.
      configure.in:
        Look for dlopen() even if --with-mysqld-ldflags constains "-static",
        as this is not the same as the flag to "ld", it just informs
        "libtool" to link static with libraries created part of the build,
        even if there exists shared versions.
      
      
      configure.in:
        Look for dlopen() even if --with-mysqld-ldflags constains "-static",
        as this is not the same as the flag to "ld", it just informs
        "libtool" to link static with libraries created part of the build,
        even if there exists shared versions.
      scripts/make_binary_distribution.sh:
        Split copy of result files to avoid shell limit.
        Added copy of mysql-test/std_data/ndb_backup5{0,1}.
      bae19fbe
  4. 14 Oct, 2006 1 commit
    • unknown's avatar
      Makefile.am: · aa635345
      unknown authored
        Configure flags makes "lex_hash.h" differ, don't distribute
        pregenerated file, build it after configure (bug#18888).
      
      
      sql/Makefile.am:
        Configure flags makes "lex_hash.h" differ, don't distribute
        pregenerated file, build it after configure (bug#18888).
      aa635345
  5. 13 Oct, 2006 4 commits
    • unknown's avatar
      CMakeLists.txt: · 8bbab1cf
      unknown authored
        Added mysql_upgrade target to Windows CMake build
      
      
      client/CMakeLists.txt:
        Added mysql_upgrade target to Windows CMake build
      8bbab1cf
    • unknown's avatar
      ndb - fix memleak (due to incorrect merge of bug#21941) · 42271d30
      unknown authored
        recommit into release-clone
      
      
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        fix missing "if" statement
      42271d30
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.1-release · 12f9b80c
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
      
      12f9b80c
    • unknown's avatar
      log_event.cc, sql_class.cc: · c421851d
      unknown authored
        VisualStudio needs cast from (byte*) to (const char*), 3rd arg to _db_dump_()
      
      
      sql/sql_class.cc:
        VisualStudio needs cast from (byte*) to (const char*), 3rd arg to _db_dump_()
      sql/log_event.cc:
        VisualStudio needs cast from (byte*) to (const char*), 3rd arg to _db_dump_()
      c421851d
  6. 12 Oct, 2006 5 commits
    • unknown's avatar
      unittest/mytap/tap.c : · d3ff7283
      unknown authored
      Do not (try to) set a signal handler action unless a signal is defined on the platform.
      
      
      unittest/mytap/tap.c:
        Do not (try to) set a signal handler action unless a signal is defined on the platform.
        SIGXCPU, SIGXFSZ, SIGSYS, and SIGTRAP were reported as undefined in Netware build of 5.1.12-beta.
      d3ff7283
    • unknown's avatar
      thr_alarm.c, thr_lock.c, my_global.h: · d31063d9
      unknown authored
        Avoid multiple define of DBUG_OFF (bug#21749)
      
      
      mysys/thr_alarm.c:
        Avoid multiple define of DBUG_OFF (bug#21749)
      mysys/thr_lock.c:
        Avoid multiple define of DBUG_OFF (bug#21749)
      include/my_global.h:
        Avoid multiple define of DBUG_OFF (bug#21749)
      d31063d9
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.1-release · b451468f
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
      
      b451468f
    • unknown's avatar
      mysql.spec.sh: · 167dd41f
      unknown authored
        Corrected path to mysql-test directory
        Removed man1/mysql_explain_log.1
      
      
      support-files/mysql.spec.sh:
        Corrected path to mysql-test directory
        Removed man1/mysql_explain_log.1
      167dd41f
    • unknown's avatar
      Various tool fixes, necessary to build 5.1.12-beta on Netware. · 11887673
      unknown authored
      
      netware/BUILD/compile-AUTOTOOLS:
        Fixes for Netware builds:
        1) The "autotools" used there have problems with changing variables in Makefiles
           after the initial setting.
        2) "storage/innobase" does not need an autotool run any more.
        3) "automake --verbose" may be able to help if new problems arise.
      netware/BUILD/compile-netware-START:
        The CSV engine is now mandatory in 5.1, must not be de-configured.
      netware/BUILD/mwenv:
        When testing for a possibly empty shell variable, it is mandatory to use quotes!
      netware/BUILD/nwbootstrap:
        The "mwenv" file has been changed, reflect these changes here:
        1) It is no longer necessary to set the variables WINE_BUILD_DIR, BUILD_DIR, and VERSION.
        2) The handling of MYDEV there has changed, the "export" line may be indented.
      11887673
  7. 11 Oct, 2006 6 commits
    • unknown's avatar
      Override "read-only" permissions when doing "make distcheck". · 94ea76bb
      unknown authored
      
      Docs/Makefile.am:
        Override "read-only" permissions on "manual.chm".
      94ea76bb
    • unknown's avatar
      BUG#21524 ps.test updated to meet recent changes in SQL parser · 88e954e0
      unknown authored
      
      mysql-test/r/ps.result:
        brand new ps.result recorded out of updated ps.test output
      mysql-test/t/disabled.def:
        ps.test enabled anew
      mysql-test/t/ps.test:
        ps.test updated to ensure FLUSH/RESET are not allowed in stored functions at both
        parse and execution time
      88e954e0
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · c05c72d8
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      c05c72d8
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-rpl · f21b26be
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      sql/log.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      f21b26be
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-rpl · 72988a1c
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      72988a1c
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · dcffc2bd
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      BitKeeper/etc/collapsed:
        auto-union
      BitKeeper/etc/ignore:
        auto-union
      Makefile.am:
        Auto merged
      client/mysql.cc:
        Auto merged
      include/m_ctype.h:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/mysql.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/warnings.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      dcffc2bd
  8. 10 Oct, 2006 14 commits
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl · b679056f
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
      
      
      include/my_sys.h:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      b679056f
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.0-rpl · d3743b43
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
      
      d3743b43
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · f0162ddf
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/tools/restore/restore_main.cpp:
        Auto merged
      f0162ddf
    • unknown's avatar
      ndb - · c4534097
      unknown authored
        ndb_restore Return OK even if temporary errors
          (otherwise mysql-test-run/ndb_restore can fail on really slow machines)
      
      
      storage/ndb/tools/restore/restore_main.cpp:
        Return OK even if temporary errors
      c4534097
    • unknown's avatar
      Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · ed8d946f
      unknown authored
      into  romeo.(none):/home/bk/b21474-mysql-5.1-new-rpl
      
      
      sql/log_event.cc:
        Auto merged
      ed8d946f
    • unknown's avatar
      BUG#21474 (There is a rotation before the last table map): · 571f0c18
      unknown authored
      Removing code to step the group log position and just stepping
      the event log position.  If the group log position were stepped
      one time too many, it might be that the group starts at a position
      that is not possible, e.g., at a Rows_log_event, or between an
      Intvar_log_event and the following associated Query_log_event.
      
      
      sql/log_event.cc:
        Removing code to step the group log position and just stepping
        the event log position.  If the group log position were stepped
        one time too many, it might be that the group starts at a position
        that is not possible, e.g., at a Rows_log_event, or between an
        Intvar_log_event and the following associated Query_log_event.
      sql/slave.cc:
        Removing code to step the group log position and just stepping
        the event log position when executing a Format_description_log_event.
        If the group log position were stepped one time too many, it might be that the group starts at a position
        that is not possible, e.g., at a Rows_log_event, or between an
        Intvar_log_event and the following associated Query_log_event.
      571f0c18
    • unknown's avatar
      Fixes to make replication team tree build on Windows. · 10518dfa
      unknown authored
      
      sql/log_event.cc:
        Adding casts to make it compile on Windows.
      10518dfa
    • unknown's avatar
      Merge trift2.:/MySQL/M50/clone-5.0 · 4c8f960c
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      4c8f960c
    • unknown's avatar
      Fix to make it build on all platforms. · 11877ba9
      unknown authored
      Replacing C++ code with C code in a C file.
      
      
      mysys/mf_iocache2.c:
        There shall not be C++ code in C files.
      11877ba9
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 · 948a9ddd
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      client/mysqldump.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      mysql-test/r/csv.result:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/csv.test:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      storage/innobase/btr/btr0btr.c:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/dict/dict0dict.c:
        Auto merged
      storage/innobase/fil/fil0fil.c:
        Auto merged
      storage/innobase/fsp/fsp0fsp.c:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/innobase/include/btr0cur.ic:
        Auto merged
      storage/innobase/log/log0log.c:
        Auto merged
      storage/innobase/log/log0recv.c:
        Auto merged
      storage/innobase/os/os0file.c:
        Auto merged
      storage/innobase/row/row0mysql.c:
        Auto merged
      storage/innobase/row/row0sel.c:
        Auto merged
      storage/innobase/srv/srv0start.c:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      948a9ddd
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · cf57931d
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      cf57931d
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 0b0169d9
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testTimeout.cpp:
        Auto merged
      0b0169d9
    • unknown's avatar
      ndb - bug#23107 · 6ef83b2e
      unknown authored
        fix bug in test prg
      
      6ef83b2e
    • unknown's avatar
      ndb - bug#23107 · 7f470530
      unknown authored
        fix bug in handling of inactive timeout for scan, when all is delivered
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        1) set timeout if all scans are at api
        2) Use c_appl_timeout_value when getting scan timeout
      ndb/test/ndbapi/testTimeout.cpp:
        test program
      7f470530
  9. 09 Oct, 2006 1 commit
    • unknown's avatar
      Post-merge fixes. · e755c950
      unknown authored
      
      mysql-test/t/view.test:
        Switching to using symbolic error numbers instead of numbers.
        Using numbers caused test to fail.
      e755c950
  10. 08 Oct, 2006 4 commits