into  trift2.:/MySQL/M41/push-4.1

into  trift2.:/MySQL/M41/push-4.1


myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge.

into  kahlann.erinye.com:/home/df/mysql/build/mtr-4.1

mysql-test/mysql-test-run.pl:
  add --report-features
mysql-test/include/report-features.test:
  test file showing server features for mysql-test-run.pl --report-features

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

  Added --force-restart pseudo server argument to shell version as well


mysql-test/mysql-test-run.sh:
  Added --force-restart pseudo server argument to shell version as well

    Adapt to the different path of the server program, if installation was by RPM.
    Missing in the first changeset for bug#17194.


mysql-test/install_test_db.sh:
  Adapt to the different path of the server program, if installation was by RPM.
  Missing in the first changeset for bug#17194.

into  trift2.:/MySQL/M41/clone-4.1

into  trift2.:/MySQL/M41/clone-4.1

into  mysql.com:/Users/kent/mysql/bk/lic/my41-lic


README:
  Auto merged

  Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.
README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt


README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
BitKeeper/deleted/.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt
scripts/make_binary_distribution.sh:
  Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.

ndb/src/common/portlib/gcc.cpp:
  Fix bug#24023:  Make sure this module always exports some symbol, whether used anywhere or not.

into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191


mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged

mysql-test/r/rename.result:
  Update result.
mysql-test/t/rename.test:
  Remove the race by replacing sleep with a reap.

myisam/sort.c:
  Moved DBUG_PRINT statement to declaration section.

  Create block around DBUG_ENTER late in function


myisam/sort.c:
  Create block around DBUG_ENTER late in function

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.

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

  Raise version number to 4.1.23


configure.in:
  Raise version number to 4.1.23

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint

- 'false' not defined in C, use FALSE instead.


mysys/my_lock.c:
  Fixed error in windows built:
  'false' not defined in C, use FALSE instead.

into  mysql.com:/usr/home/ram/work/bug22913/my41-bug22913


client/mysql.cc:
  Auto merged

We don't check for errors that may occur during data printing.


client/mysql.cc:
  Fix for bug #22913: mysql --quick doesn't report some errors.
    - check for errors after the data output.

into  bodhi.local:/opt/local/work/mysql-4.1-runtime


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

Necessary changes if one of the test scripts is to be used with a RPM installation (bug#17194).

This change handles finding the server and the other programs,
but it does not solve the problem to get a writable "var" directory.
If we want to avoid world-writable directories below "/usr/share/mysql-test" (and we do!), 
any automatic solution would require fixed decisions which may not match the local installation.

For the Perl script, use "--vardir"; for the shell script, create "mysql-test/var" manually.


mysql-test/mysql-test-run.pl:
  Modifications to use this script in a RPM installation (bug#17194):
  - The tests are one level further down, "/usr/share/mysqltest" (vs. "/usr/bin").
  - A "mysql-bench" might not exist.
  - "mysql-test" is owned by root and not world-writable, so "var" must be put somewhere else.
  - The server, "mysqld", is in a different location, "/usr/sbin".
  
  Note that the "--vardir" option must be used in a RPM installation,
  unless "mysql-test" is made writable for the user who runs the tests (not done automatically).
mysql-test/mysql-test-run.sh:
  Necessary changes if this script is to be used with a RPM installation (bug#17194):
  - The tests are one level further down, "/usr/share/mysqltest" (vs. "/usr/bin").
  - The server, "mysqld", is in a different location, "/usr/sbin".
  
  Note that these changes are not sufficient, as the user needs a writable "mysql-test/var" subdirectory.
  Either this is created manually, or the script can not be used.
  An alternative is the corresponding Perl script which supports a "--vardir" option.

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

(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''

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint


mysys/my_chsize.c:
  Auto merged

 - Only read *.pid
 - Only allow it to contain a number 


mysql-test/lib/mtr_io.pl:
  Check that the value read from pidfile is a valid number consisting only of digits
mysql-test/lib/mtr_process.pl:
  Only process .pid files in var/run dir and print a warning if other files are found there.

client/mysqltest.c:
  Make the variables that are referenced from the "command_arg" arrays static to please the NetWare compiler.
  Apparently the arrays can't reference local stack variables.

- Because my_seek actually is capable of returning an error code we should
  exploit that in the best possible way.
- There might be kernel errors or other errors we can't predict and capturing
  the return value of all system calls gives us better understanding of
  possible errors.


mysys/mf_iocache.c:
  - Added check on return value for my_seek
  - Added comments
mysys/my_chsize.c:
  - Added check on return value for my_seek
  - Added comments
mysys/my_lock.c:
  - Added check on return value for my_seek
  - Added comments
mysys/my_seek.c:
  - Added comments

into  mysql.com:/usr/home/ram/work/bug23412/my41-bug23412

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915

If the user has specified --max-connections=N or --table-open-cache=M
options to the server, a warning could be given that some values were
recalculated, and table-open-cache could be assigned greater value.

Note that both warning and increase of table-open-cache were totally
harmless.

This patch fixes recalculation code to ensure that table-open-cache will
be never increased automatically and that a warning will be given only if
some values had to be decreased due to operating system limits.

No test case is provided because we neither can't predict nor control
operating system limits for maximal number of open files.


sql/mysql_priv.h:
  Add constants for table_cache minimum and default values.
sql/mysqld.cc:
  Fix max_connections and table_cache_size re-computation.

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint