mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
65896 commits 2781 branches 343 tags 1.6 GiB
Commit graph

3661 commits

Author SHA1 Message Date
Mikael Ronstrom
56d81f3bc1 Fixed solaris builds 2009-12-19 12:48:39 +01:00
Alexander Nozdrin
faed50d555 Auto-merge from mysql-next-mr. 2009-12-19 11:27:22 +03:00
Mikael Ronstrom
2e72189535 Increase probability of correct atomics implementation by choosing stable implementations first 2009-12-19 08:54:05 +01:00
Mikael Ronstrom
30390a5e95 Make choices of atomic implementation based on highest stability 2009-12-19 08:46:37 +01:00
Vladislav Vaintroub
dd88cefe0b Fix missing 64 bit Solaris atomic prototypes 2009-12-19 03:39:02 +00:00
Vladislav Vaintroub
9c9cc49060 merge 2009-12-19 03:21:49 +01:00
Mikael Ronstrom
39ca1f0e1d Fixed Solaris Atomics build issues 2009-12-18 11:15:21 +01:00
Mikael Ronstrom
1ee5790589 Added extra checks of 64-bit atomic support on GCC and Solaris, also added 64-bit support in solaris.h which was missing 2009-12-18 09:29:18 +01:00
Alexander Nozdrin
5244303ac9 Manual merge from mysql-next-mr. 
Conflicts:
  - mysys/charset.c
  - mysys/my_thr_init.c
 2009-12-17 23:02:52 +03:00
Alexander Nozdrin
2ba49bee0e Manual merge from mysql-trunk-merge. 
Conflicts:
  - storage/myisam/mi_packrec.c
 2009-12-17 22:16:54 +03:00
Alexey Kopytov
e39d8609ce Automerge from mysql-5.1-bugteam to mysql-trunk-merge. 2009-12-17 18:09:04 +03:00
Satya B
647a955893 merge mysql-5.0-bugteam to mysql-5.1-bugteam 2009-12-17 17:15:13 +05:30
Satya B
801deedcf2 Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() 
When compressed myisam files are opened, they are always memory mapped
sometimes causing memory swapping problems.

When we mmap the myisam compressed tables of size greater than the memory 
available, the kswapd0 process utilization is very high consuming 30-40% of 
the cpu. This happens only with linux kernels older than 2.6.9

With newer linux kernels, we don't have this problem of high cpu consumption
and this option may not be required.
 
The option 'myisam_mmap_size' is added to limit the amount of memory used for
memory mapping of myisam files. This option is not dynamic.

The default value on 32 bit system is 4294967295 bytes and on 64 bit system it
is 18446744073709547520 bytes.

Note: Testcase only tests the option variable. The actual bug has be to 
tested manually.
 2009-12-17 16:55:50 +05:30
Marc Alff
92630be0ee Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marc 2009-12-17 02:12:02 -07:00
Alfranio Correia
013cc668df merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091208092611-pbno5awyb0v38hs7 
Fixed conflicts in:

- binlog.binlog_unsafe
- rpl.rpl_slow_query_log
 2009-12-17 00:09:52 +00:00
Marc Alff
67d945d270 Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc 2009-12-16 15:48:55 -07:00
Alexander Nozdrin
134fc397f8 Auto-merge from mysql-next-mr-summit0.3. 2009-12-16 21:50:45 +03:00
Alexander Nozdrin
09942fe8e8 Manual merge from mysql-trunk-merge. 
Conflicts:
  - include/my_no_pthread.h
  - mysql-test/r/sp-ucs2.result
  - sql/log.cc
  - sql/sql_acl.cc
  - sql/sql_yacc.yy
 2009-12-16 21:02:21 +03:00
Georgi Kodinov
b640b8f036 Bug #48866: mysql.test fails under Fedora 12 
strmov() is not guaranteed to work correctly on overlapping
source and destination buffers. On some OSes it may work,
but Fedora 12 has a stpcpy() that's not working correctly 
on overlapping buffers.
Fixed to use the overlap-safe version of strmov instead.
Re-vitalized the overlap-safe version of strmov.
 2009-12-16 19:31:19 +02:00
Vladislav Vaintroub
2ff2d1873a merge 2009-12-16 15:34:11 +01:00
Alexey Kopytov
efe6195858 Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-16 16:47:07 +03:00
Sergey Vojtovich
da31abf8ed Backport from 6.0-codebase. 
Bug #36098 Audit plugin (wl 3771) feature disabled in 6.0
avoid recusrive locking of LOCK_plugin
 2009-12-16 15:56:36 +04:00
