Vladislav Vaintroub
801af5f2fe
Do not run GCC atomic builtins tests on MSVC
2010-01-18 23:43:03 +01:00
Vladislav Vaintroub
b3d8871c8d
In DBUG_EXECUTE_IF, change abort() to DBUG_ABORT() to avoid popups on windows
2010-01-18 23:42:22 +01:00
Vladislav Vaintroub
5ca186b519
Add targets test-bt-fast and test-bt-debug
...
They are probably sometimes used by the bteam
2010-01-18 23:41:20 +01:00
Vladislav Vaintroub
b030db38af
merge
2010-01-18 23:00:48 +01:00
Vladislav Vaintroub
cf4732275e
just in case old linux is used, add _GNU_SOURCE preprocessor constant to be able to see pthread_rwlock_t
2010-01-18 21:38:30 +01:00
Vladislav Vaintroub
ce59ee8098
Fix some problems found by kent.
...
-lm is sometimes not linked, which causes errors about undefined rint()
- FreeBSD embedded library does not link with the flags returned by mysql_config
(added -lcrypt to LIBS, whereby causing overlinking in case of normal non-embedded client)
2010-01-18 21:19:24 +01:00
Alexander Nozdrin
d01746b58e
Auto-merge from mysql-next-mr.
2010-01-18 22:47:19 +03:00
Alexander Nozdrin
53f72bf3df
Auto-merge from mysql-next-mr.
2010-01-18 21:50:57 +03:00
Alexander Nozdrin
dccf2accea
Enable sys_vars and perfschema test suites
...
for regular PB builds.
2010-01-18 15:01:11 +03:00
Alexander Nozdrin
69bb73aa38
Auto-merge from mysql-5.1-rpl-merge.
2010-01-18 14:53:35 +03:00
Vladislav Vaintroub
0ebe60070b
Bug#50362:
...
Init MY_PTHREAD_MUTEX_FAST prior to first usage to avoid crash on
FreeBSD
2010-01-16 05:04:02 +01:00
Vladislav Vaintroub
8d665d799c
2010-01-16 04:56:35 +01:00
Vladislav Vaintroub
266c812282
Fix output name of embedded library,
...
honor OUTPUT_NAME in MERGE_LIBRARIES macro
2010-01-15 19:07:45 +01:00
Kent Boortz
493ee9d330
Added support for product names in package names
2010-01-15 15:11:59 +01:00
Sergey Glukhov
31740ffdfc
compilation failure fix
2010-01-15 17:03:51 +04:00
Sergey Glukhov
8b36b965c5
backported:
...
-WL#2822 INFORMATION_SCHEMA.ROUTINES: Add missing columns
-WL#2003 INFORMATION_SCHEMA: PARAMETERS view
-addon for 'I_S optimization' WL
2010-01-15 15:42:15 +04:00
fe99d91593
Fix for perfschema.binlog_stmt failure:
...
Problem: The test case failed because: (i) warning text in
result file differed from the warning output by the
server, and (ii) binlog contents in result file did
not show the statements logged wrapped in BEGIN/COMMIT
as it is the case after WL 2687.
Solution: We update the result file, but first we change the
unsafe warning text to also refer to performance_schema
table(s). This required changing the result files for
existing test cases that provide output for warnings
related to ER_BINLOG_UNSAFE_SYSTEM_TABLE. "Grepping" in
result files, shows that only binlog_unsafe contained
reference to such a warning.
We also update the result file with the missing
BEGIN/COMMIT statements.
2010-01-15 13:06:33 +08:00
Vladislav Vaintroub
4e04b86355
port some mysql_binary_distribution hacks to cmake
2010-01-15 01:21:43 +01:00
Vladislav Vaintroub
166c321141
fix for 32 bit Linux problem reported by Timothy
2010-01-15 00:54:43 +01:00
Vladislav Vaintroub
4bf1d5b5dd
Post-merge fixes , define HAVE_RWLOCK_T on Solaris define
...
DISABLE_MYSQL_THREAD_H for strings
Also, enable unittests for perfschema
2010-01-14 18:42:28 +00:00
Alfranio Correia
09bc4891e8
Removed garbage from the mysqld--help-win
2010-01-14 16:50:45 +00:00
Alfranio Correia
20fd7e5972
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-14 16:44:33 +00:00
Alfranio Correia
fb0ee3ab8e
merge mysql-next-mr --> mysql-5.1-rpl-merge
...
Conflicts:
Text conflict in sql/sql_insert.cc
2010-01-14 16:02:55 +00:00
Vladislav Vaintroub
6e7a75bf5f
merge
2010-01-14 16:07:27 +01:00
Vladislav Vaintroub
f0a32f4027
fix syntax error in INSTALL cmake command
2010-01-14 15:02:27 +01:00
Vladislav Vaintroub
742ef94290
Remove support for "make install" DESTDIR - did not work as expected
2010-01-14 14:54:32 +01:00
Alfranio Correia
aefaa56c5a
merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1
2010-01-14 12:59:58 +00:00
Alfranio Correia
9b0ae85aea
Augmented the rpl_ndb_binlog_format_errors to verify if a slave running in the
...
STMT mode aborts the SQL Thread if it receives changes in ROW mode and such
changes are not processed.
2010-01-14 12:52:28 +00:00
Olav Sandstaa
6559e92732
Fix for Bug#50221 Server refuses to start from non-default installdir on Solaris 32-bit
...
When starting mysqld it did not recognize most of the options given on
the command line when it was compiled for 32-bit Solaris using Sun
Studio compiler. The cause for this was that most of the entries in
the my_long_options array contained "garbage" data. The garbage data
was caused by a compiler bug. When initilizing the def_value member
for the "default-storage-engine" entry it was initialized like this:
(longlong)"MyISAM"
i.e. casting a 32 bit pointer to a 64 bit integer value. Due to the
compiler bug only 4 bytes was allocated (instead of 8 bytes). This
caused everything following this entry to be stored at a location that
was 4 byte wrong.
The fix/work-around for this problem is initialize the def_value
for default-storage-engine in my_long_options to 0 and instead
initialize the default_storage_engine variable to "MyISAM" in
init_common_variables().
2010-01-14 13:39:42 +01:00
Alexander Barkov
5f6c630907
WL#4583 Case conversion in Asian character sets
...
modified:
include/m_ctype.h
- Changing type for tolower/toupper members, to store values >= 0xFFFF.
- Adding function prototypes
mysql-test/r/ctype_big5.result
mysql-test/r/ctype_cp932_binlog_stm.result
mysql-test/r/ctype_eucjpms.result*
mysql-test/r/ctype_euckr.result
mysql-test/r/ctype_gb2312.result
mysql-test/r/ctype_gbk.result
mysql-test/r/ctype_sjis.result
mysql-test/r/ctype_ujis.result
mysql-test/t/ctype_big5.test
mysql-test/t/ctype_cp932_binlog_stm.test
mysql-test/t/ctype_eucjpms.test
mysql-test/t/ctype_euckr.test
mysql-test/t/ctype_gb2312.test
mysql-test/t/ctype_gbk.test
mysql-test/t/ctype_sjis.test
mysql-test/t/ctype_ujis.test
- Adding tests
strings/ctype-big5.c
strings/ctype-cp932.c
strings/ctype-euc_kr.c
strings/ctype-eucjpms.c
strings/ctype-gb2312.c
strings/ctype-gbk.c
strings/ctype-sjis.c
- Adding upper/lower case conversion data
strings/ctype-mb.c
- Adding handling of upper/lower conversion for multi-byte characters.
strings/ctype-ujis.c
- Implementing shared upper/lower conversion
functions for ujis and eucjpms
- Adding upper/lower case conversion data for ujis
2010-01-14 15:17:57 +04:00
Alexander Nozdrin
7401bc2816
Auto-merge from mysql-next-mr.
2010-01-14 12:39:57 +03:00
Alexander Nozdrin
9c820e637e
Auto-merge from mysql-next-mr.
2010-01-14 12:00:08 +03:00
Vladislav Vaintroub
fe7a385951
merge
2010-01-14 00:37:44 +00:00
Vladislav Vaintroub
912ce798ff
Fix CFLAGS passed to mysql_config, in case makefile generator is Makefile based
2010-01-14 00:35:07 +00:00
Luis Soares
0f90f1dee7
Disabled binlog_unsafe due to BUG#50312.
2010-01-13 23:27:22 +00:00
Vladislav Vaintroub
cd8a37094c
WITH_MYSQLD_LIBS=>WITH_MYSQLD_LDFLAGS
2010-01-14 00:09:40 +01:00
Vladislav Vaintroub
ccf2600f66
Do not link with mtmalloc on Solaris.
...
add WITH_MYSQLD_LIBS for extra linker flags for mysqld
2010-01-13 21:56:51 +01:00
Vladislav Vaintroub
548e2e3e63
adjust test result file
2010-01-13 21:31:33 +01:00
Vladislav Vaintroub
16e1db990a
merge
2010-01-13 21:16:20 +01:00
Vladislav Vaintroub
17dd1b248a
merge
2010-01-13 21:14:42 +01:00
Vladislav Vaintroub
2f957b5690
merge
2010-01-13 16:53:22 +01:00
Vladislav Vaintroub
5cddb6c15f
use _GNU_SOURCE on Linux to have all useful definitions (pthread_rwlock_t) for example
2010-01-13 16:52:14 +01:00
Alfranio Correia
a1aa459458
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
2010-01-13 13:27:25 +00:00
Mats Kindahl
6a7e3ca55e
Merging with mysql-5.1-rep+2-delivery1
2010-01-13 14:00:48 +01:00
Mats Kindahl
f8c074e1ba
Replacing error variable that was lost.
2010-01-13 13:59:58 +01:00
Mats Kindahl
86291b043b
Merging with mysql-5.1-rep+2-delivery1
2010-01-13 13:37:01 +01:00
Vladislav Vaintroub
7e7965aeb4
Add WITH_FAST_MUTEXES option (non-debug configurations only)
2010-01-13 13:33:32 +01:00
Alfranio Correia
46d1689b7c
merge mysql-next-mr --> mysql-5.1-rpl-merge
...
Conflicts:
Text conflict in sql/log.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_base.cc
2010-01-13 12:22:34 +00:00
Mats Kindahl
a3c4467515
WL#5151: Conversion between different types when
...
replicating
Replace c_ptr() calls with c_ptr_safe() calls to
avoid valgrind warnings.
Adding code to to handle the case that no metadata
was present in the table map for the column.
Allow first parameter to unpack_row() to be NULL,
in which case no source tables is used and hence
no checks nor conversions are done.
Clarifying some comments and fixing documentation
for unpack_row().
2010-01-13 12:58:42 +01:00
Luis Soares
231773b449
Makes slave_type_conversions_basic to be skipped in embedded
...
run in PB2 as it ought to be. Otherwise test will fail because
variable is no recognized:
1193: Unknown system variable 'slave_type_conversions'
2010-01-13 08:29:23 +00:00