Commits · 17c3b838e14a94536a781dbcdc7775c697eaa558 · nexedi / MariaDB

13 Feb, 2007 1 commit

Bug#25460 - High concurrency MyISAM access causes severe mysqld crash. · 17c3b838

unknown authored Feb 13, 2007

Under high load it was possible that memory mapping was started on a table
while other threads were working with the table.

I fixed the start of memory mapping so that it is done at the first table
open or when the requesting thread is using the table exclusively only.


include/my_base.h:
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  Added a new MyISAM open_flag HA_OPEN_MMAP.
storage/myisam/ha_myisam.cc:
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  Replaced the call to mi_extra(... HA_EXTRA_MMAP ...) by the new open_flag
  HA_OPEN_MMAP. This effects that the mapping will no longer be done on
  every open of the table but just on the initial open, when the MyISAM
  share is created.
storage/myisam/mi_dynrec.c:
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  Added a comment with a concern regarding the mmap flag MAP_NORESERVE.
storage/myisam/mi_extra.c:
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  Limited the start of memory mapping to situations where the requesting
  thread has the table exclusively opened.
storage/myisam/mi_open.c:
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  Added memory mapping code. Used if the new open_flag HA_OPEN_MMAP is set.

17c3b838

05 Feb, 2007 1 commit

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · ddd9e295

unknown authored Feb 05, 2007

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines


BUILD/SETUP.sh:
  Auto merged
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysys/default.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Manually merged.

ddd9e295

04 Feb, 2007 2 commits
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · c32bfaea
  unknown authored Feb 05, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
```
  c32bfaea
- Fixed bug#26027 · b580e41e
  unknown authored Feb 04, 2007
```
Just a bad copy/paste of help info


client/mysqlslap.c:
  Fixed for bad option name
```
  b580e41e
03 Feb, 2007 3 commits

Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 81e598e1

unknown authored Feb 03, 2007

into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/csv/ha_tina.h:
  Auto merged

81e598e1

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 84d12cd6

unknown authored Feb 03, 2007

into  chilla.local:/home/mydev/mysql-5.1-axmrg


BUILD/SETUP.sh:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
  Auto merged
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
  Auto merged
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
  Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Manual merged
support-files/mysql.spec.sh:
  Manual merged

84d12cd6

After merge fix · 6fb46540
unknown authored Feb 03, 2007

6fb46540

02 Feb, 2007 15 commits

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · 38a716d4

unknown authored Feb 03, 2007

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1


BUILD/SETUP.sh:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
plugin/daemon_example/daemon_example.cc:
  Merged with main 5.1
sql/mysqld.cc:
  Merged with main 5.1

38a716d4

Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 7aa745a7

unknown authored Feb 02, 2007

into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/handler.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/examples/ha_tina.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/Makefile.am:
  Manual merged

7aa745a7

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8a10d3af
unknown authored Feb 02, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/item_func.cc:
  Auto merged
```
8a10d3af
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · a7bcf8ad
unknown authored Feb 02, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
a7bcf8ad
After merge fix · 978a1883
unknown authored Feb 02, 2007

978a1883
After merge fix · 93b35143
unknown authored Feb 02, 2007

93b35143
another valgrind error fix for 4.1(backport from 5.0) · aea9a675
unknown authored Feb 02, 2007

aea9a675
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · e619e5d0
unknown authored Feb 02, 2007
```
into  trift2.:/MySQL/M51/push-5.1


sql/item_func.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
```
e619e5d0
Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · ccc35118
unknown authored Feb 02, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
ccc35118
Valgrind errors · abca759b
unknown authored Feb 02, 2007
```
added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)
```
abca759b

Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 5330d0e7

unknown authored Feb 02, 2007

into  chilla.local:/home/mydev/mysql-5.1-axmrg


include/my_pthread.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged

5330d0e7

after merge fix · 9e4bcd9e

unknown authored Feb 02, 2007


mysql-test/r/ndb_read_multi_range.result:
  result fix
mysql-test/t/ndb_read_multi_range.test:
  test case fix

9e4bcd9e

Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 9cb831e3

unknown authored Feb 02, 2007

into  chilla.local:/home/mydev/mysql-5.0-axmrg


include/my_pthread.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged

9cb831e3

After merge fix · 3b96b4d2
unknown authored Feb 02, 2007

3b96b4d2

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · c01bb71b

unknown authored Feb 02, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/join_nested.result:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/subselect3.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/func_time.result:
  manual merge
mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge
mysql-test/t/information_schema.test:
  manual merge
sql/opt_range.cc:
  manual merge
sql/sql_delete.cc:
  manual merge
sql/sql_lex.h:
  manual merge

c01bb71b

01 Feb, 2007 18 commits

Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 8c6ebbd8

