summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-191-3/+0
| | | | | | | | | (make relies GNU extentions). The patch was partially backport from 6.0. Original comment: bug#30708: make relies GNU extensions. Now that we no longer use BitKeeper we can safely remove the SCCS handling with no loss of functionality.
* Include mysql/innodb_priv.h into 'make dist'.Alexander Nozdrin2010-05-041-1/+1
|
* Merging with mysql-trunk-bugfixingMats Kindahl2010-04-219-12/+96
|\
| * Merge the changes of the 5.5.3-m3 release buildJoerg Bruehe2010-04-181-4/+13
| |\ | | | | | | | | | back into the development branches.
| | * Make the libraries we produce on Windows actually usableDaniel Fischer2010-04-161-4/+13
| | |
| * | Merge fixes for BUG46587 and BUG47059 to trunk-bugfixing.Sergey Vojtovich2010-04-151-3/+4
| |\ \
| | * | BUG#47059 - In audit plugin I cannot see the event subclasses,Sergey Vojtovich2010-04-151-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e.g.MYSQL_AUDIT_GENERAL_ERROR General audit API (MYSQL_AUDIT_GENERAL_CLASS) didn't expose event subclass to plugins. This patch exposes event subclass to plugins via struct mysql_event_general::event_subclass. This change is not compatible with existing general audit plugins. Audit interface major version has been incremented.
| * | | Post-fix for Bug#13174.Alexander Nozdrin2010-04-131-2/+8
| | | |
| * | | Backport of:Konstantin Osipov2010-04-137-5/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChangeSet@1.2703, 2007-12-07 09:35:28-05:00, cmiller@zippy.cornsilk.net +40 -0 Bug#13174: SHA2 function Patch contributed from Bill Karwin, paper unnumbered CLA in Seattle Implement SHA2 functions. Chad added code to make it work with YaSSL. Also, he removed the (probable) bug of embedded server never using SSL-dependent functions. (libmysqld/Makefile.am didn't read ANY autoconf defs.) Function specification: SHA2( string cleartext, integer hash_length ) -> string hash, or NULL where hash_length is one of 224, 256, 384, or 512. If either is NULL or a length is unsupported, then the result is NULL. The resulting string is always the length of the hash_length parameter or is NULL. Include the canonical hash examples from the NIST in the test results. --- Polish and address concerns of reviewers.
* | | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-211-1/+3
|/ / / | | | | | | | | | Removing traces of mysql_priv.h from comments and other non-source files that were missed before.
* | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-061-9/+7
| | | | | | | | | | | | Moving an extern "C" to not cover #includes.
* | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-061-0/+35
| | | | | | | | | | | | - Adding include/mysql/innodb_priv.h which was missing before. - Updated .bzrignore to ignore CMake generated cruft.
* | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-3119-11/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch: - Moves all definitions from the mysql_priv.h file into header files for the component where the variable is defined - Creates header files if the component lacks one - Eliminates all include directives from mysql_priv.h - Eliminates all circular include cycles - Rename time.cc to sql_time.cc - Rename mysql_priv.h to sql_priv.h
* | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-2451-848/+6151
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Text conflict in client/mysqlbinlog.cc Text conflict in mysql-test/Makefile.am Text conflict in mysql-test/collections/default.daily Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test Text conflict in mysys/charset.c Text conflict in sql/field.cc Text conflict in sql/field.h Text conflict in sql/item.h Text conflict in sql/item_func.cc Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/log_event_old.cc Text conflict in sql/mysqld.cc Text conflict in sql/rpl_utility.cc Text conflict in sql/rpl_utility.h Text conflict in sql/set_var.cc Text conflict in sql/share/Makefile.am Text conflict in sql/sql_delete.cc Text conflict in sql/sql_plugin.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_table.cc Text conflict in storage/example/ha_example.h Text conflict in storage/federated/ha_federated.cc Text conflict in storage/myisammrg/ha_myisammrg.cc Text conflict in storage/myisammrg/myrg_open.c
| * | Bug#51878 Build break in HPUX involving mysql_prlock on a clientMarc Alff2010-03-091-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a fix specific for HPUX, for which the compiler does not resolve properly dependencies involving unused inline functions. (See existing comments in mysql_thread.h) In include/mysql/psi/mysql_thread.h, the instrumentation helpers for mysql_prlock_* uses the pr lock apis. These apis are implemented in mysys/thr_rwlock.c, which is not linked to client code. As a result, the code does not link in libmysql_r, on HPUX. The fix is to cut dependencies explicitely, by introducing -DDISABLE_MYSQL_RWLOCK_H, when building client code.
| * | Bug#51295 Build warnings in mdl.ccMarc Alff2010-03-071-1/+265
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Before this fix, the performance schema instrumentation in mdl.h / mdl.cc was incomplete, causing: - build warnings, - no data collection for the performance schema This fix: - added instrumentation helpers for the new preferred reader read write lock, mysql_prlock_* - implemented completely the performance schema instrumentation of mdl.h / mdl.cc
| * Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2010-03-042-18/+58
| |\
| | * Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-022-5/+60
| | |\ | | | | | | | | | | | | Conflicts: - sql/sql_base.cc
| | * | Fix for bug #51105 "MDL deadlock in rqg_mdl_stability testDmitry Lenev2010-02-281-12/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on Windows". On platforms where read-write lock implementation does not prefer readers by default (Windows, Solaris) server might have deadlocked while detecting MDL deadlock. MDL deadlock detector relies on the fact that read-write locks which are used in its implementation prefer readers (see new comment for MDL_lock::m_rwlock for details). So far MDL code assumed that default implementation of read/write locks for the system has this property. Indeed, this turned out ot be wrong, for example, for Windows or Solaris. Thus MDL deadlock detector might have deadlocked on these systems. This fix simply adds portable implementation of read/write lock which prefer readers and changes MDL code to use this new type of synchronization primitive. No test case is added as existing rqg_mdl_stability test can serve as one.
| | * | Bug#41103 6.0 Windows embedded-server tests failAlexey Botchkov2010-02-251-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two problems addressed here: Embedded-server linking failure. sql/sys_vars.cc absents in the libmysqld/CMakeLists.txt The PERFORMANCE_SCHEMA-related failure of the embedded-server compilation. We try to disable the PERFORMANCE_SCHEMA in the embedded server as it's considered useless there. But we do it in wrong way as we only disable header's links to the PF, not the PF's library itself. So on Unix-ex the embedded library still contains the PF code and grows bigger with no reason. On Windows that just fails to compile. per-file comments: include/my_global.h Bug#41103 6.0 Windows embedded-server tests fail No PERFORMANCE_SCHEMA disabling in the embedded server. User can just use the --without-perfschema-engine-plugin option to exclude it from the compilation.
| * | | A joint patch for:Alexander Barkov2010-03-041-0/+1
| | |/ | |/| | | | | | | | | | Bug#51675 Server crashes on inserting 4 byte char. after ALTER TABLE to 'utf8mb4' Bug#51676 Server crashes on SELECT, ORDER BY on 'utf8mb4' column
| * | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-252-3/+3
| |\ \ | | |/
| | * Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2010-02-2313-29/+359
| | |\
| | * | Fix compiler warnings in my_atomic.hKonstantin Osipov2010-02-192-3/+3
| | | |
| * | | Merging WL#1213 into mysql-next-mr-bar2Alexander Barkov2010-02-242-5/+60
| |\ \ \ | | |_|/ | |/| |
| | * | Backporting WL#1213Alexander Barkov2010-02-242-5/+60
| | | |
| * | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-212-0/+9
| |\ \ \
| | * | | Patch for WL#3736: Extended Table, Column and Index Comments.Alexander Nozdrin2010-02-202-0/+9
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | The task is to (a) add a comment on indexes and (b) increase the maximum length of column, table and the new index comments. The patch committed on behalf of Yoshinori Matsunobu (Yoshinori.Matsunobu@Sun.COM).
| * | | mergeVladislav Vaintroub2010-02-181-0/+17
| |\ \ \ | | |/ /
| | * | Re-adding 'include/probes_mysql_nodtrace.h' removed by accidentAlexander Nozdrin2010-02-171-0/+129
| | | | | | | | | | | | | | | | | | | | in 'kostja@sun.com-20091210084103-l4f8u62u4evoy3dc'. This file is necessary for Windows builds.
| | * | Merging from mysql-next-mrAlexander Barkov2010-02-176-137/+76
| | |\ \ | | | |/
| | * | Post-fix for WL#3090.Alexander Barkov2010-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | Compilation failure problems on non-i386 platforms. Adding missing parenthesis.
| | * | WL#3090 Japanese Character Set adjustmentsAlexander Barkov2010-02-151-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added: @ mysql-test/include/ctype_utf8_table.inc Adding a share file to populate all utf8 values [U+0000..U+FFFF] modified: @ include/m_ctype.h Introducing MB2 and MY_PUT_MB2 macros @ mysql-test/r/ctype_cp932_binlog_stm.result @ mysql-test/r/ctype_eucjpms.result @ mysql-test/r/ctype_sjis.result @ mysql-test/r/ctype_ujis.result @ mysql-test/t/ctype_cp932_binlog_stm.test @ mysql-test/t/ctype_eucjpms.test @ mysql-test/t/ctype_sjis.test @ mysql-test/t/ctype_ujis.test Adding test @ strings/ctype-cp932.c @ strings/ctype-eucjpms.c @ strings/ctype-sjis.c @ strings/ctype-ujis.c Adding new functions using Big-Table approach.
| * | | mergeVladislav Vaintroub2010-02-165-8/+76
| |\ \ \ | | | |/ | | |/|
| | * | Auto-merge from mysql-next-4284.Alexander Nozdrin2010-02-151-1/+0
| | |\ \
| | | * | Followup to Bug#45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the unused server variable "table_lock_wait_timeout".
| | * | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-152-1/+8
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | | | | Conflicts: - sql/log_event.cc - sql/sql_class.h
| | * | Bug #45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-112-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces timeouts for metadata locks. The timeout is specified in seconds using the new dynamic system variable "lock_wait_timeout" which has both GLOBAL and SESSION scopes. Allowed values range from 1 to 31536000 seconds (= 1 year). The default value is 1 year. The new server parameter "lock-wait-timeout" can be used to set the default value parameter upon server startup. "lock_wait_timeout" applies to all statements that use metadata locks. These include DML and DDL operations on tables, views, stored procedures and stored functions. They also include LOCK TABLES, FLUSH TABLES WITH READ LOCK and HANDLER statements. The patch also changes thr_lock.c code (table data locks used by MyISAM and other simplistic engines) to use the same system variable. InnoDB row locks are unaffected. One exception to the handling of the "lock_wait_timeout" variable is delayed inserts. All delayed inserts are executed with a timeout of 1 year regardless of the setting for the global variable. As the connection issuing the delayed insert gets no notification of delayed insert timeouts, we want to avoid unnecessary timeouts. It's important to note that the timeout value is used for each lock acquired and that one statement can take more than one lock. A statement can therefore block for longer than the lock_wait_timeout value before reporting a timeout error. When lock timeout occurs, ER_LOCK_WAIT_TIMEOUT is reported. Test case added to lock_multi.test.
| | * | Merge next-mr -> next-4284.Konstantin Osipov2010-02-068-213/+341
| | |\ \
| | * \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-0/+6
| | |\ \ \
| | * \ \ \ Merge next-mr -> next-4284-merge.Konstantin Osipov2010-02-041-3/+11
| | |\ \ \ \
| | * \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-1/+4
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-0320-282/+139
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge next-mr -> next-4284. Konstantin Osipov2010-02-023-5/+36
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Bug#50555 "handler commands crash server in my_hash_first()" as a post-merge fix (the new handler tests are not passing otherwise). - in hash.c, don't call calc_hash if ! my_hash_inited(). - add tests and results for the test case for Bug#50555
| | * \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-029-16/+96
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-0214-83/+157
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-1515-18/+3811
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Merge with next-4284.Konstantin Osipov2009-12-101-129/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-032-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ----------------------------------------------------------- 2497.479.10 Sergei Golubchik 2008-08-27 proc_info_hook, mysys access to thd->proc_info This patch is necessary for backport of WL#4284 "Transactional DDL locking".
View Lorry Controller Status