mariadb

Tree: ef6fcca5b1

Satya B ef6fcca5b1 Applying InnoDB Plugin 1.0.5 snapshot , part 9 r5888 - plug.in related changes skipped r5889 - skipped(plug.in related changes) r5916 - innodb_bug4600.test and innodb_bug44369.test already exists in main suite Detailed revision comments: r5875 \| vasil \| 2009-09-12 07:11:25 -0500 (Sat, 12 Sep 2009) \| 4 lines branches/zip: Remove unnecessary macro. r5888 \| vasil \| 2009-09-14 03:38:45 -0500 (Mon, 14 Sep 2009) \| 40 lines branches/zip: Back-merge c5880 and c5881 from branches/embedded-1.0: ------------------------------------------------------------------------ r5880 \| vasil \| 2009-09-12 17:28:44 +0300 (Sat, 12 Sep 2009) \| 18 lines Changed paths: M /branches/embedded-1.0/configure.in M /branches/embedded-1.0/include/os0sync.h M /branches/embedded-1.0/srv/srv0start.c branches/embedded-1.0: Clean up and simplify the code that surrounds the atomic ops: * Simplify the code that prints what atomics are used: Instead of repeating the same conditions on which each atomics are used use just one printf that prints a variable defined by the code which chooses what atomics to use. * In os0sync.h pick up each atomic variant only if it has been selected by autoconf (based on IB_ATOMIC_MODE_* macros). Define the startup message to be printed. * In configure.in: check what user has chosen and if he has chosen something that is not available, emit an error. If nothing has been chosen explicitly by the user, auto select an option according to the described logic in configure.in. ------------------------------------------------------------------------ r5881 \| vasil \| 2009-09-12 20:08:27 +0300 (Sat, 12 Sep 2009) \| 4 lines Changed paths: M /branches/embedded-1.0/configure.in branches/embedded-1.0: Fix syntax error in test program. r5910 \| marko \| 2009-09-16 03:07:21 -0500 (Wed, 16 Sep 2009) \| 9 lines branches/zip: Introduce UNIV_LOG_LSN_DEBUG and MLOG_LSN for redo log diagnostics. This was written in order to better track down Issue #313 in InnoDB Hot Backup. MLOG_LSN: A new redo log entry type, for recording the current log sequence number (LSN). This will be checked in an assertion in recv_parse_log_rec(). rb://161, discussed with Sunny and Vasil. r5916 \| marko \| 2009-09-16 04:54:43 -0500 (Wed, 16 Sep 2009) \| 128 lines branches/zip: Merge revisions 5622:5912 from branches/5.1, except r5700 (changes to CMakeLists.txt) ------------------------------------------------------------------------ r5622 \| vasil \| 2009-08-03 15:27:00 +0300 (Mon, 03 Aug 2009) \| 20 lines Changed paths: M /branches/5.1/Makefile.am branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2988 committer: Satya B <satya.bn@sun.com> branch nick: mysql-5.1-bugteam timestamp: Wed 2009-07-01 11:06:05 +0530 message: Fix build failure after applying Innodb snapshot 5.1-ss5282 After applying Innodb snapshot 5.1-ss5282, build was broken because of missing header file. Adding the header file to Makefile.am after informing the innodb developers. modified: storage/innobase/Makefile.am ------------------------------------------------------------------------ r5740 \| jyang \| 2009-09-03 06:33:47 +0300 (Thu, 03 Sep 2009) \| 5 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/include/db0err.h A /branches/5.1/mysql-test/innodb_bug46000.result A /branches/5.1/mysql-test/innodb_bug46000.test branches/5.1: Disallow creating index with the name of "GEN_CLUST_INDEX" which is reserved for the default system primary index. (Bug #46000) rb://149 approved by Sunny Bains. ------------------------------------------------------------------------ r5741 \| jyang \| 2009-09-03 07:16:01 +0300 (Thu, 03 Sep 2009) \| 5 lines Changed paths: M /branches/5.1/dict/dict0dict.c M /branches/5.1/handler/ha_innodb.cc A /branches/5.1/mysql-test/innodb_bug44369.result A /branches/5.1/mysql-test/innodb_bug44369.test M /branches/5.1/row/row0mysql.c branches/5.1: Block creating table with column name conflicting with Innodb reserved key words. (Bug #44369) rb://151 approved by Sunny Bains. ------------------------------------------------------------------------ r5757 \| jyang \| 2009-09-04 04:26:13 +0300 (Fri, 04 Sep 2009) \| 3 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/include/db0err.h D /branches/5.1/mysql-test/innodb_bug46000.result D /branches/5.1/mysql-test/innodb_bug46000.test branches/5.1: Revert change in 5740. Making the fix in a subsequent check in. ------------------------------------------------------------------------ r5760 \| jyang \| 2009-09-04 07:07:34 +0300 (Fri, 04 Sep 2009) \| 3 lines Changed paths: M /branches/5.1/dict/dict0dict.c M /branches/5.1/handler/ha_innodb.cc D /branches/5.1/mysql-test/innodb_bug44369.result D /branches/5.1/mysql-test/innodb_bug44369.test M /branches/5.1/row/row0mysql.c branches/5.1: This is to revert change 5741. A return status for create_table_def() needs to be fixed. ------------------------------------------------------------------------ r5797 \| calvin \| 2009-09-09 18:26:29 +0300 (Wed, 09 Sep 2009) \| 3 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: merge change from 5.1.38 HA_ERR_TOO_MANY_CONCURRENT_TRXS is added in 5.1.38. ------------------------------------------------------------------------ r5799 \| calvin \| 2009-09-09 20:47:31 +0300 (Wed, 09 Sep 2009) \| 10 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: fix bug#46256 Allow tables to be dropped even if the collation is not found, but issue a warning. Could not find an easy way to add mysql-test since it requires changes to charsets and restarting the server. Tests were executed manually. Approved by: Heikki (on IM) ------------------------------------------------------------------------ r5805 \| vasil \| 2009-09-10 08:41:48 +0300 (Thu, 10 Sep 2009) \| 7 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Fix a compilation warning caused by c5799: handler/ha_innodb.cc: In function 'void innobase_get_cset_width(ulint, ulint, ulint)': handler/ha_innodb.cc:830: warning: format '%d' expects type 'int', but argument 2 has type 'ulint' ------------------------------------------------------------------------ r5834 \| jyang \| 2009-09-11 00:43:05 +0300 (Fri, 11 Sep 2009) \| 5 lines Changed paths: M /branches/5.1/dict/dict0dict.c M /branches/5.1/handler/ha_innodb.cc A /branches/5.1/mysql-test/innodb_bug44369.result A /branches/5.1/mysql-test/innodb_bug44369.test M /branches/5.1/row/row0mysql.c branches/5.1: Block creating table with column name conflicting with Innodb reserved key words. (Bug #44369) rb://151 approved by Sunny Bains. ------------------------------------------------------------------------ r5895 \| jyang \| 2009-09-15 03:39:21 +0300 (Tue, 15 Sep 2009) \| 5 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc A /branches/5.1/mysql-test/innodb_bug46000.result A /branches/5.1/mysql-test/innodb_bug46000.test branches/5.1: Disallow creating index with the name of "GEN_CLUST_INDEX" which is reserved for the default system primary index. (Bug #46000) rb://149 approved by Marko Makela. ------------------------------------------------------------------------		16 years ago
..
btr	Applying InnoDB Plugin 1.0.5 snapshot, part 4	16 years ago
buf	Applying InnoDB Plugin 1.0.5 snapshot, part 7	16 years ago
data	null merge of the backport of Chad's fix for bug #39326 to 5.1-bugteam	16 years ago
dict	Applying InnoDB Plugin 1.0.5 snapshot , part 9	16 years ago
dyn	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
eval	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
fil	null merge of the backport of Chad's fix for bug #39326 to 5.1-bugteam	16 years ago
fsp	Applying InnoDB Plugin 1.0.5 snapshot, part 2	16 years ago
fut	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
ha	null merge of the backport of Chad's fix for bug #39326 to 5.1-bugteam	16 years ago
handler	Applying InnoDB Plugin 1.0.5 snapshot , part 9	16 years ago
ibuf	null merge of the backport of Chad's fix for bug #39326 to 5.1-bugteam	16 years ago
include	Applying InnoDB Plugin 1.0.5 snapshot , part 9	16 years ago
lock	Applying InnoDB Plugin 1.0.5 snapshot , part 5	16 years ago
log	Applying InnoDB Plugin 1.0.5 snapshot , part 9	16 years ago
mach	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
mem	Applying InnoDB Plugin 1.0.5 snapshot, part 2	16 years ago
mtr	Applying InnoDB Plugin 1.0.5 snapshot , part 5	16 years ago
mysql-test	Applying InnoDB Plugin 1.0.5 snapshot , part 1	16 years ago
os	Applying InnoDB Plugin 1.0.5 snapshot, part 6	16 years ago
page	Applying InnoDB Plugin 1.0.5 snapshot , part 5	16 years ago
pars	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
que	null merge of the backport of Chad's fix for bug #39326 to 5.1-bugteam	16 years ago
read	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
rem	Applying InnoDB Plugin 1.0.5 snapshot, part 2	16 years ago
row	Applying InnoDB Plugin 1.0.5 snapshot , part 9	16 years ago
scripts	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
srv	Applying InnoDB Plugin 1.0.5 snapshot , part 9	16 years ago
sync	Applying InnoDB Plugin 1.0.5 snapshot , part 8	16 years ago
thr	Applying InnoDB Plugin 1.0.5 snapshot, part 2	16 years ago
trx	Applying InnoDB Plugin 1.0.5 snapshot, part 7	16 years ago
usr	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
ut	Applying InnoDB Plugin 1.0.5 snapshot , part 8	16 years ago
win-plugin	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
CMakeLists.txt	null merge of the backport of Chad's fix for bug #39326 to 5.1-bugteam	16 years ago
COPYING	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
COPYING.Google	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
COPYING.Percona	null merge of the backport of Chad's fix for bug #39326 to 5.1-bugteam	16 years ago
COPYING.Sun_Microsystems	null merge of the backport of Chad's fix for bug #39326 to 5.1-bugteam	16 years ago
ChangeLog	Applying InnoDB Plugin 1.0.5 snapshot , part 5	16 years ago
Doxyfile	null merge of the backport of Chad's fix for bug #39326 to 5.1-bugteam	16 years ago
Makefile.am	null merge of the backport of Chad's fix for bug #39326 to 5.1-bugteam	16 years ago
README	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
compile-innodb	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
compile-innodb-debug	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
ha_innodb.def	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago
plug.in	Applying InnoDB Plugin 1.0.5 snapshot, part 7	16 years ago
setup.sh	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago

README

This is the source of the InnoDB Plugin 1.0.4 for MySQL 5.1
===========================================================

Instructions for compiling the plugin:
--------------------------------------

1. Get the latest MySQL 5.1 sources from
   http://dev.mysql.com/downloads/mysql/5.1.html#source

2. Replace the contents of the mysql-5.1.N/storage/innobase/ directory
   with the contents of this directory.

3. Optional (only necessary if you are going to run tests from the
   mysql-test suite): cd into the innobase directory and run ./setup.sh

4. Compile MySQL as usual.

5. Enjoy!

See the online documentation for more detailed instructions:
http://www.innodb.com/doc/innodb_plugin-1.0/innodb-plugin-installation.html

For more information about InnoDB visit
http://www.innodb.com

Please report any problems or issues with the plugin in the InnoDB Forums
http://forums.innodb.com/ or in the MySQL Bugs database http://bugs.mysql.com

Thank you for using the InnoDB plugin!