Commit graph

59620 commits

Author SHA1 Message Date
Vladislav Vaintroub
cedb6101db Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) combined with
INSTALL_DEBUG_SYMBOLS
2009-12-12 02:03:05 +01:00
Vladislav Vaintroub
a6f6932e26 merge 2009-12-11 21:17:17 +01:00
Vladislav Vaintroub
3a6b75949c Introduce macro DTRACE_INSTRUMENT_STATIC_LIBS,to hide
the ugly Solaris dtrace workarounds
2009-12-11 18:33:00 +00:00
Vladislav Vaintroub
55ccb35ba6 Introduce a workaround for Solaris' inability to deal with dtrace in static libraries.
Rerun dtrace -G on all  objects that can contan dtrace probes (also objects that are
part of static libs) before linking mysqld to produce dtrace_probes_all.o and link 
dtrace_probes_all.o with mysqld

This ugly workaround was inspired by handling dtrace using autotools.
2009-12-11 15:51:39 +01:00
Alexander Nozdrin
376cf4275f Auto-merge from mysql-trunk. 2009-12-11 09:20:49 +03:00
Alexander Nozdrin
ceefe7bb50 Remove BitKeeper dir and .cvsignore. 2009-12-11 09:19:51 +03:00
Alexander Nozdrin
160322439a Auto-merge (empty) from mysql-next-mr. 2009-12-11 09:03:38 +03:00
Alexander Nozdrin
f14483b0d4 Auto-merge (empty) from mysql-trunk. 2009-12-11 08:56:28 +03:00
Alexander Nozdrin
763b0810f1 Auto-merge from mysql-next-mr-bugfixing. 2009-12-11 08:54:53 +03:00
Alexander Nozdrin
eae0cd2a40 Auto-merge from mysql-trunk-bugfixing. 2009-12-11 08:54:36 +03:00
Alexander Nozdrin
c323c2d8bf Auto-merge from mysql-next-mr-bugfixing. 2009-12-10 22:27:28 +03:00
Alexander Nozdrin
26e2802cf0 Auto-merge (empty) from mysql-trunk-bugfixing. 2009-12-10 17:48:40 +03:00
Alexander Nozdrin
88c4f57ec9 Auto-merge (empty) from mysql-trunk. 2009-12-10 17:45:22 +03:00
Alexander Nozdrin
97928f59b8 Auto-merge from mysql-next-mr. 2009-12-10 17:44:36 +03:00
Vladislav Vaintroub
1ec457961d remove inadverent change 2009-12-10 15:01:39 +01:00
Vladislav Vaintroub
6811d7554f merge 2009-12-10 11:47:31 +01:00
Sergey Vojtovich
9b0e649a2c After merge fix: pthread_mutext_[un]lock -> mysql_mutex_[un]lock. 2009-12-10 13:19:06 +04:00
Vladislav Vaintroub
7c3ca3e682 Check for clock_gettime in librt 2009-12-10 04:09:32 +01:00
Vladislav Vaintroub
ef4685eccf fix install_symlink on unixes other than osx 2009-12-10 03:48:21 +01:00
Vladislav Vaintroub
82b07c4d8a Remove -Wl,--as-needed option, broken on Fedora 2009-12-09 16:34:52 +01:00
Sergey Vojtovich
cda5ad508a Merge mysql-next-mr to mysql-next-mr-svoj. 2009-12-09 15:03:34 +04:00
Sergey Vojtovich
6b8cd32eaa An addition to backport of
WL#3951 - MyISAM: Additional Error Logs for Data Corruption
Fixed partition_repair_myisam.test.

mysql-test/suite/parts/t/partition_repair_myisam.test:
  Suppress some extra warnings produced by MyISAM.
2009-12-09 11:33:28 +04:00
vvaintroub
0e28e588b9 Use CMAKE_CFG_INTDIR instead of different MSVC and Xcode specific
configuration names
2009-12-09 03:13:38 +01:00
Magne Mahre
0eb255ee8d Bug#35589 SET PASSWORD caused a crash
Bug#35591 FLUSH PRIVILEGES caused a crash

A race condition on the privilege hash tables (proc_priv_hash
and func_priv_hash) caused one thread to try to delete elements
that had already been deleted by another thread.

The bug was caused by reading and saving the pointers to 
the hash tables outside mutex protection.  This led to an
inconsistency where a thread copied a pointer to a hash,
another thread did the same, the first thread then deleted
the hash, and the second then crashed when it in turn tried to
delete the deleted hash.

