mariadb

Tree: d609478ae1

vasil d609478ae1 branches/zip: Merge 2485:2489 from branches/5.1: ------------------------------------------------------------------------ r2488 \| vasil \| 2008-06-09 13:53:12 +0300 (Mon, 09 Jun 2008) \| 15 lines Changed paths: M /branches/5.1/mysql-test/innodb.result branches/5.1: Merge change from MySQL (this almost fixes the failing innodb test): ChangeSet@1.2613, 2008-05-07 09:58:21+04:00, sergefp@mysql.com +5 -0 BUG#35850 "Performance regression in 5.1.23/5.1.24" - Disable the "prefer full scan on clustered primary key over full scan of any secondary key" rule introduced by BUG#35850. - Update test results accordingly (bk trigger: file this for BUG#35850) mysql-test/r/innodb.result@1.214, 2008-05-07 09:57:31+04:00, sergefp@mysql.com +15 -15 BUG#35850 "Performance regression in 5.1.23/5.1.24" - Update test results ------------------------------------------------------------------------ r2489 \| vasil \| 2008-06-09 14:16:51 +0300 (Mon, 09 Jun 2008) \| 20 lines Changed paths: M /branches/5.1/mysql-test/innodb.result branches/5.1: Merge change from MySQL (this fixes the failing innodb test): ChangeSet@1.2628 2008-05-13 17:01:02+05:00 gshchepa@host.loc Merge host.loc:/work/bugs/5.0-bugteam-30059 into host.loc:/work/bk/5.1-bugteam NOTE: the diff for mysql-test/r/innodb.result in this ChangeSet looks empty but the line: Data truncated for column 'c' at row 1 is present in annotated mysql-test/r/innodb.result@1.215 [1] and not present in annotated mysql-test/r/innodb.result@1.216 [2] so it must have been deleted in the above ChangeSet. [1] http://mysql.bkbits.net:8080/mysql-5.1/mysql-test/r/innodb.result?PAGE=anno&REV=4825e033JNz_463Ha9pwInSjqLvIQg [2] http://mysql.bkbits.net:8080/mysql-5.1/mysql-test/r/innodb.result?PAGE=anno&REV=482982fcUoskWjhU2xMH2BZ4Gyukfg ------------------------------------------------------------------------		18 years ago
btr	branches/zip: Fix bug introduced in r2453.	18 years ago
buf	branches/zip: Merge 2437:2485 from branches/5.1:	18 years ago
data	branches/zip: Implement the configuration parameter and settable global	18 years ago
dict	branches/zip: Merge 2367:2384 from branches/5.1.	18 years ago
dyn	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global	18 years ago
eval	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global	18 years ago
fil	branches/zip:	18 years ago
fsp	branches/zip: Pass the tablespace flags correctly when creating or opening	18 years ago
fut	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global	18 years ago
ha	branches/zip: ut_is_2pow(), ut_2pow_round(), ut_2pow_remainder(): Define	18 years ago
handler	branches/zip: Merge 2437:2485 from branches/5.1:	18 years ago
ibuf	branches/zip: Rename ib_ulonglong to ib_uint64_t and ib_longlong to ib_int64_t.	18 years ago
include	branches/zip: Merge 2437:2485 from branches/5.1:	18 years ago
lock	branches/zip: Fix most MSVC (Windows) compilation warnings.	18 years ago
log	branches/zip: Rename ib_ulonglong to ib_uint64_t and ib_longlong to ib_int64_t.	18 years ago
mach	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global	18 years ago
mem	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global	18 years ago
mtr	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global	18 years ago
mysql-test	branches/zip: Merge 2485:2489 from branches/5.1:	18 years ago
os	branches/zip: Merge 2437:2485 from branches/5.1:	18 years ago
page	branches/zip: Rename the INFORMATION_SCHEMA tables	18 years ago
pars	branches/zip: make_flex.sh, lexyy.c: Remove some GCC warnings about unused	18 years ago
que	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global	18 years ago
read	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global	18 years ago
rem	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global	18 years ago
row	branches/zip: Merge 2384:2423 from branches/5.1:	18 years ago
scripts	Rename install_dynamic.sql to install_innodb_plugins.sql	18 years ago
srv	branches/zip: Merge 2437:2485 from branches/5.1:	18 years ago
sync	branches/zip:	18 years ago
thr	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global	18 years ago
trx	branches/zip: Non functional change.	18 years ago
usr	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global	18 years ago
ut	branches/zip: Merge 2437:2485 from branches/5.1:	18 years ago
CMakeLists.txt	branches/zip: Merge 2295:2367 from branches/5.1.	18 years ago
ChangeLog	branches/zip:	18 years ago
Makefile.am	branches/zip: Merge 2423:2437 from branches/5.1:	18 years ago
compile-innodb	branches/zip: Merge revisions 767:789 from trunk.	19 years ago
compile-innodb-debug	branches/zip: Merge revisions 767:789 from trunk.	19 years ago
plug.in	branches/zip: Merge 2423:2437 from branches/5.1:	18 years ago
revert_gen.sh	branches/zip: Merge revisions 265:459 from trunk.	20 years ago
setup.sh	branches/zip: Merge 2015:2093 from trunk.	18 years ago