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

expression cols.

The problem was that MYSQL_FIELD::org_name was set for MIN() and MAX()
functions (COUNT() is also mentioned in the bug report but was already
fixed).

After this patch for expressions MYSQL_FIELD::name is set to either
expression itself or its alias, and other data origin fields of
MYSQL_FILED (db, org_table, table, org_name) are empty strings.

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

Make Prepared_stmt_count a global status variable, accessible via
SHOW STATUS LIKE 'Prepared_stmt_count';.  Documentation should be
updated.

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

mysql_stmt_affected_rows()

The problem was that affected_rows for prepared statement wasn't updated
in the client library on the error.  The solution is to always update
affected_rows, which will be equal to -1 on the error.

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

The problem was that some functions (namely IN() starting with 4.1, and
CHAR() starting with 5.0) were returning NULL in certain conditions,
while they didn't set their maybe_null flag.  Because of that there could
be some problems with 'IS NULL' check, and statements that depend on the
function value domain, like CREATE TABLE t1 SELECT 1 IN (2, NULL);.

The fix is to set maybe_null correctly.

  Test for base directory when a RPM install corrected

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

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

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

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

  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.

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

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

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

  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

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

  Create block around DBUG_ENTER late in function

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint

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

  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.

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

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

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

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.

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

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