Commit graph

570 commits

Author SHA1 Message Date
unknown
371301d786 configure.in:
4.1.7 leaves gamma.


configure.in:
  4.1.7 leaves gamma.
2004-10-22 17:25:02 -05:00
unknown
2f6dc4705d Add extra include on OSF1 (to let c++ program use stdint.h) 2004-10-22 15:20:15 +00:00
unknown
6357bc75b9 workaround for Sun Forte compile problem for ndb on solaris 2.10 2004-10-21 14:11:20 +00:00
unknown
560d7bcdd0 Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
Docs/Support/texi2html:
  Auto merged
innobase/trx/trx0rec.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_acl.cc:
  Keep old code
2004-10-20 16:24:28 +03:00
unknown
46b36a3d8c bumped up ndb version to 3.5.3 2004-10-18 14:14:21 +00:00
unknown
9f4d19f995 the $^ directive is a GNU make extension and not really needed here
so lets get rid of it (Bug #6112)
2004-10-15 15:33:30 +02:00
unknown
fc75966604 TAG:
Tagged ChangeSet 1.2091 as mysql-4.1.6
configure.in:
  Updated version string to 4.1.7


configure.in:
  Updated version string to 4.1.7
2004-10-15 00:55:50 -05:00
unknown
bbab9ec678 Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e:
  Auto merged
Build-tools/mysql-copyright-2:
  Auto merged
acinclude.m4:
  Auto merged
client/mysqladmin.c:
  Auto merged
client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/myisam.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
ltmain.sh:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/fsp/fsp0fsp.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/pars/pars0opt.c:
  Auto merged
innobase/row/row0row.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/ut/ut0dbg.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_close.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_locking.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/r/delete.result:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
Build-tools/mysql-copyright:
  Merge with 4.0 (too most of the code from 4.0)
Makefile.am:
  merge
client/mysql.cc:
  Used 4.1 code
configure.in:
  merge
innobase/os/os0file.c:
  merge
innobase/row/row0mysql.c:
  merge
mysql-test/r/ctype_latin1_de.result:
  merge
mysql-test/r/flush_table.result:
  merge
mysql-test/r/func_str.result:
  merge
mysql-test/r/handler.result:
  merge
mysql-test/r/multi_update.result:
  merge
mysql-test/r/type_timestamp.result:
  Removed testing of 'new' mode, as this is only relevant for 4.0
mysql-test/r/update.result:
  merge
mysql-test/t/delete.test:
  merge
mysql-test/t/flush_table.test:
  merge
mysql-test/t/func_str.test:
  merge
mysql-test/t/handler.test:
  merge
mysql-test/t/multi_update.test:
  merge
mysql-test/t/type_timestamp.test:
  Removed testing of 'new' mode, as this is only relevant for 4.0
mysql-test/t/update.test:
  merge
mysys/errors.c:
  merge
mysys/my_fstream.c:
  merge
mysys/my_pread.c:
  merge
mysys/my_write.c:
  merge
mysys/mysys_priv.h:
  merge
scripts/mysqlhotcopy.sh:
  merge
sql/field.cc:
  Keep code from 4.1
sql/field.h:
  Keep code from 4.1
sql/ha_innodb.cc:
  Don't merge lock code from 4.0; Heikki will look at this
sql/ha_myisam.cc:
  merge
sql/handler.cc:
  merge
sql/item_cmpfunc.cc:
  merge
sql/item_cmpfunc.h:
  merge
sql/item_strfunc.cc:
  merge
sql/mysql_priv.h:
  merge
sql/mysqld.cc:
  merge
sql/protocol.cc:
  merge
sql/records.cc:
  merge
sql/repl_failsafe.cc:
  merge
mysql-test/r/lock_multi.result:
  merge
mysql-test/t/ctype_latin1_de.test:
  merge
mysql-test/t/func_if.test:
  merge
mysql-test/t/lock_multi.test:
  merge
sql/repl_failsafe.h:
  merge
  Remove unnessessary header protection
sql/slave.h:
  merge
sql/sql_acl.cc:
  merge
sql/sql_base.cc:
  merge
sql/sql_cache.cc:
  auto merge
sql/sql_class.cc:
  merge
sql/sql_class.h:
  merge
sql/sql_delete.cc:
  merge
sql/sql_handler.cc:
  Get new HANDLER code into 4.1
sql/sql_parse.cc:
  Keep old file
sql/sql_repl.cc:
  merge
sql/sql_repl.h:
  merge
sql/sql_show.cc:
  merge
sql/sql_table.cc:
  merge
sql/sql_union.cc:
  Applied the examine_rows bug fix from 4.0 by hand
sql/sql_update.cc:
  New multi-update-grant-check code from 4.0
sql/sql_yacc.yy:
  New multi-update-grant-check code from 4.0
sql/stacktrace.c:
  merge
sql/table.h:
  merge
2004-10-06 19:14:33 +03:00
unknown
2f3212910f last try didnt work 2004-10-05 07:48:51 +00:00
unknown
9d2c186c51 bumped up version to 3.5.2
removed staus flag
2004-10-05 06:49:11 +00:00
unknown
85d98034b4 added --without-man option similar to --without-docs
(part of BUG#5379)
2004-09-26 15:27:13 +02:00
unknown
6876d28c42 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
2004-09-24 11:07:55 +00:00
unknown
19b92eecfc - Bumped up version number: 4.1.5 -> 4.1.6 (still keeping the "gamma"
label for now)
 - tagged ChangeSet 1.2015.1.10 as "mysql-4.1.5"


configure.in:
   - Bumped up version number: 4.1.5 -> 4.1.6 (still keeping the "gamma"
     label for now)
2004-09-21 08:58:44 +02:00
unknown
d159d111da Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc04.(none):/space/mysql/mysql-4.1-ndb


acinclude.m4:
  Auto merged
configure.in:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/Makefile.am:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-09-16 09:21:49 +02:00
unknown
49dc3a5301 logging_ok:
Logging to logging@openlogging.org accepted
SCI_Transporter.hpp, SCI_Transporter.cpp:
  Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
TransporterRegistry.cpp:
  Some fixes for wrap around needed plus DBUG handling
TCP_Transporter.hpp, TCP_Transporter.cpp:
  Added DBUG statements
SHM_Transporter.hpp, SHM_Transporter.cpp:
  Fixed SHM Transporter
SHM_Buffer.hpp:
  Fixed SHM Buffer to handle wrap around properly
IPCConfig.cpp:
  Fixed up config of SCI
SocketServer.cpp:
  Added DBUG support for SocketServer threads
ConfigInfo.cpp:
  Config changes for SCI
TransporterDefinitions.hpp, mgmapi_config_parameters.h:
  SCI fixes
Makefile.am, type_ndbapitools.mk.am, type_ndbapitest.mk.am:
  Added SCI library path to Makefiles
configure.in:
  Fixed small bug with shared mem and sci together in configure
acinclude.m4:
  Added possibility of providing SCI library path in confgure


acinclude.m4:
  Added possibility of providing SCI library path in confgure
configure.in:
  Fixed small bug with shared mem and sci together in configure
ndb/config/type_ndbapitest.mk.am:
  Added SCI library path to Makefiles
ndb/config/type_ndbapitools.mk.am:
  Added SCI library path to Makefiles
ndb/src/cw/cpcd/Makefile.am:
  Added SCI library path to Makefiles
ndb/src/kernel/Makefile.am:
  Added SCI library path to Makefiles
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  Added SCI library path to Makefiles
ndb/src/mgmsrv/Makefile.am:
  Added SCI library path to Makefiles
sql/Makefile.am:
  Added SCI library path to Makefiles
ndb/src/common/transporter/Makefile.am:
  Added SCI library path to Makefiles
ndb/include/mgmapi/mgmapi_config_parameters.h:
  SCI fixes
ndb/include/transporter/TransporterDefinitions.hpp:
  SCI fixes
ndb/src/mgmsrv/ConfigInfo.cpp:
  Config changes for SCI
ndb/src/common/util/SocketServer.cpp:
  Added DBUG support for SocketServer threads
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Fixed up config of SCI
ndb/src/common/transporter/SHM_Buffer.hpp:
  Fixed SHM Buffer to handle wrap around properly
ndb/src/common/transporter/SHM_Transporter.cpp:
  Fixed SHM Transporter
ndb/src/common/transporter/SHM_Transporter.hpp:
  Fixed SHM Transporter
ndb/src/common/transporter/TCP_Transporter.cpp:
  Added DBUG statements
ndb/src/common/transporter/TCP_Transporter.hpp:
  Added DBUG statements
ndb/src/common/transporter/TransporterRegistry.cpp:
  Some fixes for wrap around needed plus DBUG handling
ndb/src/common/transporter/SCI_Transporter.cpp:
  Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
ndb/src/common/transporter/SCI_Transporter.hpp:
  Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-09-15 20:41:49 +02:00
unknown
150d987d71 Fix warnings reported by aclocal > 1.8 (Underquoted definition of ...)
acinclude.m4:
  Fix warnings reported by aclocal > 1.8
configure.in:
  Fix warnings reported by aclocal > 1.8
2004-09-15 02:15:11 +04:00
unknown
a791904678 Persian collation, contibuted by Jody McIntyre 2004-09-13 12:07:01 +05:00
unknown
d4e230afad configure.in:
bumped up version to 3.5.1


configure.in:
  bumped up version to 3.5.1
2004-09-10 17:29:10 +00:00
unknown
8eb1db61a0 configure.in:
Updated to 4.0.22


configure.in:
  Updated to 4.0.22
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-09-10 00:08:12 +02:00
unknown
fd07116e2f merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/t/ndb_blob.test:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
2004-09-06 07:43:31 +02:00
unknown
6a5f9b4139 define macro "DEFINE_ALL_CHARACTER_SETS" in the configure.in completely
configure.in:
  define macro "DEFINE_ALL_CHARACTER_SETS" completely
2004-09-04 00:28:48 +05:00
unknown
c1f297058d Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1


configure.in:
  Auto merged
2004-09-03 19:32:18 +05:00
unknown
37aad6bb4f 1. discarded term.h from the distribution
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)
2004-09-03 17:47:36 +05:00
unknown
23ae3c1707 Correct a typo error: cpp symbol is "BIG_TABLES", not "BIG_FILES"
(backport from 4.1).


configure.in:
  Defining "BIG_TABLES" works around a problem with the Sun Forte
  compiler for Solaris on x86 platforms: improper handling of "long long".
  Error shows up on the "limit_rows_found" variable in test "union".
  Old "BIG_FILES" was a typing error (backport from 4.1).
2004-09-01 12:36:01 +02:00
unknown
069c47d260 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


acinclude.m4:
  Auto merged
configure.in:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-09-01 04:55:16 +02:00
unknown
fe937a2b1b Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Auto merged
BitKeeper/deleted/.del-convert.cc~437689acaffb7446:
  Auto merged
BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796:
  Auto merged
BitKeeper/deleted/.del-message.mc:
  Delete: VC++Files/sql/message.mc
BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
  Auto merged
BitKeeper/deleted/.del-win1251.conf~b6bb6681f02917b6:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqladmin.c:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlmanager-pwgen.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/m_string.h:
  Auto merged
include/my_getopt.h:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
strings/strto.c:
  Auto merged
strings/strtol.c:
  Auto merged
strings/strtoll.c:
  Auto merged
strings/strtoull.c:
  Auto merged
support-files/Makefile.am:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
2004-09-01 04:12:09 +03:00
unknown
d6493dbefe - bumped up version number in configure.in to "4.1.5-gamma"
- tagged ChangeSet@1.2013 as "mysql-4.1.4"


configure.in:
   - bumped up version number in configure.in to "4.1.5-gamma"
2004-08-31 15:53:26 +02:00
unknown
52df5f5b5a Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1


cmd-line-utils/libedit/Makefile.am:
  Auto merged
configure.in:
  Auto merged
2004-08-31 18:53:24 +05:00
unknown
8bf3885883 fixed two compiling bugs for libedit
acinclude.m4:
  added macro to check if dirent.d_namlen is defined
cmd-line-utils/libedit/config.h:
  added define for __attribute__
cmd-line-utils/libedit/readline.c:
  checked STRUCT_DIRENT_HAS_D_NAMLEN instead of
  old enumeration of problem platforms
configure.in:
  added checking if dirent has d_namlen member field
2004-08-31 18:29:01 +05:00
unknown
5bafde9ab0 Correct a typo error: cpp symbol is "BIG_TABLES", not "BIG_FILES".
configure.in:
  Defining "BIG_TABLES" works around a problem with the Sun Forte 
  compiler for Solaris on x86 platforms: improper handling of "long long".
  Error shows up on the "limit_rows_found" variable in test "union".
  Old "BIG_FILES" was a typing error.
2004-08-30 13:25:22 +02:00
unknown
52581fb604 configure.in:
Ascii was written twice


configure.in:
  Ascii was written twice
2004-08-30 11:36:26 +05:00
unknown
434d385ac1 Compile all charset conversion tables if --with-extra-charsets=all
or --with-extra-charsets=complex is given.
2004-08-27 21:17:29 +05:00
unknown
8bb0aaa516 Merge
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
ndb/src/common/mgmcommon/ConfigInfo.hpp:
  Auto merged
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
  Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
  SCCS merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  SCCS merged
2004-08-24 22:35:14 +00:00
unknown
6564806be7 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear


acinclude.m4:
  Auto merged
configure.in:
  Auto merged
2004-08-25 01:02:07 +05:00
unknown
1e91f015ca Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/mgmsrv/Services.cpp:
  Auto merged
configure.in:
  Auto merged
acinclude.m4:
  Auto merged
2004-08-24 21:07:08 +02:00
unknown
f8f627d050 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear_v2


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
2004-08-24 23:38:31 +05:00
unknown
99538ee3af fixed AC_DEFINE's for libedit-2.6.7
acinclude.m4:
  fixed AC_DEFINE(HAVE_HIST_ENTRY)
configure.in:
  fixed new AC_DEFINE's
2004-08-24 23:32:58 +05:00
unknown
b4727f7609 added skipped macro for new libedit-2.6.7 in configure.in
configure.in:
  added skipped macro for new libedit-2.6.7
2004-08-24 21:01:11 +05:00
unknown
af043308a9 upgrade to libedit-2.6.7
(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
2004-08-24 20:41:41 +05:00
unknown
de225e637a fixed :
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
2004-08-24 19:23:23 +05:00
unknown
f7e31ee94c merge
configure.in:
  Auto merged
mysql-test/t/ndb_blob.test:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-08-24 13:29:11 +02:00
unknown
8f405690f1 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/mysql/4.1


configure.in:
  Auto merged
2004-08-23 12:31:03 -07:00
unknown
8dd14b45e3 Changing version information.
configure.in:
  Update for gamma status.
2004-08-23 12:28:28 -07:00
unknown
1091fe23f6 further simplifications of ndb config and aligned usage of mysql datadir in ndb
acinclude.m4:
  added configure switch for ndb base port
configure.in:
  ndb gcc compile now works with -fno-implicit-templates
mysql-test/ndb/ndb_config_2_node.ini:
  further simplifications of config, removed need for [COMPUTER] section
ndb/include/ndb_global.h:
  moved this to configure option
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  changed config to take to take strings instead of ints
ndb/src/common/mgmcommon/ConfigInfo.hpp:
  changed config to take to take strings instead of ints
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
  string to number convert to accept "0x" prefix on numbers
ndb/src/common/mgmcommon/InitConfigFileParser.hpp:
  movet convert function to public and static
ndb/src/common/mgmcommon/LocalConfig.cpp:
  define NDB_BASE_PORT now string instead of number
ndb/src/common/mgmcommon/Makefile.am:
  added mysqld defines in mgmcommon to be able to configure default data dir to be the same as for mysqld
2004-08-23 16:29:04 +00:00
unknown
d40349fbf9 bdb bugfix: LTLIBOBJS didn't take --disable-shared into account
fix for bdb not ending up into libmysqld.a


bdb/dist/configure.ac:
  bdb bugfix: LTLIBOBJS didn't take --disable-shared into account
configure.in:
  build bdb with --disable-shared for libdb.a to go into libmysqld.a
libmysqld/examples/Makefile.am:
  incorrect "bugfix" undone. bdb should be in libmysqld.a
2004-08-23 13:55:40 +02:00
unknown
945625ebaa manually merged
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0log.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/ut0dbg.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/ut/ut0dbg.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/conf_to_src.c:
  Auto merged
libmysql/dll.c:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/mi_key.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_uint.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2004-08-18 19:57:55 +02:00
unknown
2d8f4a61bf Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/tina-4.1


acinclude.m4:
  Auto merged
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Auto merged
configure.in:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2004-08-13 16:27:17 -07:00
unknown
9003c146b8 - manual merge 2004-08-13 16:25:23 +02:00
unknown
621506815f Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8
Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT:
this fixes a rpl000001 problem on our Powermac G5 machine (popping after an upgrade from 10.3.4 to
10.3.5) and is expected to fix 
BUG#2030 "relay bin log on slave resets multiple times a second"
(i.e. under some Mac OS X Panther versions, mysqld receives many SIGHUP and SIGQUIT).
So this fix is more a problem-hider than a real understanding of why mysqld receives so many signals.
Note that we saw other problems on this OS where mysqld reacts to Ctrl-Z but apparently only once,
where using SSL seems to make the problem more frequent...


configure.in:
  Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8
  Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT.
sql/mysqld.cc:
  optionally ignore SIGHUP and SIGQUIT, for some Mac OS X Panther versions which send too many of those.
2004-08-13 15:29:47 +02:00
unknown
89987fa104 This is the addition of the CSV engine "aka tina". Its an example engine that works as a plain text file.
acconfig.h:
  Adding HAVE CSV rule
acinclude.m4:
  Build option of csv engine
configure.in:
  Update for building CSV
sql/Makefile.am:
  Added files for CSV build
sql/handler.cc:
  Needed options for CSV to be created.
sql/handler.h:
  CSV type engine enum.
sql/mysql_priv.h:
  Addition of the have_csv_db variable.
sql/mysqld.cc:
  Code to show csv option.
sql/set_var.cc:
  Adding have show variables for both csv and example.
2004-08-12 20:57:18 -07:00