into  trift2.:/MySQL/M51/win-scripts-5.1

into  trift2.:/MySQL/M51/win-scripts-5.1

into  mysql.com:/home/kent/bk/build/mysql-5.1-build

  Include .pdb files for tools and libraries (bug#35104)

into  trift2.:/MySQL/M50/win-scripts-5.0

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean

into  five.local.lan:/work/trees/mysql-5.0-build-src-clean

into  amd64.(none):/src/bug27101/my51-bug27101

into  amd64.(none):/src/bug27101/my51-bug27101

- Make sure mysqlhotcopy doesn't create unrestorable slaves.

ChangeSet@1.2561, 2008-03-07 17:44:03+01:00, mleich@five.local.lan +132 -0
  Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
  into  five.local.lan:/work/merge/mysql-5.1-funcs_1
  MERGE: 1.1810.3473.24

ChangeSet@1.1810.3473.24, 2008-03-07
  WL#4203 Reorganize and fix the data dictionary tests of
          testsuite funcs_1

  1. Adjustment of expected results to modified server properties
  2. Add some tests of information_schema views
  3. Minor corrections and improvements

into  five.local.lan:/work/merge/mysql-5.1-funcs_1

        testsuite funcs_1
1. Fix the following bugs
   Bug#30440 "datadict" tests (all engines) fail: Character sets depend on configuration
      Solution: Test variants charset_collation_* adjusted to different builds
   Bug#32603 "datadict" tests (all engines) fail in "community" tree: "PROFILING" table
      Solution: Excluding "PROFILING" table from queries
   Bug#33654 "slow log" is missing a line
      Solution: Unify the content of the fields TABLES.TABLE_ROWS and
                STATISTICS.CARDINALITY within result sets
   Bug#34532 Some funcs_1 tests do not clean up at end of testing
      Solution: DROP objects/reset global server variables modified during testing
                + let tests missing implementation end before loading of tables
   Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
      Solution: Cut <engine>__datadict tests into smaller tests + generate new results.
   Bug#33599 INFORMATION_SCHEMA.STATISTICS got a new column INDEX_COMMENT: tests fail (2)
      Generation of new results during post merge fix
   Bug#33600 CHARACTER_OCTET_LENGTH is now CHARACTER_MAXIMUM_LENGTH * 4
      Generation of new results during post merge fix
   Bug#33631 Platform-specific replace of CHARACTER_MAXIMUM_LENGTH broken by 4-byte encoding
      Generation of new results during post merge fix
      + removal of platform-specific replace routine (no more needed)
2. Restructure the tests
   - Test not more than one INFORMATION_SCHEMA view per testscript
   - Separate tests of I_S view layout+functionality from content related to the
     all time existing databases "information_schema", "mysql" and "test"
   - Avoid storage engine related variants of tests which are not sensible to
     storage engines at all.
3. Reimplement or add some subtests + cleanup
   There is a some probability that even the reviewed changeset
   - does not fix all bugs from above   or
   - contains new bugs which show up on some platforms <> Linux or on one of
     the various build types
4. The changeset contains fixes according to
   - one code review
   - minor bugs within testing code found after code review (accepted by reviewer)
   - problems found during tests with 5.0.56 in build environment

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build

	field names

Add a test that proves the bug is fixed.  This doesn't add any
new server code.

into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/build/5.1

into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/bug-31736/5.1

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build

grant warnings on embedded server.

The DBUG code emits the current value of the proc_info member of THD,
which may be set to NULL.  It was wrong to dereference that value
with the format string %s without verifying that it was valid.

Now, insert an inline test that substitutes the string "(null)" for
NULL pointers.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build

The cause of the crash is an assertion failure that we do not emit 
an error message (grant not found) and then return "ok".  The 
assertion is valid, and we were ignoring the buggy behavior prior 
to the "Diagnostics" result-verification.

Use an error handler to mutate innocuous missing-grant errors, when 
removing routines, into warnings.

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/mysql-5.1

into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt

into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime

READ_ONLY token was accidentally placed into wrong place
('ident' rule). The proper place is in the 'keyword_sp' rule.

The manual should be re-generated after this patch, because
the manual depends on the 'keyword_sp' rule.

into  alf.(none):/src/macro_bugs/my51-macro_bugs

- Mistaken macro defintions cause mysys to read packets in the wrong order.

into  buzz.(none):/home/davi/mysql-5.1-runtime

must match the order which they were declared in the class definition. 

into  alf.(none):/src/macro_bugs/my51-macro_bugs