Commit graph

743 commits

Author SHA1 Message Date
unknown
9be5d51809 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build


configure.in:
  SCCS merged
2007-03-14 14:29:23 +01:00
unknown
0f7f7ff845 configure.in:
Added test for sched_yield() possibly in -lposix4 on Solaris


configure.in:
  Added test for sched_yield() possibly in -lposix4 on Solaris
2007-03-14 14:27:46 +01:00
unknown
6f83533440 configure.in:
Restored accidently removed line to check for zlib


configure.in:
  Restored accidently removed line to check for zlib
2007-03-12 21:27:07 +01:00
unknown
d4d8d132eb Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build


include/Makefile.am:
  Auto merged
2007-03-12 13:15:11 +01:00
unknown
32b370bb7f Makefile.am, configure.in, mysys.dsp:
Removed unused files
.del-my_winsem.c:
  Delete: mysys/my_winsem.c
.del-my_semaphore.c:
  Delete: mysys/my_semaphore.c
.del-my_semaphore.h:
  Delete: include/my_semaphore.h


BitKeeper/deleted/.del-my_semaphore.c:
  Delete: mysys/my_semaphore.c
BitKeeper/deleted/.del-my_semaphore.h:
  Delete: include/my_semaphore.h
BitKeeper/deleted/.del-my_winsem.c:
  Delete: mysys/my_winsem.c
VC++Files/mysys/mysys.dsp:
  Removed unused files
configure.in:
  Removed unused files
include/Makefile.am:
  Removed unused files
mysys/Makefile.am:
  Removed unused files
2007-03-12 13:12:42 +01:00
unknown
774cddae33 Raise version number after cloning 4.0.30 2007-02-09 17:08:37 +01:00
unknown
454c763c6b Fix for configure to detect library correctly.
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.
2007-01-22 02:32:07 +02:00
unknown
23bd0ead25 Moving version-script to acinclude.m4 2007-01-19 17:34:47 -08:00
unknown
8f16a25556 Added version script information to actually version the symbols.
ndb/src/libndb.ver.in:
  BitKeeper file /home/mtaylor/src/mysql-4.1-maint/ndb/src/libndb.ver.in
2007-01-18 16:21:43 -08:00
unknown
af3d6c48fb Adding support for versioned libndbclient.so. bug #13522
configure.in:
  Added variables to support ndbclient library versioning.
  Set version to 1.0.0 for 4.1
ndb/src/Makefile.am:
  Making use of new variables. Adding support for versioned libraries.
2007-01-18 13:30:01 -08:00
unknown
7b2b2231a2 Raise version number after cloning 4.0.29 2007-01-18 16:41:32 +01:00
unknown
0152471f5a Raise version number after cloning 4.0.28 2007-01-03 12:08:59 +01:00
unknown
190a79c7f0 configure.in:
Don't build server when configured --without-server (bug#23973)


configure.in:
  Don't build server when configured --without-server (bug#23973)
2007-01-01 07:22:57 +01:00
unknown
8d6f67f326 gen_rec.awk:
Fix undefined behaviour.
Many files:
  Reenabled build outside ource tree


bdb/dist/gen_rec.awk:
  Fix undefined behaviour.
acinclude.m4:
  Reenabled build outside ource tree
configure.in:
  Reenabled build outside ource tree
libmysql_r/Makefile.am:
  Reenabled build outside ource tree
libmysqld/Makefile.am:
  Reenabled build outside ource tree
ndb/config/common.mk.am:
  Reenabled build outside ource tree
ndb/config/type_kernel.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapi.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitest.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitools.mk.am:
  Reenabled build outside ource tree
ndb/config/type_util.mk.am:
  Reenabled build outside ource tree
ndb/src/kernel/Makefile.am:
  Reenabled build outside ource tree
2006-11-27 18:29:50 +01:00
unknown
cb80733a89 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191


configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/t/rename.test:
  choose one of the race problem solutions. It was solved
  differently in -runtime and mainstream
2006-11-10 15:05:38 +03:00
unknown
e1a722b2d3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


configure.in:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
myisam/sort.c:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/innodb_mysql.test:
  Manual merge.
mysys/mf_iocache.c:
  Manual merge.
2006-11-02 17:27:42 -05:00
unknown
24232ff032 configure.in:
Raise version number to 4.1.23


configure.in:
  Raise version number to 4.1.23