The fix is to ensure that operations on the shared hash structures
happens under mutex protection (moving the locking up a little)
2009-12-08 13:19:38 +01:00
V Narayanan
acacdb9e07 merging with mysql-next-mr-svoj 2009-12-08 17:22:59 +05:30
V Narayanan
dc43549fb3 merging with mysql-next-mr-svoj 2009-12-08 12:38:50 +05:30
Alexander Nozdrin
6fd3866c6c Auto-merge from mysql-next-mr. 2009-12-08 09:55:52 +03:00
Vladislav Vaintroub
ef482374e5 couple of tweaks for solaris on sparc, link with librt, as it defines sched_yield 2009-12-08 03:12:23 +01:00
Vladislav Vaintroub
0f3b102db9 fix some Solaris Sparc errors from recent cleanup 2009-12-07 23:31:10 +01:00
Vladislav Vaintroub
3dabe24884 simplify some tests, silence warning in script install 2009-12-07 22:01:03 +01:00
Vladislav Vaintroub
99f19c78ef fix cmake warning about included scripts setting their minimum required version 2009-12-07 17:42:21 +01:00
Vladislav Vaintroub
6091456986 Deal with empty elements in LIB_DEPENDS list (in some older 2.6 version
empty element produces a warning)
2009-12-07 15:56:15 +01:00
Vladislav Vaintroub
70efcdb592 merge 2009-12-07 15:10:16 +01:00
Vladislav Vaintroub
55e1881ef7 fix small stuff in mysql_config 2009-12-07 15:07:26 +01:00
He Zhenxing
4805375113 Auto merge 2009-12-07 21:30:24 +08:00
Sergey Vojtovich
e8d0168475 WL#2511 - Add a new table to the Information Schema for TABLESPACE's
Implemented a new INFORMATION_SCHEMA table, which is intended to
provide information about tablespaces.

mysql-test/r/information_schema.result:
  Updated test result according to WL#2511. With this WL
  I_S has new TABLESPACES schema.
mysql-test/r/information_schema_db.result:
  Updated test result according to WL#2511. With this WL
  I_S has new TABLESPACES schema.
mysql-test/r/mysqlshow.result:
  Updated test result according to WL#2511. With this WL
  I_S has new TABLESPACES schema.
mysql-test/suite/funcs_1/r/is_columns_is.result:
  Updated test result according to WL#2511. With this WL
  I_S has new TABLESPACES schema.
mysql-test/suite/funcs_1/r/is_tables_is.result:
  Updated test result according to WL#2511. With this WL
  I_S has new TABLESPACES schema.
sql/handler.h:
  Added SCH_TABLESPACES to enum_schema_tables.
sql/mysql_priv.h:
  Added human readable definitions for I_S.TABLESPACES field
  identifiers.
sql/sql_show.cc:
  Added I_S.TABLESPACES schema. The code which handles I_S.FILES
  is capable to handle I_S.TABLESPACES as well. Thus we reuse
  this code and let functions/variables have more generic names.
2009-12-07 16:22:51 +04:00
Alexander Barkov
164c7df5b3 Bug#47756 Setting 2byte collation ID with 'set names' crashes the server
The problem is not actually related to 2byte collation IDs.
The same crash happens if you change the collation ID in
mysql-test/str_data/Index.xml to a value smaller than 256.

Crash happened in SQL parser, because the "ident_map" and "state_map"
arrays were not initialized in loadable utf8 collations.

Fix: adding proper initialization of the "ident_map" and "state_map"
members for loadable utf8 collations.
2009-12-07 16:11:53 +04:00
Vladislav Vaintroub
c53fa1e06b Add libm to the lib of required libraries when doing system checks 2009-12-07 12:25:46 +01:00
Alexander Nozdrin
a8e80f3146 Auto-merge from mysql-next-mr. 2009-12-07 09:08:40 +03:00
Vladislav Vaintroub
41da7b156d fix solaris build - inet_aton is in non-default library 2009-12-07 02:27:49 +00:00
Vladislav Vaintroub
94659ffbb1 do not use -z defs on Solaris, it complains about libc.so implicit dependency 2009-12-07 01:50:54 +00:00
Vladislav Vaintroub
9fcef3c45b On Linux, support -Wl,--no-undefined (only client shared library)
and --Wl,--as-needed (all shared modules). The later will remove
unused dependencies (also from gcc and C++ runtime)
2009-12-07 02:16:05 +01:00
Vladislav Vaintroub
2e62703114 set version and soversionn for client shared library 2009-12-05 19:59:13 +01:00
Vladislav Vaintroub
92642d0639 fdatasync is not documented on Snow Leopard and is not in unistd.h
CMake finds it as it is expored by system libraries, though attempts to
use it will result bring a warning. Fix by using CHECK_SYMBOL_EXISTS
instead of CHECK_FUNCTION_EXISTS
2009-12-05 16:15:17 +01:00
Vladislav Vaintroub
f03eed1536 merge 2009-12-05 13:17:58 +00:00
Vladislav Vaintroub
04d2adbd4f Fix creation of exports file on Unix 2009-12-05 13:16:30 +00:00
Vladislav Vaintroub
56e4fc4b00 Fix my_atomic.h on Solaris, do not redefine macros already defined
in include/atomic/solaris.h
2009-12-05 04:14:48 +01:00
He Zhenxing
b90be61738 Merge from trunk-bugfixing 2009-12-05 10:46:29 +08:00
He Zhenxing
0dcc854520 Auto merge from 5.1-rep-semisync 2009-12-05 10:28:53 +08:00
Marc Alff
04fe40393d WL#2360 Performance schema
Part II, engines instrumentation
2009-12-04 18:26:15 -07:00