Fixed typo that caused compile failure on Mac

Added straight_join to make results predicatable

mysql-test/suite/pbxt/r/range.result:
  Added straight_join to make results predicatable
mysql-test/suite/pbxt/t/range.test:
  Added straight_join to make results predicatable
mysys/my_sync.c:
  Fixed typo

3 files changed, 12 insertions, 9 deletions

diff --git a/mysql-test/suite/pbxt/r/range.result b/mysql-test/suite/pbxt/r/range.result
index 4d5e0c4ab64..2439489581a 100644
--- a/mysql-test/suite/pbxt/r/range.result
+++ b/mysql-test/suite/pbxt/r/range.result
@@ -420,19 +420,19 @@ analyze table t1,t2;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 test.t2	analyze	status	OK
-explain select * from t1, t2  where t1.uid=t2.uid AND t1.uid > 0;
+explain select straight_join * from t1, t2  where t1.uid=t2.uid AND t1.uid > 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	uid_index	uid_index	4	NULL	1	Using where
 1	SIMPLE	t2	ref	uid_index	uid_index	4	test.t1.uid	1	
-explain select * from t1, t2  where t1.uid=t2.uid AND t2.uid > 0;
+explain select straight_join * from t1, t2  where t1.uid=t2.uid AND t2.uid > 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	uid_index	uid_index	4	NULL	1	Using where
 1	SIMPLE	t2	ref	uid_index	uid_index	4	test.t1.uid	1	
-explain select * from t1, t2  where t1.uid=t2.uid AND t1.uid != 0;
+explain select straight_join * from t1, t2  where t1.uid=t2.uid AND t1.uid != 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	uid_index	uid_index	4	NULL	2	Using where
 1	SIMPLE	t2	ref	uid_index	uid_index	4	test.t1.uid	1	
-explain select * from t1, t2  where t1.uid=t2.uid AND t2.uid != 0;
+explain select straight_join * from t1, t2  where t1.uid=t2.uid AND t2.uid != 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	uid_index	uid_index	4	NULL	2	Using where
 1	SIMPLE	t2	ref	uid_index	uid_index	4	test.t1.uid	1	
diff --git a/mysql-test/suite/pbxt/t/range.test b/mysql-test/suite/pbxt/t/range.test
index 8615c76888d..2e4e2b7da12 100644
--- a/mysql-test/suite/pbxt/t/range.test
+++ b/mysql-test/suite/pbxt/t/range.test
@@ -380,10 +380,13 @@ select count(*) from t2;
 
 analyze table t1,t2;
 
-explain select * from t1, t2  where t1.uid=t2.uid AND t1.uid > 0;
-explain select * from t1, t2  where t1.uid=t2.uid AND t2.uid > 0;
-explain select * from t1, t2  where t1.uid=t2.uid AND t1.uid != 0;
-explain select * from t1, t2  where t1.uid=t2.uid AND t2.uid != 0;
+# This part doesn't make sense for pbxt as the result may vary becasue
+# records_in_range() gives same results for t1 and t2.
+# Added straight_join to get predictable results
+explain select straight_join * from t1, t2  where t1.uid=t2.uid AND t1.uid > 0;
+explain select straight_join * from t1, t2  where t1.uid=t2.uid AND t2.uid > 0;
+explain select straight_join * from t1, t2  where t1.uid=t2.uid AND t1.uid != 0;
+explain select straight_join * from t1, t2  where t1.uid=t2.uid AND t2.uid != 0;
 
 select * from t1, t2  where t1.uid=t2.uid AND t1.uid > 0;
 select * from t1, t2  where t1.uid=t2.uid AND t1.uid != 0;
diff --git a/mysys/my_sync.c b/mysys/my_sync.c
index cb0f5794b2e..a2b615a8661 100644
--- a/mysys/my_sync.c
+++ b/mysys/my_sync.c
@@ -68,7 +68,7 @@ int my_sync(File fd, myf my_flags)
     res= fdatasync(fd);
 #elif defined(HAVE_FSYNC)
     res= fsync(fd);
-    if (res == -1 and errno == ENOLCK)
+    if (res == -1 && errno == ENOLCK)
       res= 0;                                   /* Result Bug in Old FreeBSD */
 #elif defined(__WIN__)
     res= _commit(fd);