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

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my51-bug34192

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

  
Disable test case for bug 29948, which is causing sporadically
failures in other tests inside mysql_client_test.

	databases from 4.0 server

mysqldump treated a failure to set the results charset as a severe
error.  

Now, don't try to set the charset for the SHOW CREATE TABLE statement,
if remote server's version is earlier than 4.1, which means it 
doesn't support changing charsets.

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

	table with backticks

(Thanks to Lu Jingdong, though I did not take his patch directly, as
it contained a significant flaw.)

It wasn't a backtick/parsing problem.  We merely didn't anticipate
and allocate enough space to handle the optional "#mysql50#" table-
name prefix. 

Now, allocate that extra space in case we need it when we look up 
a legacy table to get its file's name.

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

bug12713.

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

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

   ChangeSet@1.2565, 2008-03-11 20:20:49+01:00
     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.26

   ChangeSet@1.1810.3473.26, 2008-03-11 19:54:35+01:00
   Post fix for
   WL#4203 Reorganize and fix the data dictionary tests of
           testsuite funcs_1

The final fix of
Bug#34532 Some funcs_1 tests do not clean up at end of testing
   and some minor additional modifications are for
happens here

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

into  kaamos.(none):/data/src/opt/mysql-5.0-opt

into  kaamos.(none):/data/src/opt/mysql-5.0-opt

into  kaamos.(none):/data/src/opt/mysql-4.1-opt

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

WL#4203 Reorganize and fix the data dictionary tests of
        testsuite funcs_1
because the goal to fix
Bug#34532 Some funcs_1 tests do not clean up at end of testing
was partially missed.
Some minor additional modifications are for
   WL#4304 Cleanup in funcs_1 tests

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  kaamos.(none):/data/src/opt/mysql-5.1-opt

into  riffraff.(none):/data0/martin/bug34367/my51-bug34367-pushee

into  mysql.com:/home/hf/work/32801/my51-32801

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  mysql.com:/misc/mysql/34749/51-34749

into  mysql.com:/misc/mysql/34749/50-34749

into  mysql.com:/misc/mysql/34749/51-34749

into  mysql.com:/misc/mysql/29645/51-29645

into  mysql.com:/misc/mysql/29645/50-29645