into  naruto.:C:/cpp/bug17489/my51-bug17489


mysql-test/t/windows.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged