Commits · b8006fbb3e63ffe139551ac151e92cd567a90cf5 · nexedi / MariaDB

18 Jun, 2007 1 commit

Sdditional fix-up for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock · b8006fbb

unknown authored Jun 18, 2007

FLUSH LOGS should ignore SET GLOBAL READ_ONLY.


sql/lock.cc:
  Sdditional fix-up for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
    - ignore SET GLOBAL READ_ONLY if MYSQL_LOCK_IGNORE_GLOBAL_READ_ONLY is set.
sql/mysql_priv.h:
  Sdditional fix-up for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
    - MYSQL_LOCK_IGNORE_GLOBAL_READ_ONLY added.
sql/sql_base.cc:
  Sdditional fix-up for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
    - ignore SET GLOBAL READ_ONLY as well if called form a logger.

b8006fbb

17 Jun, 2007 4 commits

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 1b42c34a
unknown authored Jun 17, 2007
```
into  mysql.com:/home/ram/work/b28144/b28144.5.1
```
1b42c34a
after-merge fix. · 33aa3064
unknown authored Jun 17, 2007

33aa3064

Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock · 548416b3

unknown authored Jun 17, 2007

The log tables are by nature PERFORMANCE_SCHEMA tables,
which should not be affected by SET GLOBAL READ_ONLY or FLUSH TABLES
WITH READ LOCK.

The implementation of FLUSH TABLES WITH READ LOCK already ignored log tables.
Now with this patch, the implementation of LOCK TABLE also ignore a
global read lock for log tables, which was the missing symmetry.


mysql-test/r/flush.result:
  Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
    - test result.
mysql-test/t/flush.test:
  Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
    - test case.
sql/lock.cc:
  Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
    - logger.is_privileged_thread() used.
sql/log.h:
  Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
    - LOGGER::is_privileged_thread() introduced that returns TRUE if a given thread 
      is either a general_log or a slow_log or a privileged thread.
sql/sql_base.cc:
  Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
    - pass MYSQL_LOCK_IGNORE_GLOBAL_READ_LOCK to the mysql_lock_tables() in case of 
      call from a logger in order not to honor the GLOBAL READ LOCK 
      and to avoid possible deadlocks.

548416b3

Merge mysql.com:/home/ram/work/b28144/b28144.5.0 · d487624e

unknown authored Jun 17, 2007

into  mysql.com:/home/ram/work/b28144/b28144.5.1


mysql-test/r/rpl_log_pos.result:
  ul
mysql-test/r/rpl_ssl.result:
  ul
mysql-test/t/rpl_log_pos.test:
  manual merge
mysql-test/t/rpl_ssl.test:
  manual merge

d487624e

15 Jun, 2007 19 commits

Merge alf.:D:/src/mysql-5.1-maint · a555f7f2

unknown authored Jun 15, 2007

into  alf.:D:/src/mysql-5.1-maint_winemb


CMakeLists.txt:
  Auto merged
sql/mysqld.cc:
  Auto merged

a555f7f2

Embedded Server doesn't build on Windows. · c15380dc

unknown authored Jun 15, 2007

- Add build configuration parameter EMBEDDED_ONLY which will configure 
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.


CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Remove leading space from various definitions.
  - Remove optimizations from RelWithDebInfo configuration for debugging.
  - Conditionally add the necessary build directories based on 
  EMBEDDED_ONLY flag.
BitKeeper/etc/ignore:
  Embedded Server doesn't build on Windows.
  - Ignore CMake's default configuration output directories.
  - Ignore autogenerated cmake_dummy.c file.
libmysql/client_settings.h:
  Embedded Server doesn't build on Windows.
  - Build fixup
libmysqld/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Update for recent changes.
libmysqld/libmysqld.def:
  Embedded Server doesn't build on Windows.
  - Export necessary methods.
libmysqld/examples/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Updated include directories.
  - test_libmysqld fixup.
  - Added mysqltest_embedded and mysql_client_test_embedded exes needed for
  testing.
sql/mysqld.cc:
  Embedded Server doesn't build on Windows.
  - Build fixup.
sql/sql_binlog.cc:
  Embedded Server doesn't build on Windows.
  - Build fixup.
sql-common/client.c:
  Embedded Server doesn't build on Windows.
  - Build fixup.
storage/federated/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Define USE_TLS for embedded only builds.
storage/heap/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Define USE_TLS for embedded only builds.
storage/innobase/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Define USE_TLS for embedded only builds.
storage/myisam/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Define USE_TLS for embedded only builds.
storage/myisam/ha_myisam.cc:
  Embedded Server doesn't build on Windows.
  - Define USE_TLS for embedded only builds.
storage/myisammrg/CMakeLists.txt:
  Embedded Server doesn't build on Windows.
  - Define USE_TLS for embedded only builds.
win/configure.js:
  Embedded Server doesn't build on Windows.
  - Add EMBEDDED_ONLY build configuration.