Alexander Nozdrin
a1218bb782 Auto-merge from mysql-trunk. 2009-12-16 13:27:39 +03:00
Mikael Ronstrom
fdd269ad94 Merge to latest mysql-next-mr 2009-12-16 09:49:16 +01:00
Alexander Nozdrin
642f075569 Auto-merge from mysql-trunk. 2009-12-16 11:25:21 +03:00
Alexander Nozdrin
2ae8acc294 Remove .cvsignore files (attempt #2). 2009-12-16 11:24:30 +03:00
Mikael Ronstrom
4bd3686f96 Fix for Windows atomics 2009-12-16 00:33:15 +01:00
Mikael Ronstrom
432c5487e9 Fixed complex gcc assembler issues with 64-bit operations on 32-bit platforms using PIC codes, commented x86-gcc.h a lot more 2009-12-15 22:15:48 +01:00
Konstantin Osipov
e931ef415a Merge next-mr -> next-4284. 2009-12-15 22:59:07 +03:00
Sergey Vojtovich
94098b22c0 Backport from 6.0-codebase. 
WL#3771
  "Audit Plugin Interface"
  Implement new plug-in type - AUDIT
  New plug-in: audit_null
    simply increments counter for how many times it was called.
 2009-12-15 23:52:47 +04:00
Konstantin Osipov
7a6e5c3f4c Merge next-mr -> next-4284. 2009-12-15 21:45:22 +03:00
Mikael Ronstrom
f5a547a971 Include windows.h in atomics framework for windows 2009-12-15 18:12:49 +01:00
Mikael Ronstrom
fe1287ea68 Fixed 64-bit atomics on Win x86 and removed support for 8 and 16-bit atomic operations 2009-12-15 17:07:43 +01:00
Mikael Ronstrom
f06d24c18e Fixed atomic instruction headers for Windows and x86-gcc 2009-12-15 15:40:08 +01:00
Mikael Ronstrom
5a31a8f619 Merge 2009-12-14 17:08:30 +01:00
Alexander Nozdrin
bc2d4e620a Manual merge from mysql-trunk-merge. 
Conflicts:
  - extra/comp_err.c
  - mysql-test/collections/default.experimental
  - mysql-test/r/archive.result
  - mysql-test/r/select.result
  - mysql-test/suite/binlog/r/binlog_unsafe.result
  - mysql-test/suite/binlog/t/binlog_unsafe.test
  - mysql-test/suite/rpl/t/disabled.def
  - mysql-test/t/archive.test
  - mysql-test/t/select.test
  - sql/item.cc
  - sql/item.h
  - sql/item_timefunc.cc
  - sql/sql_base.cc
  - sql/sql_delete.cc
  - sql/sql_load.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc
  - storage/innobase/handler/ha_innodb.cc
  - vio/vio.c
 2009-12-12 23:38:59 +03:00
Staale Smedseng
983770aa6a Bug #45058 init_available_charsets uses double checked locking 
As documented in the bug report, the double checked locking
pattern has inherent issues, and cannot guarantee correct
initialization.

This patch replaces the logic in init_available_charsets()
with the use of pthread_once(3). A wrapper function,
my_pthread_once(), is introduced and is used in lieu of direct
calls to init_available_charsets(). Related defines
MY_PTHREAD_ONCE_* are also introduced.

For the Windows platform, the implementation in lp:sysbench is
ported. For single-thread use, a simple define calls the
function and sets the pthread_once control variable.

Charset initialization is modified to use my_pthread_once().
 2009-12-12 19:11:25 +01:00
Vladislav Vaintroub
91d9e6b670 merge 2009-12-11 21:17:17 +01:00
Marc Alff
eadf9532fd Merge cleanup 2009-12-11 12:45:44 -07:00
Alexey Kopytov
72b2943594 Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-11 19:40:58 +03:00
Alexander Nozdrin
69cfd5c8ec Manual merge from mysql-trunk. 
Conflicts:
  - client/mysqltest.cc
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/t/disabled.def
  - sql/mysqld.cc
  - sql/opt_range.cc
  - sql/sp.cc
  - sql/sql_acl.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc
 2009-12-11 12:39:38 +03:00
Marc Alff
edd5ff174c Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc 2009-12-11 01:58:13 -07:00
Alexander Nozdrin
324e1a9dbc Auto-merge from mysql-next-mr. 2009-12-10 17:44:36 +03:00
Vladislav Vaintroub
6c3bbb2800 merge 2009-12-10 11:47:31 +01:00
Konstantin Osipov
db6864b2a7 Merge with next-4284. 2009-12-10 11:41:03 +03:00
Marc Alff
e33a8b2a1a WL#2360 Performance schema 
Part III: mysys instrumentation
 2009-12-09 20:19:51 -07:00
Staale Smedseng
d5391ed61d Merge from 5.0 2009-12-06 19:01:11 +01:00
Vladislav Vaintroub
80d9f0d9ff 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
Marc Alff
57fd11788e WL#2360 Performance schema 
Part II, engines instrumentation
 2009-12-04 18:26:15 -07:00
Vladislav Vaintroub
aea6035c73 merge 2009-12-04 20:05:04 +00:00