unknown authored Feb 01, 2007

into  chilla.local:/home/mydev/mysql-5.1-axmrg


client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
BitKeeper/deleted/.del-mysqld.cc.rej:
  Delete: sql/mysqld.cc.rej
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
  Auto merged
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
  Auto merged
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
  Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Null merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Null merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
  Auto merged
BUILD/SETUP.sh:
  Manual merged
Makefile.am:
  Manual merged
configure.in:
  Manual merged
include/my_pthread.h:
  Manual merged
mysql-test/Makefile.am:
  Manual merged
sql/mysqld.cc:
  Manual merged
support-files/mysql.spec.sh:
  Manual merged

8c6ebbd8

Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 41555dcd

unknown authored Feb 01, 2007

into  chilla.local:/home/mydev/mysql-5.0-axmrg


BitKeeper/deleted/.del-valgrind.supp:
  Delete: mysql-test/valgrind.supp
mysql-test/r/ps.result:
  SCCS merged
mysql-test/r/symlink.result:
  Null merged
mysql-test/t/ps.test:
  SCCS merged
mysql-test/t/symlink.test:
  Null merged
sql/field_conv.cc:
  Null merged
sql/mysqld.cc:
  Null merged
vio/viosslfactories.c:
  Null merged

41555dcd

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 977d05c1

unknown authored Feb 01, 2007

into  chilla.local:/home/mydev/mysql-5.0-axmrg


BUILD/SETUP.sh:
  Auto merged
configure.in:
  Auto merged

977d05c1

Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail · 4e8d7ac4

unknown authored Feb 01, 2007

additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter


mysql-test/r/information_schema.result:
  test result
mysql-test/t/information_schema.test:
  test case
sql/sql_show.cc:
  additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter

4e8d7ac4

Bug#25844: "make test" does not find mysql-test-run.pl · 991613e1
unknown authored Feb 01, 2007
```
Need to change directory before calling mysql-test-run.pl
```
991613e1
Merge trift2.:/MySQL/M51/mysql-5.1 · 6f3403b6
unknown authored Feb 01, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
6f3403b6

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 6b6acacd

unknown authored Feb 01, 2007

into  chilla.local:/home/mydev/mysql-4.1-axmrg


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/mysqld.cc:
  Auto merged

6b6acacd

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 0dd09da0
unknown authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/t/merge.test:
  Auto merged
```
0dd09da0

Valgrind error fixes · 6aab89c5

unknown authored Feb 01, 2007

Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0


mysql-test/r/ps.result:
  result fix
mysql-test/r/symlink.result:
  result fix
mysql-test/t/ps.test:
  test is moved to 'symlink' test
mysql-test/t/symlink.test:
  test from 'ps' test
sql/field_conv.cc:
  valgrind error fix: backport from 5.0
sql/mysqld.cc:
  release of ssl_context
vio/viosslfactories.c:
  release of ssl_context
mysql-test/valgrind.supp:
  New BitKeeper file ``mysql-test/valgrind.supp''
  This file is backported from 5.0, added suppressing of OpenSSL errors

6aab89c5

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 568dda14
unknown authored Feb 01, 2007
```
into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
```
568dda14

trigger.result: · c63f242a

unknown authored Feb 01, 2007

  merge of the 5.0-opt tree


mysql-test/r/trigger.result:
  merge of the 5.0-opt tree

c63f242a

Merge chilla.local:/home/mydev/mysql-4.1-axmrg · c7452cd6

unknown authored Feb 01, 2007

into  chilla.local:/home/mydev/mysql-5.0-axmrg


include/my_global.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
include/my_pthread.h:
  Manual merged
mysys/default.c:
  Manual merged
mysys/my_thr_init.c:
  Manual merged
sql/mysqld.cc:
  Manual merged

c7452cd6

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c2f35d03

unknown authored Feb 01, 2007

into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt


mysql-test/t/trigger.test:
  Auto merged
sql/sql_delete.cc:
  Auto merged

c2f35d03

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 23158b84

unknown authored Feb 01, 2007

into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.1-opt


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

23158b84

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f6eddc01
unknown authored Feb 01, 2007
```
into  rakia.gmz:/home/kgeorge/mysql/autopush/B25551-5.0-opt


sql/sql_select.cc:
  Auto merged
```
f6eddc01
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 6aa2f37c
unknown authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
6aa2f37c

Merge chilla.local:/home/mydev/mysql-4.0-axmrg · 622cbf39

unknown authored Feb 01, 2007

into  chilla.local:/home/mydev/mysql-4.1-axmrg


include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
mysys/my_thr_init.c:
  Manual merged
sql/mysqld.cc:
  Manual merged

622cbf39

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 79fe1494
unknown authored Feb 01, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
79fe1494