into mysql.com:/home/my/mysql-5.1
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-my_lread.c:
Auto merged
BitKeeper/deleted/.del-my_lwrite.c:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
cmd-line-utils/readline/complete.c:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/csv.test:
Auto merged
mysql-test/t/ctype_cp1250_ch.test:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/group_min_max.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/sp-prelocking.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysys/default.c:
Auto merged
mysys/mf_iocache.c:
Auto merged
mysys/mf_keycache.c:
Auto merged
mysys/my_alloc.c:
Auto merged
mysys/my_dup.c:
Auto merged
mysys/my_getwd.c:
Auto merged
mysys/my_handler.c:
Auto merged
mysys/my_lib.c:
Auto merged
mysys/my_malloc.c:
Auto merged
mysys/my_pread.c:
Auto merged
mysys/my_seek.c:
Auto merged
mysys/safemalloc.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/filesort.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql-common/client.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/strfunc.cc:
Auto merged
sql/tztime.cc:
Auto merged
sql/unireg.cc:
Auto merged
storage/heap/_check.c:
Auto merged
storage/heap/hp_delete.c:
Auto merged
storage/heap/hp_hash.c:
Auto merged
storage/heap/hp_open.c:
Auto merged
storage/heap/hp_rkey.c:
Auto merged
storage/heap/hp_rrnd.c:
Auto merged
storage/heap/hp_write.c:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_close.c:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_keycache.c:
Auto merged
storage/myisam/mi_page.c:
Auto merged
storage/myisam/mi_statrec.c:
Auto merged
storage/myisam/mi_test2.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
storage/myisammrg/myrg_extra.c:
Auto merged
storage/ndb/include/logger/LogHandler.hpp:
Auto merged
storage/ndb/include/util/OutputStream.hpp:
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
Auto merged
storage/ndb/src/common/portlib/NdbMutex.c:
Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
Auto merged
storage/ndb/src/cw/cpcd/CPCD.hpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
Auto merged
storage/ndb/src/kernel/error/ErrorReporter.hpp:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationInt.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
Auto merged
storage/ndb/tools/drop_index.cpp:
Auto merged
storage/ndb/tools/drop_tab.cpp:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
vio/viossl.c:
Auto merged
vio/viosslfactories.c:
Auto merged
BUILD/SETUP.sh:
Use local version
client/client_priv.h:
Manual merge
mysql-test/mysql-test-run.pl:
Manual merge
mysql-test/r/ctype_cp1250_ch.result:
Manual merge
mysql-test/t/disabled.def:
Manual merge
mysys/hash.c:
Manual merge
mysys/thr_lock.c:
Manual merge
server-tools/instance-manager/mysql_connection.cc:
Manual merge
sql/ha_ndbcluster.cc:
Manual merge
sql/handler.cc:
Manual merge
sql/item_timefunc.cc:
Manual merge
sql/mysqld.cc:
Manual merge
sql/opt_range.cc:
Manual merge
sql/slave.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
sql/sql_prepare.cc:
Manual merge
sql/sql_view.cc:
Manual merge
sql/table.cc:
Manual merge
storage/archive/ha_archive.cc:
Manual merge
storage/federated/ha_federated.cc:
Manual merge
storage/federated/ha_federated.h:
Manual merge
storage/innobase/handler/ha_innodb.cc:
Manual merge
storage/ndb/include/ndb_global.h.in:
Manual merge
storage/ndb/include/util/InputStream.hpp:
Manual merge
storage/ndb/include/util/SimpleProperties.hpp:
Manual merge
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Manual merge
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
Manual merge
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
Manual merge
storage/ndb/src/ndbapi/Ndbinit.cpp:
Manual merge
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Manual merge
strings/decimal.c:
Manual merge
vio/viosocket.c:
Manual merge
- Return error only if 'history' returns -1
cmd-line-utils/libedit/readline.c:
Return 1 to indicate error only if 'history' returned -1, since the history function normally will return the number of entries written or read. Only -1 indicates error.
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
include/my_base.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/table.cc:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisam/sort.c:
Auto merged
mysys/my_bitmap.c:
Manual merge
sql/field.cc:
e
Manual merge
sql/item.cc:
Manual merge (new Field_bit_as_char constructor signature)
sql/item_func.cc:
Manual merge: use local
sql/sql_insert.cc:
Manual merge: add VOID() around bitmap_init
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
Makefile.am:
Auto merged
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
extra/Makefile.am:
Auto merged
include/Makefile.am:
Auto merged
include/my_global.h:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
scripts/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_federated.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/key.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/structs.h:
Auto merged
sql/table.cc:
Auto merged
sql/tztime.cc:
Auto merged
storage/myisam/myisamchk.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/ndb/docs/Makefile.am:
Auto merged
support-files/mysql.spec.sh:
Auto merged
libmysqld/Makefile.am:
Merged from 5.0 to 5.1.
sql/ha_berkeley.cc:
Merged from 5.0 to 5.1.
sql/lex.h:
Merged from 5.0 to 5.1.
sql/set_var.cc:
Merged from 5.0 to 5.1.
sql/share/errmsg.txt:
Merged from 5.0 to 5.1.
sql/sql_lex.h:
Merged from 5.0 to 5.1.
sql/sql_show.cc:
Merged from 5.0 to 5.1.
sql/sql_yacc.yy:
Merged from 5.0 to 5.1.
mysys/base64.c:
Portability change for SCO/HP, compiler don't like
doing pointer arithmetic on void* variable
include/my_bitmap.h:
"inline" functions (especially in header files) should be declared "static",
or else we may get "multiply defined" when they are used in several modules.
(Solaris compiler problem)
sql/handler.h:
Compatibility change for AIX compiler
storage/bdb/Makefile.in:
Added bdb "sequence" directory to "make dist"
cmd-line-utils/readline/complete.c:
Avoid FreeBSD 5.3 problems including <sys/file.h>
mysql-test/t/disabled.def:
Disable compress.test for now
storage/bdb/build_unix/.IGNORE_ME:
File that is copied to prevent empty directories in source TAR
Makefile.am:
Auto merged
client/Makefile.am:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
support-files/Makefile.am:
Auto merged
using wrong type in assignment etc.
cmd-line-utils/readline/complete.c:
Fixed problem with implicitely defining wcwidth() in case when
compiling with icc.
cmd-line-utils/readline/display.c:
Fixed problem with implicitely defining wcwidth() in case when
compiling with icc.
cmd-line-utils/readline/mbutil.c:
Fixed problem with implicitely defining wcwidth() in case when
compiling with icc.
server-tools/instance-manager/protocol.cc:
Fixed some types from int to char. Made ERROR_PACKET_CODE
static global variable in this file.
sql/log.cc:
Removed warning of unused goto when not in debug mode.
Enable "make distcheck" to work
configure.in:
Enable "make distcheck" to work
Docs/Makefile.am:
Enable "make distcheck" to work
Makefile.am:
Enable "make distcheck" to work
client/Makefile.am:
Enable "make distcheck" to work
cmd-line-utils/libedit/Makefile.am:
Enable "make distcheck" to work
include/Makefile.am:
Enable "make distcheck" to work
libmysql/Makefile.am:
Enable "make distcheck" to work
libmysql_r/Makefile.am:
Enable "make distcheck" to work
libmysqld/Makefile.am:
Enable "make distcheck" to work
libmysqld/examples/Makefile.am:
Enable "make distcheck" to work
mysql-test/Makefile.am:
Enable "make distcheck" to work
ndb/docs/Makefile.am:
Enable "make distcheck" to work
netware/Makefile.am:
Enable "make distcheck" to work
pstack/Makefile.am:
Enable "make distcheck" to work
scripts/Makefile.am:
Enable "make distcheck" to work
sql-bench/Makefile.am:
Enable "make distcheck" to work
sql/Makefile.am:
Enable "make distcheck" to work
sql/share/Makefile.am:
Enable "make distcheck" to work
support-files/Makefile.am:
Enable "make distcheck" to work
cmd-line-utils/readline/complete.c:
Added a cast.
dbug/my_main.c:
Added an include to avoid implicit declaration of
my_thread_global_init()
include/my_global.h:
undef cannot be used on this predefined name.
Since it is a custom fix for gcc 2.8.0, let's make it only
effective in that case.
include/my_sys.h:
Added a new type, TYPE_NOT_SET.
myisam/ft_boolean_search.c:
Added casts.
myisam/mi_key.c:
Added cast.
myisam/mi_open.c:
Added cast.
Changed function types.
myisam/mi_test1.c:
Added cast.
myisam/myisamchk.c:
Added cast.
myisam/myisamdef.h:
Changed function type.
myisam/myisampack.c:
Added casts.
myisam/sp_key.c:
Added cast.
mysys/mf_iocache.c:
Fixed invalid use of 0 to info->type. According to comment it
should not have been set, but in earlier code by setting it
to 0 would have been same as setting it to READ_CACHE. This
probably was not desired, potential bug.
server-tools/instance-manager/instance_options.cc:
Fixed a typo.
server-tools/instance-manager/protocol.cc:
Changed enum to int.
Changed char to uchar.
Added casts.
sql/mysql_priv.h:
Bit overflow.
sql/sql_base.cc:
Removed unused label. The code below label was unused too, because
there is a return just before.
sql/sql_parse.cc:
Removed unneccessary extra argument.
cmd-line-utils/readline/bind.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/callback.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/compat.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/complete.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/display.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/funmap.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/histexpand.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/histfile.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/history.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/histsearch.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/input.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/isearch.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/keymaps.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/kill.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/macro.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/mbutil.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/misc.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/nls.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/parens.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/readline.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/rltty.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/savestring.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/search.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/shell.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/signals.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/terminal.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/text.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/tilde.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/undo.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/util.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/vi_mode.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/xmalloc.c:
Include local config_readline.h instead of config.h
cmd-line-utils/libedit/chared.c:
Re-apply vva's fix:
cmd-line-utils/libedit/chared.c@1.4, 2004-08-31 17:50:59+05:00, vva@eagle.mysql.r18.ru
discarded using of uint because it's undefined on qnx
Include <sys/ttydefaults.h> for CodeWarrior and CTRL define
cmd-line-utils/libedit/readline/readline.h:
Include <sys/ttydefaults.h> for CodeWarrior and CTRL define
files - include config.h instead (compile fix for FreeBSD and AIX
4.3/5.2)
cmd-line-utils/libedit/makelist.sh:
- don't include sys.h directly in the autogenerated files - include
config.h instead (compile fix for FreeBSD and AIX 4.3/5.2)
Include readline/readline.h earlier, to avoid redifinition of term.h macros on AIX 5.2
search.c:
FreeBSD needs <sys/types.h> to get 'off_t' defined
cmd-line-utils/libedit/search.c:
FreeBSD needs <sys/types.h> to get 'off_t' defined
cmd-line-utils/libedit/readline.c:
Include readline/readline.h earlier, to avoid redifinition of term.h macros on AIX 5.2
- Changed makelist.sh
- Bump up required version of autoconf
- Use new style to init mutex in my_thr_init
cmd-line-utils/libedit/makelist.sh:
Changed file so it works also on windows cr/lf files.
configure.in:
Bump up required AC version number so that correct version of aclocal and autoconf is selected.
include/my_pthread.h:
Use PTHREAD_MUTEX_ADAPTIVE_NP to see if "fast" mutexes are available
Remove "errorcheck" mutexes, since they are never used.
mysys/my_thr_init.c:
Use new style functions to init mutex if PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP is defined
Add comment what mutex "kind" means
- Segfault because of passing a 64-bit pointer to 32 bit integer.
- Add new include config_readline.h which will calculate some new defines
based on what is found in config.h
- This file was originally included in readline 4.3 as config.h.in, only the part that
makes new defines have been moved to this file.
cmd-line-utils/readline/bind.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/callback.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/complete.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/display.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/funmap.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/histexpand.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/histfile.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/history.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/histsearch.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/input.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/isearch.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/keymaps.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/kill.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/macro.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/mbutil.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/misc.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/nls.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/parens.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/readline.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/rltty.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/search.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/shell.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/signals.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/terminal.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/text.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/tilde.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/undo.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/util.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/vi_mode.c:
Include local config_readline.h instead of config.h
cmd-line-utils/readline/xmalloc.c:
Include local config_readline.h instead of config.h
It also did not write ~/.mysql_history file. The problem was in alloc(),
which probably does not work on HP-UX-11.23 ia64 platform. Changed some
macros into functions for better maintenance and debugging.
(for octane2)
included term.h if there isn't termcap.h in cmd-line-utils/libedit/term.c
cmd-line-utils/libedit/term.c:
fixed Bug #5589 "libedit compile failure in term.c"
(for octane2)
included term.h if there isn't termcap.h
2. changed key_* to el_ley_* in the libedit key.h
(because it's in the conflict with the aix definitions)
3. use libedit_term.h instead of term.h in the cmd-line-utils/libedit/el.h
4. added definition of MIN in the cmd-line-utils/libedit/read.c
(if it wasn't defined yet)
5. discarded definition of SUNOS macro from configure.in
(now we don't include term.h in the el.h at all)
BitKeeper/deleted/.del-term.h~23716a5310508e0:
Delete: cmd-line-utils/libedit/term.h
cmd-line-utils/libedit/Makefile.am:
discarded term.h from the distribution
cmd-line-utils/libedit/el.c:
changed
key_init -> el_key_init
key_end -> el_key_end
cmd-line-utils/libedit/el.h:
change
#include "term.h"
to
#include "libedit_term.h"
cmd-line-utils/libedit/key.c:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
cmd-line-utils/libedit/key.h:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
cmd-line-utils/libedit/map.c:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
cmd-line-utils/libedit/read.c:
1. added definition of MIN
2. fixed problems with undefined uint
3. changed key_get to el_key_get
cmd-line-utils/libedit/term.c:
1. discarded #include "term.h" at all
2. changed functions key_* to el_key_*
3. add declaration of el_key__decode_str
cmd-line-utils/libedit/tty.c:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
configure.in:
discarded definition of SUNOS macro
(libedit doesn't require it anymore)