c15380dc

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 5da3d3cf

unknown authored Jun 15, 2007

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged
include/violite.h:
  Auto merged

5da3d3cf

Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 · 4b7fcbbe

unknown authored Jun 15, 2007

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


include/violite.h:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged

4b7fcbbe

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 20d54f96
unknown authored Jun 15, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
```
20d54f96

Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 · 159f02b5

unknown authored Jun 15, 2007

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


mysql-test/mysql-test-run.pl:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/drop_temp_table.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/have_log_bin.require:
  Auto merged
mysql-test/t/flush_block_commit_notembedded.test:
  Auto merged
mysql-test/t/mysqlbinlog-cp932.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
mysql-test/t/user_var-binlog.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  SCCS merged
mysql-test/r/binlog_stm_binlog.result:
  SCCS merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  SCCS merged
configure.in:
  manual merge
mysql-test/extra/binlog_tests/binlog.test:
  manual merge
mysql-test/t/mysqlbinlog2.test:
  manual merge
sql/mysqld.cc:
  manual merge

159f02b5

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · b33866a8
unknown authored Jun 15, 2007
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


sql/sql_parse.cc:
  Auto merged
```
b33866a8

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 65203a94

unknown authored Jun 15, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged

65203a94

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 8068a6bd
unknown authored Jun 15, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
8068a6bd

Fix for bug #28144: "Slave_IO_Running" differs in replication tests · c0554d1f

unknown authored Jun 15, 2007

Problem: show slave status may return different Slave_IO_Running values running some tests.
Fix: wait for a certain slave state if needed to get tests more predictable.


mysql-test/r/rpl_log_pos.result:
  Fix for bug #28144: "Slave_IO_Running" differs in replication tests
    - test result adjusted.
mysql-test/r/rpl_ssl.result:
  Fix for bug #28144: "Slave_IO_Running" differs in replication tests
    - test result adjusted.
mysql-test/t/rpl_log_pos.test:
  Fix for bug #28144: "Slave_IO_Running" differs in replication tests
    - test has been rewritten to get certain slave state, now we use wait_for_slave_param.inc
      to ensure we get proper IO/SQL slave's threads states.
mysql-test/t/rpl_ssl.test:
  Fix for bug #28144: "Slave_IO_Running" differs in replication tests
    - wait_for_slave_to_start.inc used to get certain slave states in order 
      to be more predictable.
mysql-test/include/wait_for_slave_param.inc:
  New BitKeeper file ``mysql-test/include/wait_for_slave_param.inc''
  
  allow to wait until SHOW SLAVE STATUS has returned a spicified value.

c0554d1f

Merge mysql.com:/home/ram/work/mysql-5.0-maint · 4526a260

unknown authored Jun 15, 2007

into  mysql.com:/home/ram/work/mysql-5.1-maint


BitKeeper/deleted/.del-wait_for_slave_io_to_stop.inc:
  Delete: mysql-test/include/wait_for_slave_io_to_stop.inc
BitKeeper/deleted/.del-wait_for_slave_sql_to_stop.inc:
  Delete: mysql-test/include/wait_for_slave_sql_to_stop.inc
BitKeeper/deleted/.del-wait_for_slave_to_start.inc:
  Delete: mysql-test/include/wait_for_slave_to_start.inc
BitKeeper/deleted/.del-wait_for_slave_to_stop.inc:
  Delete: mysql-test/include/wait_for_slave_to_stop.inc

4526a260

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · ba094d1b
unknown authored Jun 15, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


include/violite.h:
  Auto merged
```
ba094d1b
follow-up fix · 5b9e27f2
unknown authored Jun 15, 2007
```
include/violite.h:
  this may already be defined
```
5b9e27f2

Backport of · bd4eab18

unknown authored Jun 15, 2007

mysql-test/include/wait_for_slave_io_to_stop.inc
mysql-test/include/wait_for_slave_sql_to_stop.inc
mysql-test/include/wait_for_slave_to_start.inc
mysql-test/include/wait_for_slave_to_stop.inc
from 5.1


mysql-test/include/wait_for_slave_io_to_stop.inc:
  New BitKeeper file ``mysql-test/include/wait_for_slave_io_to_stop.inc''
mysql-test/include/wait_for_slave_sql_to_stop.inc:
  New BitKeeper file ``mysql-test/include/wait_for_slave_sql_to_stop.inc''
mysql-test/include/wait_for_slave_to_start.inc:
  New BitKeeper file ``mysql-test/include/wait_for_slave_to_start.inc''
mysql-test/include/wait_for_slave_to_stop.inc:
  New BitKeeper file ``mysql-test/include/wait_for_slave_to_stop.inc''

bd4eab18

BUG#27861 merge to 5.1 · 0f75810f
unknown authored Jun 15, 2007

0f75810f

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 993ac255

unknown authored Jun 15, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged

993ac255

Added yassl and taocrypt sources to mysqlclientlib · fbe69396
unknown authored Jun 15, 2007
```
client/CMakeLists.txt:
  Fix for bug #27861: unresolved externals (yassl and taocrypt)
