Commit graph

32 commits

Author SHA1 Message Date
Mats Kindahl
cd34770558 Merging with mysql-5.5-stage. 2010-08-16 14:50:27 +02:00
Mats Kindahl
b1dcf448ea WL#5363: Thread Pool Service Interface
In order to allow thread schedulers to be dynamically loaded,
it is necessary to make the following changes to the server:

- Two new service interfaces

- Modifications to InnoDB to inform the thread scheduler of state changes.

- Changes to the VIO subsystem for checking if data is available on a socket.

- Elimination of remains of the old thread pool implementation.

The two new service interfaces introduces are:

my_thread_scheduler
  A service interface to register a thread
  scheduler.

thd_wait
  A service interface to inform thread scheduler
  that the thread is about to start waiting.

In addition, the patch adds code that:

- Add a call to thd_wait for table locks in mysys
  thd_lock.c by introducing a set function that
  can be used to set a callback to be used when
  waiting on a lock and resuming from waiting.

- Calling the mysys set function from the server
  to set the callbacks correctly.
2010-06-07 16:01:39 +02:00
Alexey Kopytov
a6cf28a7a1 Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:

Text conflict in sql/sql_base.cc
Text conflict in sql/sql_partition.cc
Text conflict in sql/sql_priv.h
Text conflict in sql/sql_show.cc
2010-05-11 20:02:50 +04:00
Mattias Jonsson
3b897f2bc5 Bug#50561: ALTER PARTITIONS does not have adequate lock, breaks with
concurrent I_S query

There were two problem:
1) MYSQL_LOCK_IGNORE_FLUSH also ignored name locks
2) there was a race between abort_and_upgrade_locks and
   alter_close_tables
   (i.e. remove_table_from_cache and
    close_data_files_and_morph_locks)

Which allowed the table to be opened with MYSQL_LOCK_IGNORE_FLUSH flag
resulting in renaming a partition that was already in use,
which could cause the table to be unusable.

Solution was to not allow IGNORE_FLUSH to skip waiting for
a named locked table.

And to not release the LOCK_open mutex between the
calls to remove_table_from_cache and
close_data_files_and_morph_locks by merging the functions
abort_and_upgrade_locks and alter_close_tables.
2010-03-17 15:10:41 +01:00
Marc Alff
a4c3bc618b WL#2360 Performance schema
Part IV: sql instrumentation
2010-01-06 22:42:07 -07:00
Luis Soares
58e2fde011 manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
Conflicts
=========

Text conflict in .bzr-mysql/default.conf
Text conflict in libmysqld/CMakeLists.txt
Text conflict in libmysqld/Makefile.am
Text conflict in mysql-test/collections/default.experimental
Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test
Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/Makefile.am
Text conflict in sql/log_event_old.cc
Text conflict in sql/rpl_rli.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_binlog.cc
Text conflict in sql/sql_lex.h
21 conflicts encountered.

NOTE
====
 mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr:
 - "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr"

 This is the first cset (merge/...) committed after pulling 
 from mysql-next-mr.
2009-10-22 23:30:28 +01:00
Mats Kindahl
4ad8ef0602 WL#5016: Fix header file include guards
Adding header include file guards to files that are missing such.
2009-09-23 23:32:31 +02:00
Marc Alff
d5fd452d7c WL#2110 (SIGNAL)
WL#2265 (RESIGNAL)

Manual merge of SIGNAL and RESIGNAL to mysql-trunk-signal,
plus required dependencies.
2009-09-10 03:18:29 -06:00
brian@zim.(none)
45d7dff67d Correctly report load type.
Updated engine to also handle create options
Secondary indexes can now be generated (aka the test PeterZ thoughts!)
2007-03-15 23:39:07 -07:00
kent@mysql.com/kent-amd64.(none)
67868597bb Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header
2006-12-31 02:29:11 +01:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa Many files:
Changed header to GPL version 2 only
2006-12-27 02:23:51 +01:00
arjen@mysql.com/albus.bitbike.com
f5cebbdfba errmsg.txt:
Update of Dutch errmsg translations (not complete yet)
errmsg.h:
  Fixup of changed error message file path in comment
authors.h:
  Ego add.
2006-09-07 13:52:30 +10:00
andrey@lmy004.
1edd2cf833 update show authors 2006-05-30 10:22:31 +02:00
petr@mysql.com
67d3675549 update show authors 2006-05-30 03:26:58 +04:00
aelkin@mysql.com
6ddab61813 Andrei Elkin has arrived. 2006-04-01 14:17:01 +03:00
hakan@lu0008.wdf.sap.corp
9b9ebd83eb Hakan Kuecuekyilmaz 2006-03-30 15:54:32 +02:00
acurtis@xiphis.org
13a776778c Finalize storage engine plugins
Give BerkeleyDB savepoints
Remove "enum db_type" from most of the code
2005-12-21 10:18:40 -08:00
jimw@mysql.com
0538845963 Merge mysql.com:/home/jimw/my/mysql-5.1-release
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2005-11-30 13:51:23 -08:00
jimw@mysql.com
0f9f53c321 Add Ingo to SHOW AUTHORS 2005-11-28 18:28:31 -08:00
jimw@mysql.com
30bafb78a8 Small tweaks to SHOW AUTHORS list 2005-11-28 18:14:16 -08:00
jimw@mysql.com
d0c2f3cfd6 Update list of authors with information from documentation. 2005-11-28 15:32:26 -08:00
reggie@fedora.(none)
c171f8c6c6 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  fedora.(none):/home/reggie/bk/mysql-5.1-new
2005-11-28 08:07:56 -06:00
knielsen@mysql.com
146716e645 Added my name. 2005-11-28 12:05:08 +01:00
kent@mysql.com
0261697138 2005-11-28 11:28:07 +01:00
reggie@fedora.(none)
359516fde1 Added myself to authors table for 5.1 2005-11-27 09:06:46 -06:00
lars@mysql.com
97b6713a59 Added my name
Changed to alphabetical order
2005-11-27 13:58:50 +01:00
eric@mysql.com
d62733e93d Fixed failing "show check" test. 2005-11-25 11:05:35 -08:00
holyfoot@deer.(none)
60a7a6c079 HF mentioned in authors.h 2005-11-25 14:46:27 +04:00
pem@mysql.com
f1f257c06c Added myself to authors.h. 2005-11-23 11:07:08 +01:00
konstantin@mysql.com
c20fe5dffd More authors. 2005-11-18 14:39:44 +03:00
omer@mysql.com
46f140deb3 Updated authors.h file (and show_check.result file) to include QA team members
Note: This change was reviewed by Brian before the commit.
2005-11-17 17:35:50 -08:00
brian@grrr.local
9807162144 Added "SHOW AUTHORS" code 2005-11-10 19:43:17 +02:00