database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


BitKeeper/deleted/.del-not_windows.inc:
  Delete: mysql-test/include/not_windows.inc
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl_flush_tables.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
mysql-test/r/query_cache.result:
  Resolve conflict
This commit is contained in:
unknown
2005-08-04 12:49:23 -07:00
parent 2b41471429 1beb95e3e4
commit 1f0c2ab3fc
8 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/not_windows.inc
View File

@ -1,4 +1,4 @@
--require r/true.require
--disable_query_log;
disable_query_log;
select convert(@@version_compile_os using latin1) NOT IN ("Win32","Win64","Windows") as "TRUE";
--enable_query_log;
enable_query_log;