1. 27 Aug, 2004 1 commit
    • unknown's avatar
      fixed format of history of new libedit for compatibility · 46eefa9f
      unknown authored
       with old libedit and readline
      
      1. discarded reading and writting of hist_cookie as the begin of the file
      2. skip strvis for string before saving
      
      
      
      cmd-line-utils/libedit/history.c:
        fixed format of history for compatibility with old libedit and readline
        
        1. discarded reading and writting of hist_cookie as the begin of file
        2. skip strvis for string before saving
      46eefa9f
  2. 24 Aug, 2004 39 commits
    • unknown's avatar
      committed skipped file · b7709f33
      unknown authored
      b7709f33
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b04ef27a
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear
      
      
      acinclude.m4:
        Auto merged
      configure.in:
        Auto merged
      b04ef27a
    • unknown's avatar
      resurrect fix for · abcf807e
      unknown authored
      Bug #4696  	segfault in cmd-line-utils/libedit/history.c:history_save() 
      (bundled libedit)
      
      abcf807e
    • unknown's avatar
      fixed AC_DEFINE(HAVE_HIST_ENTRY) in acinclude.m4 · 83f6316a
      unknown authored
      
      acinclude.m4:
        fixed AC_DEFINE(HAVE_HIST_ENTRY)
      83f6316a
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6c4ffb8c
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear_v2
      
      
      client/mysql.cc:
        Auto merged
      configure.in:
        Auto merged
      6c4ffb8c
    • unknown's avatar
      fixed AC_DEFINE's for libedit-2.6.7 · f83078b7
      unknown authored
      
      acinclude.m4:
        fixed AC_DEFINE(HAVE_HIST_ENTRY)
      configure.in:
        fixed new AC_DEFINE's
      f83078b7
    • unknown's avatar
      added skipped file for libedit-2.6.7 · fb67d669
      unknown authored
      fb67d669
    • unknown's avatar
      added skipped macro for new libedit-2.6.7 in configure.in · e92cae03
      unknown authored
      
      configure.in:
        added skipped macro for new libedit-2.6.7
      e92cae03
    • unknown's avatar
      upgrade to libedit-2.6.7 · f6a3fb44
      unknown authored
      (fixed Bug #4462 libedit compile failure)
      
      
      BitKeeper/etc/ignore:
        change config.h -> config.h to commit cmd-line-utils/libedit/config.h
      cmd-line-utils/libedit/Makefile.am:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/chared.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/chared.h:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/common.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/el.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/el.h:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/emacs.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/hist.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/hist.h:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/histedit.h:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/history.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/key.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/key.h:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/makelist.sh:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/map.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/map.h:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/parse.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/prompt.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/read.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/readline.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/readline/readline.h:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/refresh.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/search.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/search.h:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/sig.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/sig.h:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/sys.h:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/term.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/tokenizer.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/tokenizer.h:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/tty.c:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/tty.h:
        upgrade to libedit-2.6.7
      cmd-line-utils/libedit/vi.c:
        upgrade to libedit-2.6.7
      configure.in:
        change liblibedit.a to correct libedit.a
      f6a3fb44
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · 214aeba2
      unknown authored
      into build.mysql.com:/users/rburnett/mysql41
      
      214aeba2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c0ac8181
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/sql_class.cc:
        Auto merged
      c0ac8181
    • unknown's avatar
      my_handler.c: · b040c680
      unknown authored
        Added (my_bool) cast to !(nextflag & SEARCH_PREFIX) code to correct MSVC warning about mismatched integral types
      
      
      mysys/my_handler.c:
        Added (my_bool) cast to !(nextflag & SEARCH_PREFIX) code to correct MSVC warning about mismatched integral types
      b040c680
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0e316ced
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      0e316ced
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 70fca8b6
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1
      
      70fca8b6
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · c1294651
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1
      
      
      sql-common/client.c:
        Auto merged
      c1294651
    • unknown's avatar
      more accurate processing of find_type result · 3c5e4bd9
      unknown authored
      (Bug #4998 --protocol doesn't reject bad values)
      
      
      client/mysql.cc:
        more accurate processing of find_type result
      client/mysqladmin.c:
        more accurate processing of find_type result
      client/mysqlbinlog.cc:
        more accurate processing of find_type result
      client/mysqlcheck.c:
        more accurate processing of find_type result
      client/mysqldump.c:
        more accurate processing of find_type result
      client/mysqlimport.c:
        more accurate processing of find_type result
      client/mysqlshow.c:
        more accurate processing of find_type result
      sql-common/client.c:
        more accurate processing of find_type result
      3c5e4bd9
    • unknown's avatar
      Portablity fixes & simple optimizations · 04691360
      unknown authored
      
      sql/ha_ndbcluster.cc:
        Added missing cast
      sql/item.cc:
        Portability fix (for windows)
      sql/lock.cc:
        Cleanup + more comments
      sql/sql_class.cc:
        Portability fix + more comments
      sql/sql_select.cc:
        Portability fix
      sql/sql_table.cc:
        Simpler handling of auto_increment in ALTER TABLE
      04691360
    • unknown's avatar
      fixed : · e4c98b4f
      unknown authored
      Bug #3937  	fails to compile with both gcc 3.3.3/icc8
      Bug #4728  	mysql couldn't be compiled using system readline (readline-4.3)
      
      
      acinclude.m4:
        1. added defun MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY for last versions of readline and libedit
        2. added #undef __P in defuns MYSQL_CHECK_LIBEDIT_INTERFACE, MYSQL_CHECK_NEW_RL_INTERFACE
      client/mysql.cc:
        1. added #undef __P before #include "readline/readline.h" because readline-4.2 declares own __P
        2. changed !defined(USE_LIBEDIT_INTERFACE) to !defined(HAVE_HIST_ENTRY) before declaring of own hist_entry
           because latest versions of libedit declare hist_entry too
      cmd-line-utils/Makefile.am:
        added copyright header
      configure.in:
        1. added comment for --with-readline/--with-libedit options
        2. added define for HAVE_HIST_ENTRY and macro to check it
        3. added AC_LANG_CPLUSPLUS before readline/libedit checks
      e4c98b4f
    • unknown's avatar
      Use "configured" socklen_t · 08bf33da
      unknown authored
      Fix master printout
      
      
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Fix master printout
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Use "configured" socklen_t
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Use "configured" socklen_t
      ndb/src/mgmsrv/Services.cpp:
        Use "configured" socklen_t
      08bf33da
    • unknown's avatar
      Compile fix sol9x86 · a652879c
      unknown authored
      
      ndb/src/kernel/blocks/grep/Grep.hpp:
        Remove own addRecSignal-methods
      ndb/src/kernel/blocks/grep/GrepInit.cpp:
        Remove own addRecSignal-methods
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        #ifdef SUNPRO_CC 5.6
      ndb/src/ndbapi/NdbEventOperation.cpp:
        Compile fix
      ndb/src/ndbapi/NdbScanFilter.cpp:
        #ifdef SUNPRO_CC 5.6
      ndb/src/ndbapi/TransporterFacade.hpp:
        Compile fix
      ndb/test/ndbapi/testIndex.cpp:
        Compile fix
      a652879c
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 01d9ceaf
      unknown authored
      into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
      
      01d9ceaf
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 62ef2559
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-4.1-root-root
      
      62ef2559
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 78800285
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      78800285
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 126f00eb
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.5066
      
      126f00eb
    • unknown's avatar
      SCO unix compile fix · 54985ce5
      unknown authored
      
      ndb/src/common/portlib/Makefile.am:
        Rename from .c to .cpp as c++ features needed
      ndb/src/common/portlib/NdbTCP.cpp:
        NDB_MUTEX_INITIALIZER isn't preset on SCO unix
      ndb/src/ndbapi/Ndbinit.cpp:
        NDB_MUTEX_INITIALIZER isn't preset on SCO unix
      54985ce5
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · c501710a
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      c501710a
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 92471a36
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.5066
      
      92471a36
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5df7c936
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-fix
      
      5df7c936
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · f5754ce5
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.emb
      
      f5754ce5
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 069d1af4
      unknown authored
      into poseidon.(none):/home/tomas/mysql-4.1-clean
      
      069d1af4
    • unknown's avatar
      some more printouts to SHOW command · 7cf1e5c3
      unknown authored
      
      mysql-test/ndb/ndbcluster.sh:
        stop instead of kill
      7cf1e5c3
    • unknown's avatar
      enabling stopping of ndb_mgmd · 4a15609f
      unknown authored
      4a15609f
    • unknown's avatar
      Fix to compile with msvc: converted static const int Item_arena::* to enum members, undefine ERROR · 11010a08
      unknown authored
      
      include/config-win.h:
        Undefine ERROR #defined by WINGDI
      sql/sql_class.cc:
        Fix to compile with msvc: converted static const int Item_arena::* to enum members
      sql/sql_class.h:
        Fix to compile with msvc: converted static const int Item_arena::* to enum members
      sql/sql_prepare.cc:
        Fix to compile with msvc: converted static const int Item_arena::* to enum members
      11010a08
    • unknown's avatar
      Merging fix · e8bd77c0
      unknown authored
      e8bd77c0
    • unknown's avatar
      Fixed windows-specific warning about undeclared localtime_r() in my_time.c. · 9b0d9af1
      unknown authored
      We have to include my_pthread.h since it is the place where localtime_r() is declared 
      on platforms where this function is missing.
      
      
      sql-common/my_time.c:
        We have to include my_pthread.h since it is the place where localtime_r() is declared 
        on platforms where this function is missing.
      9b0d9af1
    • unknown's avatar
      bug#5014 · e92c08ab
      unknown authored
      detect change of #replicas + #nodes
      
      e92c08ab
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · f15fa69a
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.5066
      
      f15fa69a
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 · 1b10a887
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.5066
      
      1b10a887
    • unknown's avatar
      Merging · 93be0267
      unknown authored
      93be0267