bzr push into mysql-5.0-bugteam branch (ignacio.galarza:2722 to 2723) Bug#29248

[Ignacio Galarza]

 2723 Ignacio Galarza	2009-04-01 [merge]
      Bug#29248 - MyISAMchk & MyISAMpack failing with * wildcard on Windows platform
      - Link against setargv.obj for wild-card expansion.
modified:
  myisam/CMakeLists.txt

 2722 Bernt M. Johnsen	2009-04-01 [merge]
      Bug 43355 merged from 5.1 gca
modified:
  mysql-test/r/ps_1general.result
  mysql-test/r/sp.result
  mysql-test/t/ps_1general.test
  mysql-test/t/sp.test

=== modified file 'myisam/CMakeLists.txt'
--- a/myisam/CMakeLists.txt	2007-08-03 19:51:37 +0000
+++ b/myisam/CMakeLists.txt	2009-03-31 21:48:45 +0000
@@ -41,6 +41,8 @@ TARGET_LINK_LIBRARIES(myisamlog myisam m
 ADD_EXECUTABLE(myisampack myisampack.c)
 TARGET_LINK_LIBRARIES(myisampack myisam mysys debug dbug strings zlib wsock32)
 
+SET_TARGET_PROPERTIES(myisamchk myisampack PROPERTIES LINK_FLAGS "setargv.obj")
+
 IF(EMBED_MANIFESTS)
   MYSQL_EMBED_MANIFEST("myisam_ftdump" "asInvoker")
   MYSQL_EMBED_MANIFEST("myisamchk" "asInvoker")