```
fbe69396
Merge damien-katzs-computer.local:/Users/dkatz/mysql51 · 7069ffea
unknown authored Jun 14, 2007
```
into  damien-katzs-computer.local:/Users/dkatz/51_win


sql/sql_parse.cc:
  Auto merged
```
7069ffea
Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/51 · 5c2a786b
unknown authored Jun 15, 2007
```
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


sql/sql_select.cc:
  Auto merged
```
5c2a786b

14 Jun, 2007 16 commits

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 5a81b562

unknown authored Jun 15, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51


configure.in:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/drop_temp_table.test:
  Auto merged
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binlog_stm_binlog.result:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/have_log_bin.require:
  Auto merged
mysql-test/t/flush_block_commit_notembedded.test:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
mysql-test/t/mysqlbinlog-cp932.test:
  Auto merged
mysql-test/t/mysqlbinlog2.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Use local
mysql-test/r/partition.result:
  SCCS merged
mysql-test/t/date_formats.test:
  Use local
mysql-test/t/ndb_basic.test:
  manual merge
mysql-test/t/partition.test:
  manual merge
mysql-test/t/user_var-binlog.test:
  use local

5a81b562

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · c7f1e935

unknown authored Jun 14, 2007

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged

c7f1e935

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 28ec3712

unknown authored Jun 14, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binlog.result:
  Auto merged
mysql-test/r/have_log_bin.require:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test:
  Auto merged
mysql-test/t/binlog.test:
  Auto merged
mysql-test/t/ctype_cp932_binlog.test:
  Auto merged
mysql-test/t/ctype_ucs_binlog.test:
  Auto merged
mysql-test/t/flush_block_commit_notembedded.test:
  Auto merged
mysql-test/t/insert_select-binlog.test:
  Auto merged
mysql-test/t/mysqlbinlog-cp932.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
  Use local
mysql-test/t/blackhole.test:
  manual merge
mysql-test/t/drop_temp_table.test:
  manual merge
mysql-test/t/mix_innodb_myisam_binlog.test:
  Use local
mysql-test/t/mysqlbinlog.test:
  Use local

28ec3712

Merge trift2.:/MySQL/M50/push-5.0 · 3a2f0418
unknown authored Jun 14, 2007
```
into  trift2.:/MySQL/M51/push-5.1


sql/item_func.cc:
  SCCS merged
```
3a2f0418
Merge trift2.:/MySQL/M41/push-4.1 · 56a20fea
unknown authored Jun 14, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
56a20fea
Merge trift2.:/MySQL/M41/mysql-4.1 · 77961c89
unknown authored Jun 14, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
77961c89

Merge trift2.:/MySQL/M50/mysql-5.0 · d25a72a1

unknown authored Jun 14, 2007

into  trift2.:/MySQL/M50/push-5.0


sql/item_func.cc:
  Manual merge: thread identity check was gone from this place in main 5.0.

d25a72a1

Merge trift2.:/MySQL/M51/mysql-5.1 · 68ede71d
unknown authored Jun 14, 2007
```
into  trift2.:/MySQL/M51/push-5.1


sql/item_func.cc:
  Auto merged
```
68ede71d

Bug#21723: Should be able to dump core after setuid() under Linux · 50246ee4

unknown authored Jun 14, 2007

In many cases, binaries can no longer dump core after calling setuid().

Where the PR_SET_DUMPABLE macro is set, use the prctl() system call 
to tell the kernel that it's allowed to dump the core of the server.


configure.in:
  Test system for "sys/prctl.h", to get access to prctl().
sql/mysqld.cc:
  Add a process-control operation that tells the Linux kernel that it 
  is allowed to dump core after setuid().

50246ee4

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 1fcf80e9
unknown authored Jun 14, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
1fcf80e9
Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · f26f2e26
unknown authored Jun 14, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
f26f2e26
fix the binlog-stm_ps.test for the embedded-server · f3984865
unknown authored Jun 14, 2007
```
mysql-test/t/binlog_stm_ps.test:
  embedded server doesn't have binlogs
```
f3984865
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 96484c21
unknown authored Jun 14, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
96484c21

Merge magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-5.0-opt · be2ac023

unknown authored Jun 14, 2007

into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-5.1-opt


tests/mysql_client_test.c:
  manual merge 5.0-opt -> 5.1-opt

be2ac023

Merge bk-internal:/home/bk/mysql-5.0-opt · 19aa79e7
unknown authored Jun 14, 2007
```
into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-merge-5.0-opt
```
19aa79e7
corrected valgrind problems for bug 28505 and 28934 · 5138dcd9
unknown authored Jun 14, 2007

5138dcd9