mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge of compatibility fixes
Fixed failing tests in sys_vars as we have now stricter checking of setting of variables. mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/rpl_semi_sync_master_enabled_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_basic.result: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test: One can now only assign 0 or 1 to boolean variables mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test: One can now only assign 0 or 1 to boolean variables mysys/my_getsystime.c: Merge + fixed bug that __NR_clock_gettime didn't work in 5.5
This commit is contained in:
@ -49,7 +49,7 @@
|
||||
TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
|
||||
#if !defined(__NetBSD__) && !defined(__sun) \
|
||||
&& !(defined(__APPLE__) && defined(__MACH__)) \
|
||||
&& !defined(__FreeBSD__) && !defined(_AIX)
|
||||
&& !defined(__FreeBSD__) && !defined(_AIX) && !defined(__OpenBSD__)
|
||||
#ifndef __STDC_ISO_10646__
|
||||
/* In many places it is assumed that the first 127 code points are ASCII
|
||||
* compatible, so ensure wchar_t indeed does ISO 10646 and not some other
|
||||
|
@ -64,7 +64,7 @@ static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93";
|
||||
#include "np/vis.h"
|
||||
|
||||
#ifdef __weak_alias
|
||||
__weak_alias(strnunvisx,_strnunvisx)
|
||||
__weak_alias(strnunvisx,_strnunvisx);
|
||||
#endif
|
||||
|
||||
#if !HAVE_VIS
|
||||
|
@ -77,7 +77,7 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef __weak_alias
|
||||
__weak_alias(strvisx,_strvisx)
|
||||
__weak_alias(strvisx,_strvisx);
|
||||
#endif
|
||||
|
||||
#if !HAVE_VIS || !HAVE_SVIS
|
||||
|
Reference in New Issue
Block a user