2006-11-02 21:58:42 +01:00
unknown
8a7bc05288 Fix Bug #9191 "TIMESTAMP/from_unixtime() no longer accepts 2^31-1"
(4.1 version, with post-review fixes)
  
  The fix for another Bug (6439) limited FROM_UNIXTIME() to
  TIMESTAMP_MAX_VALUE which is 2145916799 or 2037-12-01 23:59:59 GMT,
  however unix timestamp in general is not considered to be limited 
  by this value. All dates up to power(2,31)-1 are valid.
  
  This patch extends allowed TIMESTAMP range so, that max
  TIMESTAMP value is power(2,31)-1. It also corrects
  FROM_UNIXTIME() and UNIX_TIMESTAMP() functions, so that
  max allowed UNIX_TIMESTAMP() is power(2,31)-1. FROM_UNIXTIME()
  is fixed accordingly to allow conversion of dates up to
  2038-01-19 03:14:07 UTC. The patch also fixes CONVERT_TZ()
  function to allow extended range of dates.
  
  The main problem solved in the patch is possible overflows
  of variables, used in broken-time representation to time_t
  conversion (required for UNIX_TIMESTAMP).


acinclude.m4:
  Add new macro to check time_t range
configure.in:
  Call the macro to check time_t range
include/my_time.h:
  Move time-related defines to proper place.
  Add a function to perform a rough check if
  a TIMESTAMP value fits into the boundaries.
  Note: it is defined as "static inline", as
  otherwise libmysql won't compile (due to the
  way how gcc handles "inline" directive).
mysql-test/r/func_time.result:
  Update test result
mysql-test/r/timezone.result:
  Update test result
mysql-test/r/timezone2.result:
  Update test result
mysql-test/t/func_time.test:
  Add test for Bug#9191 and update test to be consistent
  with new TIMESTAMP boundaries
mysql-test/t/timezone.test:
  Update old tests to be consistent
  with new TIMESTAMP boundaries
mysql-test/t/timezone2.test:
  Update tests for convert_tz to be consistent with new
  TIMESTAMP boundaries
sql/item_timefunc.cc:
  Fix convert_tz to allow dates from the new (extended)
  TIMESTAMP range
sql/mysql_priv.h:
  Move time handling defaults to my_time.h
sql-common/my_time.c:
  Because of increased TIMESTAMP_MAX_VALUE overflows in my_system_gmt_sec()
  became possible. Here we make it safe against the overflows by stepping
  back from the boundary dates which are likely to trigger them.
sql/time.cc:
  Update TIME_to_timestamp to allow conversion of
  extended date range
sql/tztime.cc:
  Fix new (4.1) implementation of broken-down time representation
  to time_t conversion routine to avoid overflows during conversion
  of boundary dates
mysql-test/r/timezone4.result:
  New BitKeeper file ``mysql-test/r/timezone4.result''
mysql-test/t/timezone4-master.opt:
  New BitKeeper file ``mysql-test/t/timezone4-master.opt''
mysql-test/t/timezone4.test:
  New BitKeeper file ``mysql-test/t/timezone4.test''
2006-11-01 16:47:40 +03:00
unknown
9c9bf0aff2 WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaks
BUG#23427 incompatible ABI change in 5.0.26?
   - Use the icheck tool if avaliable and compare the current mysql.h to a version
controlled reference file 


BitKeeper/etc/ignore:
  Added include/check_abi include/mysql_h.ic to the ignore list
configure.in:
  Look for icheck in configure
include/Makefile.am:
  Add rule to build mysql_h.ic if icheck is avaliable
  Add rule to compare mysql_h.ic to the version
  controlled reference file mysql_h_abi.ic
include/mysql.h:
  Add comment about taking care when editing mysql.h
  Add example how to add reserved fiels in the structs to
  allow for features to be added without breaking ABI
include/mysql_h_abi.ic:
  Add new file describing the libmysqlclient ABI used as a reference to detect ABI breakage
2006-10-24 20:32:07 +02:00
unknown
66716f0984 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged
2006-07-29 17:26:06 +02:00
unknown
189a687971 configure.in:
Corrected typo


configure.in:
  Corrected typo
