Commit a3c5169d authored by tsmith@sita.local's avatar tsmith@sita.local
Browse files

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint

into  sita.local:/Users/tsmith/m/bk/maint/50
parents 5aba3210 d07a83ea
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
--require r/true.require
disable_query_log;
select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") as "TRUE";
enable_query_log;
if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") = 0`)
{
  skip Need windows;
}
+2153 −0

File added.

Preview size limit exceeded, changes collapsed.

+2155 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/r/windows_shm.result

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line
mysqld is alive
End of 5.0 tests.
+1 −0
Original line number Diff line number Diff line
--loose-enable-named-pipe
Loading