diff --git a/core/cpu_feature.m b/core/cpu_feature.m
index 3dbf7f47bb2a68208291e4f97cd6dd4b1a608183..b50db25dedc74c71dd1cbee2e5352b3f19e0b3e5 100644
--- a/core/cpu_feature.m
+++ b/core/cpu_feature.m
@@ -101,7 +101,7 @@ crc32c_hw_intel(u_int32_t crc, unsigned char const *buf, size_t len)
/* Toggle x86 flag-register bits, as per mask. */
static void
-toggle_x86_flags (long mask, long* orig, long* toggled)
+toggle_x86_flags(long mask, long* orig, long* toggled)
{
long forig = 0, fres = 0;
@@ -121,35 +121,37 @@ toggle_x86_flags (long mask, long* orig, long* toggled)
);
#endif
- if (orig) *orig = forig;
- if (toggled) *toggled = fres;
+ if (orig)
+ *orig = forig;
+ if (toggled)
+ *toggled = fres;
return;
}
/* Is CPUID instruction available ? */
static int
-can_cpuid ()
+can_cpuid()
{
long of = -1, tf = -1;
/* x86 flag register masks */
enum {
cpuf_AC = (1 << 18), /* bit 18 */
- cpuf_ID = (1 << 21) /* bit 21 */
+ cpuf_ID = (1 << 21) /* bit 21 */
};
/* Check if AC (alignment) flag could be toggled:
if not - it's i386, thus no CPUID.
*/
- toggle_x86_flags (cpuf_AC, &of, &tf);
+ toggle_x86_flags(cpuf_AC, &of, &tf);
if ((of & cpuf_AC) == (tf & cpuf_AC)) {
return 0;
}
/* Next try toggling CPUID (ID) flag. */
- toggle_x86_flags (cpuf_ID, &of, &tf);
+ toggle_x86_flags(cpuf_ID, &of, &tf);
if ((of & cpuf_ID) == (tf & cpuf_ID)) {
return 0;
}
@@ -160,7 +162,7 @@ can_cpuid ()
/* Retrieve CPUID data using info as the EAX key. */
static void
-get_cpuid (long info, long* eax, long* ebx, long* ecx, long *edx)
+get_cpuid(long info, long* eax, long* ebx, long* ecx, long *edx)
{
*eax = info;
@@ -185,17 +187,17 @@ get_cpuid (long info, long* eax, long* ebx, long* ecx, long *edx)
/* Check whether CPU has a certain feature. */
int
-cpu_has (unsigned int feature)
+cpu_has(unsigned int feature)
{
long info = 1, reg[4] = {0,0,0,0};
- if (!can_cpuid ())
+ if (!can_cpuid())
return -EINVAL;
if (feature > LEN_cpu_mask)
return -ERANGE;
- get_cpuid (info, ®[eAX], ®[eBX], ®[eCX], ®[eDX]);
+ get_cpuid(info, ®[eAX], ®[eBX], ®[eCX], ®[eDX]);
return (reg[cpu_mask[feature].ri] & cpu_mask[feature].bitmask) ? 1 : 0;
}
@@ -210,7 +212,7 @@ crc32c_hw(u_int32_t crc, const unsigned char *buf, unsigned int len)
#else /* other (yet unsupported architectures) */
int
-cpu_has (unsigned int feature)
+cpu_has(unsigned int feature)
{
(void)feature;
return EINVAL;
@@ -220,7 +222,7 @@ u_int32_t
crc32c_hw(u_int32_t crc, const unsigned char *buf, unsigned int len)
{
(void)crc; (void)buf, (void)len;
- assert (false);
+ assert(false);
return 0;
}
@@ -228,6 +230,5 @@ crc32c_hw(u_int32_t crc, const unsigned char *buf, unsigned int len)
#endif /* defined (__i386__) || defined (__x86_64__) */
-
/* __EOF__ */
diff --git a/core/log_io.m b/core/log_io.m
index 6d9d89d0cde51df3d603a286250153fb826b31c0..6d35768687c90c2a19b5b2fb19a58e20eb347e94 100644
--- a/core/log_io.m
+++ b/core/log_io.m
@@ -76,10 +76,10 @@ static u_int32_t (*calc_crc32c)(u_int32_t crc, const unsigned char *buf,
unsigned int len) = NULL;
void
-mach_setup_crc32 ()
+mach_setup_crc32()
{
#if defined (__i386__) || defined (__x86_64__)
- calc_crc32c = cpu_has (cpuf_sse4_2) ? &crc32c_hw : &crc32c;
+ calc_crc32c = cpu_has(cpuf_sse4_2) ? &crc32c_hw : &crc32c;
#else
calc_crc32c = &crc32c;
#endif
diff --git a/core/tarantool.m b/core/tarantool.m
index 2aee4e539cd1165678fa7069540513b7d1622d24..8c079a07b1ea94230c0852bf39b12d491feedbce 100644
--- a/core/tarantool.m
+++ b/core/tarantool.m
@@ -394,9 +394,9 @@ initialize_minimal()
}
inline static void
-mach_init ()
+mach_init()
{
- mach_setup_crc32 ();
+ mach_setup_crc32();
}
int
@@ -419,7 +419,7 @@ main(int argc, char **argv)
master_pid = getpid();
stat_init();
palloc_init();
- mach_init ();
+ mach_init();
#ifdef HAVE_BFD
symbols_load(argv[0]);
diff --git a/include/cpu_feature.h b/include/cpu_feature.h
index e3b74f70db3c56cbe71c484ebdf7fb2a2d4666d5..34cef8040ea72b3290b81aecc6e593ba1746e887 100644
--- a/include/cpu_feature.h
+++ b/include/cpu_feature.h
@@ -42,7 +42,7 @@ enum {
* @return 1 if feature is available, 0 if unavailable,
* -EINVAL if unsupported CPU, -ERANGE if invalid feature
*/
-int cpu_has (unsigned int feature);
+int cpu_has(unsigned int feature);
/* Hardware-calculate CRC32 for the given data buffer.
diff --git a/test/box/cat.test b/test/box/cat.test
index 789827230ddfdd492731e03196584ef1046c9076..ed2cb5dc1b23d793d5266666d89d948b0c8983aa 100644
--- a/test/box/cat.test
+++ b/test/box/cat.test
@@ -12,13 +12,12 @@ print """
# This way we check that the server can read old snapshots (v11)
# going forward.
"""
-server.stop()
snapshot = os.path.join(vardir, "00000000000000000500.snap")
os.symlink(os.path.abspath("box/00000000000000000500.snap"), snapshot)
server.test_option("--cat=00000000000000000500.snap")
-# server.start()
# print "# Restore the default server..."
-# server.stop()
os.unlink(snapshot)
+# __EOF__
+
diff --git a/test/box_big/sql.result b/test/box_big/sql.result
index 4c99702d1afdd11e930acd415e99ad4869609616..0353b951acbdd9fdd6cd0fd9bf740b444c429403 100644
--- a/test/box_big/sql.result
+++ b/test/box_big/sql.result
@@ -22,10 +22,10 @@ Insert OK, 1 row affected
select * from t0 where k1='Richard' or k1='Tomas' or k1='Tomas' limit 5
Found 5 tuples:
['Doe', 'Richard']
+['Kytes', 'Tomas']
+['Major', 'Tomas']
['Roe', 'Richard']
['Woe', 'Richard']
-['Major', 'Tomas']
-['Kytes', 'Tomas']
#
# A test case for Bug#729879
# "Zero limit is treated the same as no limit"
diff --git a/test/box_big/sql.test b/test/box_big/sql.test
index fb163ba2de54990dbaeaea17a62176f29d0a30d2..5105d3a66e356da57b211ebe29a163b0a7bdb927 100644
--- a/test/box_big/sql.test
+++ b/test/box_big/sql.test
@@ -14,7 +14,9 @@ exec sql "insert into t0 values ('Kytes', 'Tomas')"
exec sql "insert into t0 values ('Stiles', 'Tomas')"
exec sql "insert into t0 values ('Wales', 'Tomas')"
exec sql "insert into t0 values ('Callaghan', 'Tomas')"
+sql.sort = True
exec sql "select * from t0 where k1='Richard' or k1='Tomas' or k1='Tomas' limit 5"
+sql.sort = False
print """#
# A test case for Bug#729879