2006-07-29 17:24:48 +02:00
unknown
04d60b3897 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  SCCS merged
2006-07-28 23:40:05 +02:00
unknown
d1fde0f7f5 Makefile.am, configure.in:
Man page for mysqld command move to section 8 (bug#21220)


configure.in:
  Man page for mysqld command move to section 8 (bug#21220)
man/Makefile.am:
  Man page for mysqld command move to section 8 (bug#21220)
2006-07-28 23:12:40 +02:00
unknown
8f3aa7ef02 Increment the version number to 4.1.22, as 4.1.21 is cloned. 2006-07-14 17:55:34 +02:00
unknown
89c7db0cb0 Add a more reliable "getconf" test for Linuxthreads. The later trees should already
have a better test (and so this should be null-merged there).

ALSO!  Make it so that it accepts NPTL as a valid _equivalent_ implementation.
2006-07-07 16:47:57 -04:00
unknown
7b064953d2 Bug#19298 mysqld_safe still uses obsolete --skip-locking parameter
configure.in:
  Replaced skip-locking with newer skip-external-locking option.  Removed extra quotes.
scripts/mysqld_safe-watch.sh:
  Replaced skip-locking with newer skip-external-locking option.
2006-06-27 18:07:23 -04:00
unknown
eecb7c944f configure.in:
Update NDB version as well


configure.in:
  Update NDB version as well
2006-05-24 12:30:34 +02:00
unknown
172ad3dea7 configure.in:
Stepped up to 4.1.22


configure.in:
  Stepped up to 4.1.22
2006-05-24 12:20:17 +02:00
unknown
c982af51da configure.in:
Stepped up to 4.0.28


configure.in:
  Stepped up to 4.0.28
2006-05-11 19:48:57 +02:00
unknown
4fadc75108 configure.in:
Changed version to 4.1.20


configure.in:
  Changed version to 4.1.20
2006-04-29 07:32:12 +02:00
unknown
42624eda4f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new


configure.in:
  Auto merged
2006-04-19 15:41:56 +02:00
unknown
c2ee905473 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


acinclude.m4:
  Auto merged
configure.in:
  Auto merged
2006-04-11 14:49:33 +03:00
unknown
4a2eef5c74 Avoid trying to include <asm/atomic.h> when it doesn't work in C++
code. (Bug #13621)


configure.in:
  Test whether atomic_add() and atomic_sub() are available in C++
  code, since that is primarily where we will be using them.
2006-04-10 21:57:29 +03:00
unknown
0b56e42c53 configure.in:
Check for crypt() in libc first (bug#16478)


configure.in:
  Check for crypt() in libc first (bug#16478)
2006-04-06 00:43:58 +02:00
unknown
67b1ea2486 configure.in:
Cloned off 4.1.18, new release number 4.1.19


configure.in:
  New release number
2006-01-27 12:10:40 +01:00
unknown
5681e7f657 configure.in:
Generated "libmysql.ver" will be in \$(top_builddir)


configure.in:
  Generated "libmysql.ver" will be in \$(top_builddir)
2006-01-27 01:38:05 +01:00
unknown
16d16b9582 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1


configure.in:
  Auto merged
2006-01-18 00:02:25 +04:00
unknown
91b4e6b544 BUG#3074: Unversioned symbols in shared library
libmysqlclient versioning when linked with GNU ld.


BitKeeper/etc/ignore:
  Added libmysql/libmysql.ver to the ignore list
configure.in:
  libmysqlclient versioning when linked with GNU ld.
libmysql/Makefile.shared:
  libmysqlclient versioning when linked with GNU ld.
libmysql/libmysql.ver.in:
  New BitKeeper file ``libmysql/libmysql.ver.in''
2006-01-17 18:51:08 +04:00
unknown
07eca7f962 Increase the version number to 4.1.18 2006-01-17 12:55:30 +01:00
unknown
598cc2db7d Raise the version number (as 4.1.16 has been cloned). 2005-11-30 21:50:09 +01:00
unknown
83bbd30c48 configure.in:
Corrected "include/readline" link for "make distcheck"


configure.in:
  Corrected "include/readline" linke for "make distcheck"
2005-11-19 12:58:22 +01:00
unknown
34bbdf0613 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck


configure.in:
  Auto merged
2005-11-19 11:11:09 +01:00
unknown
58196d39d4 Merge mysql.com:/home/jimw/my/mysql-4.1-12640
into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
2005-11-17 10:59:21 -08:00
unknown
b0701a5c3b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck


Makefile.am:
  Auto merged
configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
2005-11-04 01:15:35 +01:00
unknown
8355bce658 Don't add optimization flags to CFLAGS if the user specified their
own CFLAGS (ditto for CXXFLAGS). (Bug #12640)


configure.in:
  Only add optimization flags when no CFLAGS (and/or CXXFLAGS) were specified.
2005-11-02 18:29:06 -08:00
unknown
ae60d9dd7d - after merge fixes
configure.in:
  Auto merged
support-files/mysql.spec.sh:
   - after-merge fix
2005-10-27 16:53:14 +02:00
unknown
0ffe070cee - Removed obsolete and outdated man page files from the man
directory - these files are now maintained in the mysqldoc
   repository and included in the source distribution during the
   release build. Updated the configure.in script and Makefiles to
   create the man page file list at build time
 - Updated the file list in the RPM spec file to include all currently
   available man pages (this can not be done with wildcards, as
   the man pages are spread across several subpackages. However, RPM
   warns about unpackaged files, so newly added man pages can be 
   spotted)


BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
  Delete: man/isamchk.1.in
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
  Delete: man/isamlog.1.in
BitKeeper/deleted/.del-mysql.1.in~3f4dbf65d31fea3a:
  Delete: man/mysql.1.in
BitKeeper/deleted/.del-mysqlaccess.1.in~2adf98feb44a0dbf:
  Delete: man/mysqlaccess.1.in
BitKeeper/deleted/.del-mysqladmin.1.in~81703c6092a1f769:
  Delete: man/mysqladmin.1.in
BitKeeper/deleted/.del-mysqld.1.in~42371a82eb27d87c:
  Delete: man/mysqld.1.in
BitKeeper/deleted/.del-mysqld_multi.1.in~b3f1c5343b8481e6:
  Delete: man/mysqld_multi.1.in
BitKeeper/deleted/.del-mysqld_safe.1.in~6f34e14acc0c5e0b:
  Delete: man/mysqld_safe.1.in
BitKeeper/deleted/.del-mysqldump.1.in~9520980bfec710d5:
  Delete: man/mysqldump.1.in
BitKeeper/deleted/.del-mysql_fix_privilege_tables.1.in~7422405bb0e64325:
  Delete: man/mysql_fix_privilege_tables.1.in
BitKeeper/deleted/.del-mysql_zap.1.in~df5cf8089b50c624:
  Delete: man/mysql_zap.1.in
BitKeeper/deleted/.del-mysqlshow.1.in~81ce953dcc1a282f:
  Delete: man/mysqlshow.1.in
BitKeeper/deleted/.del-perror.1.in~60d1efcbe71bdd9c:
  Delete: man/perror.1.in
BitKeeper/deleted/.del-replace.1.in~e92dc1aea682608c:
  Delete: man/replace.1.in
configure.in:
   - dynamically add man pages included in the man directory
     (the BK tree only contains one dummy file, the directory is
     populated by the Bootstrap script by copying current man pages
     from the documentation server)
man/Makefile.am:
   - removed hard-coded list of man pages, the list is populated
     during the configure stage. When building from BK, only one
     placeholder file exists. For the release builds, this directory
     is populated by the Bootstrap script, which takes man page files
     from the documentation server.
man/mysqlman.1:
   - removed version number
support-files/mysql.spec.sh:
   - adjusted file list: added man pages that are now part of the
     official source distribution (taken from the documentation
     server)
2005-10-27 14:51:58 +02:00
unknown
0c9997fca7 Merge mysql.com:/home/jimw/my/mysql-4.1-8731b
into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-10-12 13:28:46 -07:00
unknown
e61dea1b36 Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731)


configure.in:
  Fix flags for Darwin 6 and later. Simplify Darwin 7-9 blocks to simply
  be a catch-all for *darwin* so that future Darwin releases get the
  latest flags.
include/config-win.h:
  Define my_sigset() instead of sigset().
include/my_pthread.h:
  Define my_sigset() instead of trying to monkey with sigset(), and favor
  an implementation based on sigaction().
mysys/my_pthread.c:
  Remove pthread_signal(), which is identical to the new my_sigset() macro.
mysys/thr_alarm.c:
  Use my_sigset() instead of sigset().
sql/mysqld.cc:
  Use my_sigset() instead of signal() and sigset(), remove unnecessary
  definition of sigset on __amiga__. Remove unused THREAD_SPECIFIC_SIGPIPE
  code.
  
  A future improvement would be to re-assess the use of sigaction() here
  and convert its usage to use my_sigset().
vio/vio.c:
  Always call fcntl() to initialize flags of socket in initialization to
  avoid problems on systems that don't report the flags on a socket
  correctly right after it has been returned from accept(), such as
  FreeBSD, Mac OS X, and possibly other BSD-derived systems.
vio/viosocket.c:
  If fcntl() fails in vio_blocking(), restore the flags stored in the
  vio struct.
mysql-test/r/wait_timeout.result:
  New BitKeeper file ``mysql-test/r/wait_timeout.result''
mysql-test/t/wait_timeout-master.opt:
  New BitKeeper file ``mysql-test/t/wait_timeout-master.opt''
mysql-test/t/wait_timeout.test:
  New BitKeeper file ``mysql-test/t/wait_timeout.test''
2005-10-11 09:12:12 -07:00
unknown
8b1936fa12 Increase the version number. 2005-10-07 12:50:29 +02:00