#At file:///work2/5.1/mysql-5.1-bugteam-federated/
------------------------------------------------------------
revno: 2738
revision-id: matthias.leich@stripped
parent: matthias.leich@stripped
parent: kpettersson@stripped
committer: Matthias Leich <Matthias.Leich@stripped>
branch nick: mysql-5.1-bugteam-federated
timestamp: Di 2008-09-16 15:45:21 +0200
message:
Merge actual bugteam tree -> local tree
renamed:
mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result => mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result sp1f-rpl_truncate_7ndb_2.-20060622194417-aphojvtml7fwze6qxlbwcaudgcnm43bq
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt => mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt sp1f-rpl_truncate_7ndb_2m-20060622194417-zimlzlewstxy7a4vcxzvgrxrdijkfzh3
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test => mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test sp1f-rpl_truncate_7ndb_2.-20060622194418-iezhg6gzwibksi4t4mc2n54isf4324ag
modified:
configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
extra/Makefile.am sp1f-makefile.am-19700101030959-6ar5huea7wfhv7gzwizsa5dchtxnjyzm
man/Makefile.am sp1f-makefile.am-19700101030959-aebuhyyaw7p6br3cp7egpta7aihvrxne
mysql-test/r/ctype_ucs.result sp1f-ctype_ucs.result-20030916112630-sohywipskzw3eqmbhfsqxqjteoun6t2g
mysql-test/r/mysqldump.result sp1f-mysqldump.result-20030924111344-ly2xhpckbj53fyoa7kllzxyruwj4cg54
mysql-test/suite/ndb/r/ndb_alter_table.result sp1f-ndb_alter_table.resu-20040505112219-wswqzi6ddeyuq2d4mldelynwlwpkwboe
mysql-test/suite/ndb/t/ndb_alter_table.test sp1f-ndb_alter_table.test-20040505112212-uv7vpaxsitj3cnhtvq4aq7ddnn5dyuof
mysql-test/t/ctype_ucs.test sp1f-ctype_ucs.test-20030916112631-7diba44oovwv3h5kqbswfqbveczwbrxv
mysql-test/t/mysqldump.test sp1f-mysqldump.test-20030924111344-fh6llfm45dls3uxwugociq3shkpxsxn3
mysys/stacktrace.c sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
scripts/make_binary_distribution.sh sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy
sql/field.cc sp1f-field.cc-19700101030959-f4imaofclsea3n4fj4ow5m7havmyxa2r
sql/ha_ndbcluster.cc sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
sql/mysql_priv.h sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
sql/sql_insert.cc sp1f-sql_insert.cc-19700101030959-xgwqe5svnimxudzdcuitauljzz2zjk5g
sql/sql_table.cc sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
support-files/mysql.spec.sh sp1f-mysql.spec.sh-19700101030959-man6e3acwxvf62bdqvkpcpsvdtokf3ff
win/create_manifest.js sp1f-create_manifest.js-20070423194122-zsuevuf4zcrnzoktjc5adhxa735zkzbh
zlib/gzio.c sp1f-gzio.c-20020319040627-dzt3rl3kklylxis35ym3ldjtzvu7xagn
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result sp1f-rpl_truncate_7ndb_2.-20060622194417-aphojvtml7fwze6qxlbwcaudgcnm43bq
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test sp1f-rpl_truncate_7ndb_2.-20060622194418-iezhg6gzwibksi4t4mc2n54isf4324ag
------------------------------------------------------------
revno: 2736.1.2
revision-id: kpettersson@stripped
parent: kpettersson@stripped
parent: patrick.crews@stripped
committer: Kristofer Pettersson <kpettersson@stripped>
branch nick: mysql-5.1-bugteam
timestamp: Mo 2008-09-15 23:44:58 +0200
message:
Automerge
renamed:
mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result => mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result sp1f-rpl_truncate_7ndb_2.-20060622194417-aphojvtml7fwze6qxlbwcaudgcnm43bq
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt => mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt sp1f-rpl_truncate_7ndb_2m-20060622194417-zimlzlewstxy7a4vcxzvgrxrdijkfzh3
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test => mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test sp1f-rpl_truncate_7ndb_2.-20060622194418-iezhg6gzwibksi4t4mc2n54isf4324ag
modified:
configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
extra/Makefile.am sp1f-makefile.am-19700101030959-6ar5huea7wfhv7gzwizsa5dchtxnjyzm
man/Makefile.am sp1f-makefile.am-19700101030959-aebuhyyaw7p6br3cp7egpta7aihvrxne
mysql-test/r/ctype_ucs.result sp1f-ctype_ucs.result-20030916112630-sohywipskzw3eqmbhfsqxqjteoun6t2g
mysql-test/r/mysqldump.result sp1f-mysqldump.result-20030924111344-ly2xhpckbj53fyoa7kllzxyruwj4cg54
mysql-test/suite/ndb/r/ndb_alter_table.result sp1f-ndb_alter_table.resu-20040505112219-wswqzi6ddeyuq2d4mldelynwlwpkwboe
mysql-test/suite/ndb/t/ndb_alter_table.test sp1f-ndb_alter_table.test-20040505112212-uv7vpaxsitj3cnhtvq4aq7ddnn5dyuof
mysql-test/t/ctype_ucs.test sp1f-ctype_ucs.test-20030916112631-7diba44oovwv3h5kqbswfqbveczwbrxv
mysql-test/t/mysqldump.test sp1f-mysqldump.test-20030924111344-fh6llfm45dls3uxwugociq3shkpxsxn3
mysys/stacktrace.c sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
scripts/make_binary_distribution.sh sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy
sql/field.cc sp1f-field.cc-19700101030959-f4imaofclsea3n4fj4ow5m7havmyxa2r
sql/ha_ndbcluster.cc sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
sql/mysql_priv.h sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
sql/sql_table.cc sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
support-files/mysql.spec.sh sp1f-mysql.spec.sh-19700101030959-man6e3acwxvf62bdqvkpcpsvdtokf3ff
win/create_manifest.js sp1f-create_manifest.js-20070423194122-zsuevuf4zcrnzoktjc5adhxa735zkzbh
zlib/gzio.c sp1f-gzio.c-20020319040627-dzt3rl3kklylxis35ym3ldjtzvu7xagn
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result sp1f-rpl_truncate_7ndb_2.-20060622194417-aphojvtml7fwze6qxlbwcaudgcnm43bq
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test sp1f-rpl_truncate_7ndb_2.-20060622194418-iezhg6gzwibksi4t4mc2n54isf4324ag
------------------------------------------------------------
revno: 2736.2.7
revision-id: patrick.crews@stripped
parent: patrick.crews@stripped
parent: patrick.crews@stripped
committer: Patrick Crews <patrick.crews@stripped>
branch nick: mysql-5.1-bugteam
timestamp: Mo 2008-09-15 16:44:34 -0400
message:
merge of bug fix from parent
renamed:
mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result => mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result sp1f-rpl_truncate_7ndb_2.-20060622194417-aphojvtml7fwze6qxlbwcaudgcnm43bq
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt => mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt sp1f-rpl_truncate_7ndb_2m-20060622194417-zimlzlewstxy7a4vcxzvgrxrdijkfzh3
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test => mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test sp1f-rpl_truncate_7ndb_2.-20060622194418-iezhg6gzwibksi4t4mc2n54isf4324ag
modified:
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result sp1f-rpl_truncate_7ndb_2.-20060622194417-aphojvtml7fwze6qxlbwcaudgcnm43bq
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test sp1f-rpl_truncate_7ndb_2.-20060622194418-iezhg6gzwibksi4t4mc2n54isf4324ag
------------------------------------------------------------
revno: 2736.3.1
revision-id: patrick.crews@stripped
parent: vvaintroub@stripped
committer: Patrick Crews <patrick.crews@stripped>
branch nick: mysql-5.1-bugteam
timestamp: Mo 2008-09-15 15:13:43 -0400
message:
Bug#39803 Test rpl.rpl_truncate_7ndb_2 failing
Fixed bad path in .test file
Moved test to suite/rpl_ndb (per Cluster QA)
Re-recorded .result file to updated expected results.
renamed:
mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result => mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result sp1f-rpl_truncate_7ndb_2.-20060622194417-aphojvtml7fwze6qxlbwcaudgcnm43bq
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt => mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt sp1f-rpl_truncate_7ndb_2m-20060622194417-zimlzlewstxy7a4vcxzvgrxrdijkfzh3
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test => mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test sp1f-rpl_truncate_7ndb_2.-20060622194418-iezhg6gzwibksi4t4mc2n54isf4324ag
modified:
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result sp1f-rpl_truncate_7ndb_2.-20060622194417-aphojvtml7fwze6qxlbwcaudgcnm43bq
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test sp1f-rpl_truncate_7ndb_2.-20060622194418-iezhg6gzwibksi4t4mc2n54isf4324ag
------------------------------------------------------------
revno: 2736.2.6
revision-id: patrick.crews@stripped
parent: vvaintroub@stripped
parent: patrick.crews@stripped
committer: Patrick Crews <patrick.crews@stripped>
branch nick: mysql-5.1-bugteam
timestamp: Mo 2008-09-15 16:26:45 -0400
message:
Bug#37938 Test "mysqldump" lacks various INSERT statements / values
Merge of fixes from 5.0 -> 5.1
Moved restoration of concurrent_insert's original value to the end of the 5.1 tests
Re-recorded .result file to account for changes to test file.
modified:
mysql-test/r/mysqldump.result sp1f-mysqldump.result-20030924111344-ly2xhpckbj53fyoa7kllzxyruwj4cg54
mysql-test/t/mysqldump.test sp1f-mysqldump.test-20030924111344-fh6llfm45dls3uxwugociq3shkpxsxn3
------------------------------------------------------------
revno: 1810.3771.3
revision-id: patrick.crews@stripped
parent: vvaintroub@stripped
committer: Patrick Crews <patrick.crews@stripped>
branch nick: mysql-5.0-bugteam
timestamp: Mo 2008-09-15 15:34:39 -0400
message:
Bug#37938 Test "mysqldump" lacks various INSERT statements / values
Moved fix for this bug to 5.0 as other mysqldump bugs seem tied to concurrent_insert being on
Setting concurrent_insert off during this test as INSERTs weren't being
completely processed before the calls to mysqldump, resulting in failing tests.
Altered .test file to turn concurrent_insert off during the test and to restore it
to whatever the value was at the start of the test when complete.
Re-recorded .result file to account for changes to variables in the test.
modified:
mysql-test/r/mysqldump.result sp1f-mysqldump.result-20030924111344-ly2xhpckbj53fyoa7kllzxyruwj4cg54
mysql-test/t/mysqldump.test sp1f-mysqldump.test-20030924111344-fh6llfm45dls3uxwugociq3shkpxsxn3
------------------------------------------------------------
revno: 2736.2.5
revision-id: vvaintroub@stripped
parent: bar@stripped
parent: vvaintroub@stripped
committer: Vladislav Vaintroub<vvaintroub@stripped>
branch nick: mysql-5.1-bugteam
timestamp: Mo 2008-09-15 17:11:41 +0200
message:
merge fix for 35987
modified:
mysys/stacktrace.c sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
------------------------------------------------------------
revno: 1810.3771.2
revision-id: vvaintroub@stripped
parent: timothy.smith@stripped
committer: Vladislav Vaintroub<vvaintroub@stripped>
branch nick: mysql-5.0-bugteam
timestamp: Mo 2008-09-15 14:58:32 +0200
message:
Bug#35987 - crash report on windows doesn't resolve stack traces.
The problem here is that symbols can not be loaded, because symbol
path is not set and default path does not include the directory
where PDB is located.
The problem is _not_ reproducible on the same machine where
mysqld.exe is built - if PDB is not found in the symbol path,
dbghelp would fallback to fully qualified PDB path as given in the
executable header and on the build host this will succeed.
The solution is to calculate symbol path and pass it to SymInitialize()
call.
modified:
sql/stacktrace.c sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
------------------------------------------------------------
revno: 2736.2.4
revision-id: bar@stripped
parent: martin.skold@stripped
committer: Alexander Barkov <bar@stripped>
branch nick: mysql-5.1.b35720
timestamp: Mo 2008-09-15 15:29:31 +0500
message:
Bug#35720 ucs2 + pad_char_to_full_length = failure
Problem: with @@sql_mode=pad_char_to_full_length
a CHAR column returned additional garbage
after trailing space characters due to
incorrect my_charpos() call.
Fix: call my_charpos() with correct arguments.
modified:
mysql-test/r/ctype_ucs.result sp1f-ctype_ucs.result-20030916112630-sohywipskzw3eqmbhfsqxqjteoun6t2g
mysql-test/t/ctype_ucs.test sp1f-ctype_ucs.test-20030916112631-7diba44oovwv3h5kqbswfqbveczwbrxv
sql/field.cc sp1f-field.cc-19700101030959-f4imaofclsea3n4fj4ow5m7havmyxa2r
------------------------------------------------------------
revno: 2736.2.3
revision-id: martin.skold@stripped
parent: timothy.smith@stripped
committer: Martin Skold <Martin.Skold@stripped>
branch nick: mysql-5.1-bugteam
timestamp: Mo 2008-09-15 11:19:56 +0200
message:
bug #31231 mysql_alter_table() tries to drop a non-existing table
bug#31233 mysql_alter_table() fails to drop UNIQUE KEY
modified:
mysql-test/suite/ndb/r/ndb_alter_table.result sp1f-ndb_alter_table.resu-20040505112219-wswqzi6ddeyuq2d4mldelynwlwpkwboe
mysql-test/suite/ndb/t/ndb_alter_table.test sp1f-ndb_alter_table.test-20040505112212-uv7vpaxsitj3cnhtvq4aq7ddnn5dyuof
sql/ha_ndbcluster.cc sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
sql/mysql_priv.h sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
sql/sql_table.cc sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
------------------------------------------------------------
revno: 2736.2.2
revision-id: timothy.smith@stripped
parent: timothy.smith@stripped
parent: timothy.smith@stripped
committer: Timothy Smith <timothy.smith@stripped>
branch nick: 5.1-bugteam
timestamp: Do 2008-09-11 02:08:29 -0600
message:
Auto merge 5.0-bugteam -> 5.1-bugteam (empty, no changes)
------------------------------------------------------------
revno: 1810.3771.1
revision-id: timothy.smith@stripped
parent: kgeorge@stripped
parent: joerg@stripped
committer: Timothy Smith <timothy.smith@stripped>
branch nick: 5.0-bugteam
timestamp: Mi 2008-09-10 19:34:17 -0600
message:
Auto merge 5.0-build -> 5.0-bugteam
modified:
configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
extra/Makefile.am sp1f-makefile.am-19700101030959-6ar5huea7wfhv7gzwizsa5dchtxnjyzm
man/Makefile.am sp1f-makefile.am-19700101030959-aebuhyyaw7p6br3cp7egpta7aihvrxne
scripts/make_binary_distribution.sh sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy
support-files/mysql.spec.sh sp1f-mysql.spec.sh-19700101030959-man6e3acwxvf62bdqvkpcpsvdtokf3ff
win/create_manifest.js sp1f-create_manifest.js-20070423194122-zsuevuf4zcrnzoktjc5adhxa735zkzbh
zlib/gzio.c sp1f-gzio.c-20020319040627-dzt3rl3kklylxis35ym3ldjtzvu7xagn
------------------------------------------------------------
revno: 2736.2.1
revision-id: timothy.smith@stripped
parent: kgeorge@stripped
parent: timothy.smith@stripped
committer: Timothy Smith <timothy.smith@stripped>
branch nick: 5.1-bugteam
timestamp: Mi 2008-09-10 19:35:11 -0600
message:
Auto merge 5.1-build -> 5.1-bugteam
modified:
configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
extra/Makefile.am sp1f-makefile.am-19700101030959-6ar5huea7wfhv7gzwizsa5dchtxnjyzm
man/Makefile.am sp1f-makefile.am-19700101030959-aebuhyyaw7p6br3cp7egpta7aihvrxne
scripts/make_binary_distribution.sh sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy
support-files/mysql.spec.sh sp1f-mysql.spec.sh-19700101030959-man6e3acwxvf62bdqvkpcpsvdtokf3ff
win/create_manifest.js sp1f-create_manifest.js-20070423194122-zsuevuf4zcrnzoktjc5adhxa735zkzbh
zlib/gzio.c sp1f-gzio.c-20020319040627-dzt3rl3kklylxis35ym3ldjtzvu7xagn
------------------------------------------------------------
revno: 2646.19.10
revision-id: timothy.smith@stripped
parent: joerg@stripped
parent: joerg@stripped
committer: Timothy Smith <timothy.smith@stripped>
branch nick: 5.1-build
timestamp: Mi 2008-09-10 19:01:11 -0600
message:
Auto-merge 5.0-build -> 5.1-build (no changes)
------------------------------------------------------------
revno: 1810.3769.7
revision-id: joerg@stripped
parent: mysqldev@stripped
parent: kgeorge@stripped
committer: Joerg Bruehe <joerg@stripped>
branch nick: push-5.0
timestamp: Mi 2008-09-10 21:11:22 +0200
message:
Merge main 5.0 into 5.0-build.
modified:
include/my_sys.h sp1f-my_sys.h-19700101030959-lyllvna5vzqfcjnmlcrutgqocylhtb54
include/myisam.h sp1f-myisam.h-19700101030959-2zv2wn7kuuvbyktuyfsitra6cl37h3mm
myisam/mi_check.c sp1f-mi_check.c-19700101030959-yzbhnjgzcmqdyj4zz5codhkkw5eedp6f
myisam/mi_create.c sp1f-mi_create.c-19700101030959-i6lazhpsyf7ggr2yjukf6xxybhraxup3
myisam/mi_open.c sp1f-mi_open.c-19700101030959-2q2rxowhivdg4hjkjxyf2wtczsod5d6a
myisam/mi_static.c sp1f-mi_static.c-19700101030959-tdmnpz55hlrequ6y4hc3azz6hpxqfv75
myisam/myisamchk.c sp1f-myisamchk.c-19700101030959-hdnrqowbdb3ujo3qgjtzs6lgogwckvgc
myisam/myisamdef.h sp1f-myisamdef.h-19700101030959-fzrxvpmzhzqfn5w2clasmcw7af4kanoa
myisam/rt_index.c sp1f-rt_index.c-20020220101115-g73ue5aednwitjcl3kv42tqfijyn3454
mysql-test/r/group_min_max.result sp1f-group_min_max.result-20040827133611-aqzadxttbw23mkanmvdsiaambv2pcy27
mysql-test/r/myisam.result sp1f-myisam.result-20010411215653-pgxkk2xg4lh3nxresmfnsuszf5h3nont
mysql-test/r/symlink.result sp1f-symlink.result-20010605003810-qspjjr4hwq7gpdhzyictx52ddrlmxaco
mysql-test/r/type_bit.result sp1f-type_bit.result-20041217140559-ppf6bkjkl3r4tbmlt7ngn46zm6tapa46
mysql-test/r/udf.result sp1f-udf.result-20060215161120-pm5l3nyny5gbznc2egfu4bhwgxbuc6wz
mysql-test/t/group_min_max.test sp1f-group_min_max.test-20040827133612-bbe7hj6l7byvtyxsg4iicylzflsgy6vj
mysql-test/t/myisam.test sp1f-myisam.test-20010411215653-cdmhjqbeu3xtipkauwbbirystludnac3
mysql-test/t/symlink.test sp1f-symlink.test-20010605003810-7slktyzeszzfljtnmdbque4ow3azjqty
mysql-test/t/type_bit.test sp1f-type_bit.test-20041217140559-tzpygypzmjyjiukpq75swmn6zq4ytqe4
mysys/my_symlink.c sp1f-my_symlink.c-20010531091851-nnlz7igptpjfrbgf6sspd6vtv2hv63ab
mysys/thr_lock.c sp1f-thr_lock.c-19700101030959-igvxgo25qd7i2moc4pgo5eoth3xp34mh
sql/field.h sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
sql/mysql_priv.h sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
sql/mysqld.cc sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
sql/opt_range.cc sp1f-opt_range.cc-19700101030959-afe3wtevb7zwrg4xyibt35uamov5r7ds
sql/opt_range.h sp1f-opt_range.h-19700101030959-c2qbh5kplyvzfgawblxt4md4ubdpxfdy
sql/set_var.cc sp1f-set_var.cc-20020723153119-nwbpg2pwpz55pfw7yfzaxt7hsszzy7y3
sql/sql_parse.cc sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
sql/sql_select.cc sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
sql/sql_udf.cc sp1f-sql_udf.cc-19700101030959-tk7ysmv4dpwkfhtdovfbqe5i6uvq67ft
sql/unireg.h sp1f-unireg.h-19700101030959-6vhptb2vfyo4mcjkgdm3n5uw6u64czfo
------------------------------------------------------------
revno: 1810.3769.6
revision-id: mysqldev@stripped
parent: kent@kent-amd64-20080829153041-dd726q3aw6yqc6ry
author: timothy.smith@stripped
committer: mysqldev <mysqldev@stripped>
branch nick: mysql-5.0-build
timestamp: Fr 2008-09-05 21:36:31 +0200
message:
Merge from mysql-5.0.68-release
------------------------------------------------------------
revno: 2646.19.9
revision-id: joerg@stripped
parent: kent@kent-amd64-20080829154336-kirwub9zh3ctin26
parent: mysqldev@stripped
committer: Joerg Bruehe <joerg@stripped>
branch nick: push-5.1
timestamp: Mi 2008-09-10 15:11:28 +0200
message:
Merge main 5.1 tree into 5.1-build team tree.
added:
mysql-test/include/mysqlbinlog_row_engine.inc mysqlbinlog_row_engi-20080820140255-9a0qrnzcj0im381c-1
mysql-test/include/wait_for_slave_sql_error_and_skip.inc wait_for_slave_sql_e-20080730094959-x5zfv077cyzps37w-1
mysql-test/r/mysqlbinlog_row.result mysqlbinlog_row.resu-20080820140336-qltyuhvnlnekw1ir-4
mysql-test/r/mysqlbinlog_row_big.result mysqlbinlog_row_big.-20080820140336-qltyuhvnlnekw1ir-1
mysql-test/r/mysqlbinlog_row_innodb.result mysqlbinlog_row_inno-20080820140336-qltyuhvnlnekw1ir-2
mysql-test/r/mysqlbinlog_row_myisam.result mysqlbinlog_row_myis-20080820140336-qltyuhvnlnekw1ir-3
mysql-test/r/mysqlbinlog_row_trans.result mysqlbinlog_row_tran-20080820140336-qltyuhvnlnekw1ir-5
mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result rpl_filter_tables_no-20080730094122-ywj30q70xy9542li-1
mysql-test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt rpl_filter_tables_no-20080730094116-4veopgu0zx3i0dwt-1
mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test rpl_filter_tables_no-20080730094116-4veopgu0zx3i0dwt-2
mysql-test/t/mysqlbinlog_row.test mysqlbinlog_row.test-20080820140328-lzq6n1bc06curs14-4
mysql-test/t/mysqlbinlog_row_big.test mysqlbinlog_row_big.-20080820140328-lzq6n1bc06curs14-1
mysql-test/t/mysqlbinlog_row_innodb.test mysqlbinlog_row_inno-20080820140328-lzq6n1bc06curs14-2
mysql-test/t/mysqlbinlog_row_myisam.test mysqlbinlog_row_myis-20080820140328-lzq6n1bc06curs14-3
mysql-test/t/mysqlbinlog_row_trans.test mysqlbinlog_row_tran-20080820140328-lzq6n1bc06curs14-5
modified:
.bzrignore sp1f-ignore-20001018235455-q4gxfbritt5f42nwix354ufpsvrf5ebj
client/Makefile.am sp1f-makefile.am-19700101030959-zpaig4zjwqhmsob3ypilmrcrkq7pu6gf
client/mysqlbinlog.cc sp1f-mysqlbinlog.cc-19700101030959-b3vgyo47ljent5mhbyj6ik33bi4bukad
configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
include/my_sys.h sp1f-my_sys.h-19700101030959-lyllvna5vzqfcjnmlcrutgqocylhtb54
include/myisam.h sp1f-myisam.h-19700101030959-2zv2wn7kuuvbyktuyfsitra6cl37h3mm
mysql-test/extra/binlog_tests/database.test sp1f-database.test-20071116145519-lwug5tldyng5aohbxcucrrt2csusipi5
mysql-test/r/group_min_max.result sp1f-group_min_max.result-20040827133611-aqzadxttbw23mkanmvdsiaambv2pcy27
mysql-test/r/multi_update.result sp1f-multi_update.result-20010611232825-7f2vetuxiyd3bu5lefd5a2ze43xed33y
mysql-test/r/myisam.result sp1f-myisam.result-20010411215653-pgxkk2xg4lh3nxresmfnsuszf5h3nont
mysql-test/r/partition_symlink.result sp1f-partition_symlink.re-20071112122343-3fdoma4qosnti7nipjjgehbsap5aos64
mysql-test/r/subselect.result sp1f-subselect.result-20020512204640-zgegcsgavnfd7t7eyrf7ibuqomsw7uzo
mysql-test/r/symlink.result sp1f-symlink.result-20010605003810-qspjjr4hwq7gpdhzyictx52ddrlmxaco
mysql-test/r/type_bit.result sp1f-type_bit.result-20041217140559-ppf6bkjkl3r4tbmlt7ngn46zm6tapa46
mysql-test/suite/binlog/r/binlog_database.result sp1f-binlog_database.resu-20071116145519-32d2hjsq4hsav2a6la27nbyjq2rdx64g
mysql-test/suite/binlog/r/binlog_innodb.result sp1f-binlog_innodb.result-20070612194656-qxyqgtm3jk5nq67w5hqbva3qij23iwfu
mysql-test/suite/jp/std_data/jisx0208_sjis2.dat sp1f-jisx0208_sjis2.dat-20050107083212-shwd7d6og2akos5bkhlieyuutdmnwan6
mysql-test/suite/jp/t/disabled.def sp1f-disabled.def-20080515160110-qvy2ybr6ayn3gv6bs7jh4ityvld356qd
mysql-test/t/group_min_max.test sp1f-group_min_max.test-20040827133612-bbe7hj6l7byvtyxsg4iicylzflsgy6vj
mysql-test/t/myisam.test sp1f-myisam.test-20010411215653-cdmhjqbeu3xtipkauwbbirystludnac3
mysql-test/t/partition_symlink.test sp1f-partition_symlink.te-20071112122343-27bxdsrdkiwylyz7ta6xrna2qc5pdlbr
mysql-test/t/subselect.test sp1f-subselect.test-20020512204640-lyqrayx6uwsn7zih6y7kerkenuitzbvr
mysql-test/t/symlink.test sp1f-symlink.test-20010605003810-7slktyzeszzfljtnmdbque4ow3azjqty
mysql-test/t/type_bit.test sp1f-type_bit.test-20041217140559-tzpygypzmjyjiukpq75swmn6zq4ytqe4
mysys/my_symlink.c sp1f-my_symlink.c-20010531091851-nnlz7igptpjfrbgf6sspd6vtv2hv63ab
mysys/thr_lock.c sp1f-thr_lock.c-19700101030959-igvxgo25qd7i2moc4pgo5eoth3xp34mh
sql/field.h sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
sql/log_event.cc sp1f-log_event.cc-19700101030959-msmqlflsngxosswid2hpzxly5vfqdddc
sql/log_event.h sp1f-log_event.h-19700101030959-clq6ett55tcqbpys2i4cpfrdccq7j4om
sql/mysql_priv.h sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
sql/mysqld.cc sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
sql/opt_range.cc sp1f-opt_range.cc-19700101030959-afe3wtevb7zwrg4xyibt35uamov5r7ds
sql/opt_range.h sp1f-opt_range.h-19700101030959-c2qbh5kplyvzfgawblxt4md4ubdpxfdy
sql/rpl_tblmap.cc sp1f-rpl_tblmap.cc-20051222053448-sgowtys7fb4tdpjvmzwktjxmb5krm3cc
sql/rpl_tblmap.h sp1f-rpl_tblmap.h-20051222053448-apxxow74g26tfxwlqszpydaybbzp2r3i
sql/rpl_utility.h sp1f-rpl_utility.h-20060503130029-u44nzzcbdenh2gegnnyzro26kbk5quw7
sql/sql_base.cc sp1f-sql_base.cc-19700101030959-w7tul2gb2n4jzayjwlslj3ybmf3uhk6a
sql/sql_class.cc sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
sql/sql_class.h sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
sql/sql_db.cc sp1f-sql_db.cc-19700101030959-hyw6zjuisjyda5cj5746a2zzuzz5yibr
sql/sql_parse.cc sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
sql/sql_select.cc sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
sql/sql_update.cc sp1f-sql_update.cc-19700101030959-edlgskfuer2ylczbw2znrr5gzfefiyw7
storage/myisam/mi_check.c sp1f-mi_check.c-19700101030959-yzbhnjgzcmqdyj4zz5codhkkw5eedp6f
storage/myisam/mi_create.c sp1f-mi_create.c-19700101030959-i6lazhpsyf7ggr2yjukf6xxybhraxup3
storage/myisam/mi_open.c sp1f-mi_open.c-19700101030959-2q2rxowhivdg4hjkjxyf2wtczsod5d6a
storage/myisam/mi_static.c sp1f-mi_static.c-19700101030959-tdmnpz55hlrequ6y4hc3azz6hpxqfv75
storage/myisam/myisamchk.c sp1f-myisamchk.c-19700101030959-hdnrqowbdb3ujo3qgjtzs6lgogwckvgc
storage/myisam/myisamdef.h sp1f-myisamdef.h-19700101030959-fzrxvpmzhzqfn5w2clasmcw7af4kanoa
storage/myisam/rt_index.c sp1f-rt_index.c-20020220101115-g73ue5aednwitjcl3kv42tqfijyn3454
------------------------------------------------------------
revno: 2646.19.8
revision-id: kent@kent-amd64-20080829154336-kirwub9zh3ctin26
parent: kent@kent-amd64-20080829153131-li4dxlk26xy3fip5
parent: kent@kent-amd64-20080829153041-dd726q3aw6yqc6ry
committer: Kent Boortz <kent@kent-amd64>
branch nick: mysql-5.1-build
timestamp: Fr 2008-08-29 17:43:36 +0200
message:
Merge from mysql-5.0-build
modified:
win/create_manifest.js sp1f-create_manifest.js-20070423194122-zsuevuf4zcrnzoktjc5adhxa735zkzbh
------------------------------------------------------------
revno: 1810.3769.5
revision-id: kent@kent-amd64-20080829153041-dd726q3aw6yqc6ry
parent: joerg@stripped
committer: Kent Boortz <kent@kent-amd64>
branch nick: mysql-5.0-build
timestamp: Fr 2008-08-29 17:30:41 +0200
message:
Handle that version "level" might contain "sp1", "a".....
modified:
win/create_manifest.js sp1f-create_manifest.js-20070423194122-zsuevuf4zcrnzoktjc5adhxa735zkzbh
------------------------------------------------------------
revno: 1810.3769.4
revision-id: joerg@stripped
parent: timothy.smith@stripped
parent: joerg@stripped
committer: Joerg Bruehe <joerg@stripped>
branch nick: push-5.0
timestamp: Mi 2008-08-27 16:25:24 +0200
message:
Merge the bug fix development (37098: "unpackaged files")
into the 5.0 team tree.
modified:
configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
extra/Makefile.am sp1f-makefile.am-19700101030959-6ar5huea7wfhv7gzwizsa5dchtxnjyzm
man/Makefile.am sp1f-makefile.am-19700101030959-aebuhyyaw7p6br3cp7egpta7aihvrxne
scripts/make_binary_distribution.sh sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy
support-files/mysql.spec.sh sp1f-mysql.spec.sh-19700101030959-man6e3acwxvf62bdqvkpcpsvdtokf3ff
------------------------------------------------------------
revno: 2646.19.7
revision-id: kent@kent-amd64-20080829153131-li4dxlk26xy3fip5
parent: joerg@stripped
committer: Kent Boortz <kent@kent-amd64>
branch nick: mysql-5.1-build
timestamp: Fr 2008-08-29 17:31:31 +0200
message:
Removed option to control if federated is enabled, and enabled it.
modified:
support-files/mysql.spec.sh sp1f-mysql.spec.sh-19700101030959-man6e3acwxvf62bdqvkpcpsvdtokf3ff
------------------------------------------------------------
revno: 2646.19.6
revision-id: joerg@stripped
parent: timothy.smith@stripped
parent: joerg@stripped
committer: Joerg Bruehe <joerg@stripped>
branch nick: push-5.1
timestamp: Mi 2008-08-27 16:20:29 +0200
message:
Merge bug fix development tree (37098: "unpackaged files")
into current team tree (version 5.1).
modified:
configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
extra/Makefile.am sp1f-makefile.am-19700101030959-6ar5huea7wfhv7gzwizsa5dchtxnjyzm
man/Makefile.am sp1f-makefile.am-19700101030959-aebuhyyaw7p6br3cp7egpta7aihvrxne
scripts/make_binary_distribution.sh sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy
support-files/mysql.spec.sh sp1f-mysql.spec.sh-19700101030959-man6e3acwxvf62bdqvkpcpsvdtokf3ff
------------------------------------------------------------
revno: 2646.29.1
revision-id: joerg@stripped
parent: kgeorge@stripped
parent: joerg@stripped
committer: Joerg Bruehe <joerg@stripped>
branch nick: bug37098-5.1
timestamp: Mi 2008-08-27 16:03:39 +0200
message:
Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build
Merge it up from 5.0 to 5.1,
adapt to some version differences.
modified:
configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
extra/Makefile.am sp1f-makefile.am-19700101030959-6ar5huea7wfhv7gzwizsa5dchtxnjyzm
man/Makefile.am sp1f-makefile.am-19700101030959-aebuhyyaw7p6br3cp7egpta7aihvrxne
scripts/make_binary_distribution.sh sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy
support-files/mysql.spec.sh sp1f-mysql.spec.sh-19700101030959-man6e3acwxvf62bdqvkpcpsvdtokf3ff
------------------------------------------------------------
revno: 1810.3770.1
revision-id: joerg@stripped
parent: kgeorge@stripped
committer: Joerg Bruehe <joerg@stripped>
branch nick: bug37098-5.0
timestamp: Mo 2008-08-25 21:07:41 +0200
message:
Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build
Mostly, this affected files (programs, scripts, and manual pages)
which got built during a RPM build but were not listed in the
appropriate "%files" section of the "spec" file.
This is fixed now, they are added.
To make this consistent, this patch also makes the build of "innochecksum"
(and its inclusion in a tar.gz or other package) depend on whether InnoDB
is configured in the build.
Also, some tools to create Windows packages are irrelevant in any binary
Unix package (not the sources !), and so they are deleted before packaging.
modified:
configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
extra/Makefile.am sp1f-makefile.am-19700101030959-6ar5huea7wfhv7gzwizsa5dchtxnjyzm
man/Makefile.am sp1f-makefile.am-19700101030959-aebuhyyaw7p6br3cp7egpta7aihvrxne
scripts/make_binary_distribution.sh sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy
support-files/mysql.spec.sh sp1f-mysql.spec.sh-19700101030959-man6e3acwxvf62bdqvkpcpsvdtokf3ff
------------------------------------------------------------
revno: 2646.19.5
revision-id: timothy.smith@stripped
parent: timothy.smith@stripped
parent: timothy.smith@stripped
committer: Timothy Smith <timothy.smith@stripped>
branch nick: 5.1-build
timestamp: Fr 2008-08-22 15:58:51 -0600
message:
Up-merge from 5.0-build to 5.1-build.
------------------------------------------------------------
revno: 1810.3769.3
revision-id: timothy.smith@stripped
parent: joerg@stripped
parent: gluh@stripped
committer: Timothy Smith <timothy.smith@stripped>
branch nick: 5.0-build
timestamp: Fr 2008-08-22 13:04:38 -0600
message:
Merge 5.0 main to 5.0-build
modified:
BUILD/check-cpu sp1f-checkcpu-20050427105035-uyuek6wv2z7qfr6kn4agmmury46u3vqo
mysql-test/r/federated.result sp1f-federated.result-20041211200117-zbuxe4bh3vyrane2ehku7szsgbfbhkvd
mysql-test/r/metadata.result sp1f-metadata.result-20040330162426-eqab2um6q6qwnwcnuj5aeikattseomkf
mysql-test/r/ps_1general.result sp1f-ps_1general.result-20040701142628-mnroykiputkb67hocznz5eijpxjhx4da
mysql-test/r/ps_2myisam.result sp1f-ps_2myisam.result-20040701142628-22vop64okggcdoqso4kw7aq3d2augzd4
mysql-test/r/ps_3innodb.result sp1f-ps_3innodb.result-20040701142628-fyardhwsjvwfcltumzytqqssdpgu3e5d
mysql-test/r/ps_4heap.result sp1f-ps_4heap.result-20040701142628-qkny2md7rdyjymvmzg3d3c2x73o2wbfo
mysql-test/r/ps_5merge.result sp1f-ps_5merge.result-20040701142628-iu2zuhkhkly6pfhedemkatfcnxidbg6x
mysql-test/r/ps_6bdb.result sp1f-ps_6bdb.result-20040701142628-m2by7cqwox4kkyo2gnjljzibdavorsaa
mysql-test/r/ps_7ndb.result sp1f-ps_7ndb.result-20040925150736-rcbl5rusdndurdccp43qyii5seddo34w
mysql-test/r/show_check.result sp1f-show_check.result-20001228015634-5hf7elb3nj3zmuz6tosvytmbu52bploi
mysql-test/r/sp.result sp1f-sp.result-20030117133802-duandg3yzagzyv7zhhbbt2kcomcegpc7
mysql-test/r/type_newdecimal.result sp1f-type_newdecimal.resu-20050208224936-kj6dxol5i7zbbfohybib53ffje5i63mk
mysql-test/t/federated.test sp1f-federated.test-20041211200119-aht6hujozcouca6joz5eaiq55jk6psb5
mysql-test/t/show_check.test sp1f-show_check.test-20001228015637-uv35wm2ryvpkyrr6ojhmi2nq6x6jgdod
mysql-test/t/sp.test sp1f-sp.test-20030117133803-b6pcfv2yscbqkur5fszep7acmdg7nf5k
mysql-test/t/type_newdecimal.test sp1f-type_newdecimal.test-20050208224936-e244l5ugrk3oditjqp53n6izptkrteq2
mysys/mf_pack.c sp1f-mf_pack.c-19700101030959-u7bzjnr4w3idabvny244w5gzcf33butm
netware/BUILD/compile-linux-tools sp1f-compilelinuxtools-20030304040434-gihpmyjr3madhleotjxjgsdxkyvwn2qh
netware/BUILD/nwbootstrap sp1f-nwbootstrap-20030304040435-rz4o5ic6onmenwlgmz2ggjccc2plsxlk
netware/Makefile.am sp1f-makefile.am-20030128063823-wnb5jye7tjfortocwlygtkfa6oalmopy
netware/mysql_install_db.c sp1f-mysql_install_db.c-20030131234059-aaouo7hwocceqmnzk72rfxmfwynbhf2r
sql/ha_federated.cc sp1f-ha_federated.cc-20041211200120-gu52ex5sicbua5vtoocuki3ltllsvm2c
sql/item.cc sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn
sql/item.h sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa
sql/sql_show.cc sp1f-sql_show.cc-19700101030959-umlljfnpplg452h7reeyqr4xnbmlkvfj
strings/decimal.c sp1f-decimal.c-20041018120639-qqm4oeadwhbdhuxgwlc657il4tu44n6m
tests/mysql_client_test.c sp1f-client_test.c-20020614002636-eqy2zzksgelocknwbbogfuwxfwqy7q5x
------------------------------------------------------------
revno: 1810.3769.2
revision-id: joerg@stripped
parent: df@stripped
parent: joerg@stripped
committer: Joerg Bruehe <joerg@stripped>
branch nick: push-5.0
timestamp: Fr 2008-08-15 12:49:31 +0200
message:
Merge from main branch.
added:
mysql-test/r/innodb-autoinc-optimize.result innodbautoincoptimiz-20080731195133-3r5roqkhjy8tnp3r-1
mysql-test/r/innodb_bug35220.result innodb_bug35220.resu-20080808002154-8ndjebe0ousvoomb-2
mysql-test/t/innodb-autoinc-optimize.test innodbautoincoptimiz-20080731195133-3r5roqkhjy8tnp3r-2
mysql-test/t/innodb_bug35220.test innodb_bug35220.test-20080808002154-8ndjebe0ousvoomb-1
modified:
client/mysql_upgrade.c sp1f-mysql_upgrade.c-20060428040559-3xcugp4nhhb6qfwfacoqw3d4ibgbeboz
configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
innobase/buf/buf0buf.c sp1f-buf0buf.c-20010217121858-zsvjkxdlbzvmglvi56wvmv7ze3f7nzda
innobase/dict/dict0dict.c sp1f-dict0dict.c-20010217121859-dhmp6wllhccos4vvwyuqz5dmuctjxgmm
innobase/include/buf0buf.h sp1f-buf0buf.h-20010217121901-vpbalw25sk5hdhxje55whqtj6vke5awa
innobase/include/srv0srv.h sp1f-srv0srv.h-20010217121907-oei3on7bcl3tqesmlbtyoybnevxxx2j5
innobase/include/trx0undo.h sp1f-trx0undo.h-20010217121908-ydtuyvvadq5gzhxr22vrktvnvhnnmgqy
innobase/srv/srv0srv.c sp1f-srv0srv.c-20010217121915-oxgww23dgwrrrgscuox5pkpnefaged77
innobase/trx/trx0trx.c sp1f-trx0trx.c-20010217121916-b5g7pmqxezfo2mktfpeiapibgdhogrv2
innobase/trx/trx0undo.c sp1f-trx0undo.c-20010217121916-mijv5rlcazmbqofa6hxyy2yfm7r4lgdh
mysql-test/r/func_if.result sp1f-func_if.result-20020422204140-g35vcmdj5gsz4cilvxrzqnuipiwjknxl
mysql-test/r/innodb_mysql.result sp1f-innodb_mysql.result-20060426055153-bychbbfnqtvmvrwccwhn24i6yi46uqjv
mysql-test/r/query_cache_merge.result sp1f-query_cache_merge.re-20030822010738-2zakbz2cym5ituizcsbijndpnajh4fkl
mysql-test/r/subselect.result sp1f-subselect.result-20020512204640-zgegcsgavnfd7t7eyrf7ibuqomsw7uzo
mysql-test/t/func_if.test sp1f-func_if.test-20020422204141-q7i5g4jckjd6a5k66ybo2si2cvk3wbfl
mysql-test/t/innodb_mysql.test sp1f-innodb_mysql.test-20060426055153-mgtahdmgajg7vffqbq4xrmkzbhvanlaz
mysql-test/t/query_cache_merge.test sp1f-query_cache_merge.te-20030822010739-lp5enqy5wop4adawh4eqs4zefcihl7pr
mysql-test/t/subselect.test sp1f-subselect.test-20020512204640-lyqrayx6uwsn7zih6y7kerkenuitzbvr
mysys/mf_keycache.c sp1f-mf_keycache.c-19700101030959-wtigyxt4n6zscc6ezr56wziqguyc5bds
mysys/my_alloc.c sp1f-my_alloc.c-19700101030959-2elyak7fz3lr6z6agqmrqfm3zhgayb4x
scripts/mysql_system_tables.sql sp1f-mysql_system_tables.-20070226104923-4n5a67fuifobcyhhicfbacpsv5npohgv
sql/field.h sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
sql/ha_innodb.cc sp1f-ha_innobase.cc-20001205235417-rlet3ei56gdrss673dssnrqgug67lwno
sql/item.cc sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn
sql/item.h sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa
sql/item_cmpfunc.cc sp1f-item_cmpfunc.cc-19700101030959-hrk7pi2n6qpwxauufnkizirsoucdcx2e
sql/item_func.cc sp1f-item_func.cc-19700101030959-3wmsx76yvc25sroqpfrx2n77kqdxxn3y
sql/opt_range.cc sp1f-opt_range.cc-19700101030959-afe3wtevb7zwrg4xyibt35uamov5r7ds
sql/opt_range.h sp1f-opt_range.h-19700101030959-c2qbh5kplyvzfgawblxt4md4ubdpxfdy
sql/share/errmsg.txt sp1f-errmsg.txt-20041213212820-do5w642w224ja7ctyqhyl6iihdmpkzv5
sql/sp_head.cc sp1f-sp_head.cc-20021208185920-jtgc5wvyqdnu2gvcdus3gazrfhxbofxd
sql/sql_acl.cc sp1f-sql_acl.cc-19700101030959-c4hku3uqxzujthqnndeprbrhamqy6a4i
sql/sql_cache.cc sp1f-sql_cache.cc-19700101030959-74bsqwcnhboovijsogcenqana5inu6wo
sql/sql_cursor.cc sp1f-sql_cursor.cc-20050921221059-bbaoove6aneee3jlqberlbdxsq7k3qrl
sql/sql_lex.h sp1f-sql_lex.h-19700101030959-sgldb2sooc7twtw5q7pgjx7qzqiaa3sn
sql/sql_list.h sp1f-sql_list.h-19700101030959-hyddr5nvvtrgbk7llgnah4i4bf6ugspn
sql/sql_parse.cc sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
sql/sql_select.cc sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
sql/sql_string.h sp1f-sql_string.h-19700101030959-nogsoxwv222e4vm4toic7cabeb4swajz
sql/sql_yacc.yy sp1f-sql_yacc.yy-19700101030959-wvn4qyy2drpmge7kaq3dysprbhlrv27j
sql/thr_malloc.cc sp1f-thr_malloc.cc-19700101030959-sg5hfbdswjtjtdjtmvppuc2eedch3p3s
support-files/build-tags sp1f-buildtags-20020120021651-m24xl4ywynpwgh3jn7hgrhntp5i6doq7
tests/mysql_client_test.c sp1f-client_test.c-20020614002636-eqy2zzksgelocknwbbogfuwxfwqy7q5x
------------------------------------------------------------
revno: 2646.19.4
revision-id: timothy.smith@stripped
parent: joerg@stripped
parent: gluh@stripped
committer: Timothy Smith <timothy.smith@stripped>
branch nick: 5.1-build
timestamp: Fr 2008-08-22 13:05:08 -0600
message:
Merge 5.1 main to 5.1-build
removed:
mysql-test/r/concurrent_innodb.result sp1f-innodb_concurrent.re-20051222053451-brbkl2ta4mc22xn6auujgcqaam2fnmze
mysql-test/t/concurrent_innodb-master.opt sp1f-innodb_concurrentmas-20051222053459-kzplyv6up7vmwftv6d56fzogih3b6sx4
mysql-test/t/concurrent_innodb.test sp1f-concurrent_innodb.te-20060816095516-ouo6t3srxgvjivcj63timc2gxfasw7fx
added:
mysql-test/include/have_case_insensitive_file_system.inc have_case_insensitiv-20080628201234-klvwkhha4sllvyq2-1
mysql-test/include/have_lowercase2.inc have_lowercase2.inc-20080627221437-jup1wz0n79mnl1zo-1
mysql-test/include/ps_ddl_1.inc ps_ddl_1.inc-20080813193914-5m34walobgzv0okx-1
mysql-test/r/case_insensitive_file_system.require case_insensitive_fil-20080628201251-d1jx71fn2fh6jy22-1
mysql-test/r/concurrent_innodb_safelog.result mysqltestrconcurrent-20080815184607-o3b7qk2sgmrmva8u-1
mysql-test/r/concurrent_innodb_unsafelog.result mysqltestrconcurrent-20080815184607-o3b7qk2sgmrmva8u-2
mysql-test/r/innodb-autoinc.result innodbautoinc.result-20080820011033-t6ci67x700jby4dt-1
mysql-test/r/innodb_bug34300.result innodb_bug34300.resu-20080820011033-t6ci67x700jby4dt-2
mysql-test/std_data/corrupt_t1#P#p1.MYI corrupt_t1pp1.myi-20080609105954-8lx28w86hbxa3am3-1
mysql-test/std_data/corrupt_t1.MYI corrupt_t1.myi-20080609105954-8lx28w86hbxa3am3-2
mysql-test/std_data/parts/t1_will_crash#P#p1_first_1024.MYD t1_will_crashpp1_fir-20080819083433-r7m71lm6img33q5v-1
mysql-test/std_data/parts/t1_will_crash#P#p2.MYD t1_will_crashpp2.myd-20080819083724-995455g6xyvbh2uq-1
mysql-test/std_data/parts/t1_will_crash#P#p2.MYI t1_will_crashpp2.myi-20080819083724-995455g6xyvbh2uq-2
mysql-test/std_data/parts/t1_will_crash#P#p3.MYI t1_will_crashpp3.myi-20080819083458-p96fltdyvlbd71md-1
mysql-test/std_data/parts/t1_will_crash#P#p4.MYI t1_will_crashpp4.myi-20080819083745-1zwluuiaqcz3flks-1
mysql-test/std_data/parts/t1_will_crash#P#p6.MYD t1_will_crashpp6.myd-20080819083705-4ngmq7nlvjcn5i52-1
mysql-test/std_data/parts/t1_will_crash#P#p6_2.MYD t1_will_crashpp6_2.m-20080819083801-b60e55792ng6854i-1
mysql-test/std_data/parts/t1_will_crash#P#p6_3.MYD t1_will_crashpp6_3.m-20080819083817-7b4ja1n1p6825pkl-1
mysql-test/suite/parts/inc/partition_mgm.inc partition_mgm.inc-20080627221650-ogyb3pvonhx6hjho-1
mysql-test/suite/parts/r/partition_mgm_lc0_archive.result partition_mgm_lc0_ar-20080628201310-zy2ine5dj8cvtbja-1
mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result partition_mgm_lc0_in-20080628201310-zy2ine5dj8cvtbja-2
mysql-test/suite/parts/r/partition_mgm_lc0_memory.result partition_mgm_lc0_me-20080628201310-zy2ine5dj8cvtbja-3
mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result partition_mgm_lc0_my-20080628201310-zy2ine5dj8cvtbja-4
mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result partition_mgm_lc0_nd-20080628201310-zy2ine5dj8cvtbja-5
mysql-test/suite/parts/r/partition_mgm_lc1_archive.result partition_mgm_lc1_ar-20080628201310-zy2ine5dj8cvtbja-6
mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result partition_mgm_lc1_in-20080628201310-zy2ine5dj8cvtbja-7
mysql-test/suite/parts/r/partition_mgm_lc1_memory.result partition_mgm_lc1_me-20080628201310-zy2ine5dj8cvtbja-8
mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result partition_mgm_lc1_my-20080628201310-zy2ine5dj8cvtbja-9
mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result partition_mgm_lc1_nd-20080628201310-zy2ine5dj8cvtbja-10
mysql-test/suite/parts/r/partition_mgm_lc2_archive.result partition_mgm_lc2_ar-20080628201310-zy2ine5dj8cvtbja-11
mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result partition_mgm_lc2_in-20080628201310-zy2ine5dj8cvtbja-12
mysql-test/suite/parts/r/partition_mgm_lc2_memory.result partition_mgm_lc2_me-20080628201310-zy2ine5dj8cvtbja-13
mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result partition_mgm_lc2_my-20080628201310-zy2ine5dj8cvtbja-14
mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result partition_mgm_lc2_nd-20080628201310-zy2ine5dj8cvtbja-15
mysql-test/suite/parts/r/partition_recover_myisam.result partition_repair_myi-20080609121315-mjya2e9ekn7bunzm-3
mysql-test/suite/parts/r/partition_repair_myisam.result partition_repair_myi-20080815080323-ftbhodge9fmwe8py-1
mysql-test/suite/parts/t/partition_mgm_lc0_archive.test partition_mgm_lc0_ar-20080627221711-8qlj0fnzmn8ealq0-1
mysql-test/suite/parts/t/partition_mgm_lc0_innodb.test partition_mgm_lc0_in-20080627221711-8qlj0fnzmn8ealq0-2
mysql-test/suite/parts/t/partition_mgm_lc0_memory.test partition_mgm_lc0_me-20080627221711-8qlj0fnzmn8ealq0-3
mysql-test/suite/parts/t/partition_mgm_lc0_myisam.test partition_mgm_lc0_my-20080627221711-8qlj0fnzmn8ealq0-4
mysql-test/suite/parts/t/partition_mgm_lc0_ndb.test partition_mgm_lc0_nd-20080627221711-8qlj0fnzmn8ealq0-5
mysql-test/suite/parts/t/partition_mgm_lc1_archive-master.opt partition_mgm_lc1_ar-20080627221711-8qlj0fnzmn8ealq0-6
mysql-test/suite/parts/t/partition_mgm_lc1_archive.test partition_mgm_lc1_ar-20080627221711-8qlj0fnzmn8ealq0-7
mysql-test/suite/parts/t/partition_mgm_lc1_innodb-master.opt partition_mgm_lc1_in-20080627221711-8qlj0fnzmn8ealq0-8
mysql-test/suite/parts/t/partition_mgm_lc1_innodb.test partition_mgm_lc1_in-20080627221711-8qlj0fnzmn8ealq0-9
mysql-test/suite/parts/t/partition_mgm_lc1_memory-master.opt partition_mgm_lc1_me-20080627221711-8qlj0fnzmn8ealq0-10
mysql-test/suite/parts/t/partition_mgm_lc1_memory.test partition_mgm_lc1_me-20080627221711-8qlj0fnzmn8ealq0-11
mysql-test/suite/parts/t/partition_mgm_lc1_myisam-master.opt partition_mgm_lc1_my-20080627221711-8qlj0fnzmn8ealq0-12
mysql-test/suite/parts/t/partition_mgm_lc1_myisam.test partition_mgm_lc1_my-20080627221711-8qlj0fnzmn8ealq0-13
mysql-test/suite/parts/t/partition_mgm_lc1_ndb-master.opt partition_mgm_lc1_nd-20080627221711-8qlj0fnzmn8ealq0-14
mysql-test/suite/parts/t/partition_mgm_lc1_ndb.test partition_mgm_lc1_nd-20080627221711-8qlj0fnzmn8ealq0-15
mysql-test/suite/parts/t/partition_mgm_lc2_archive-master.opt partition_mgm_lc2_ar-20080627221711-8qlj0fnzmn8ealq0-16
mysql-test/suite/parts/t/partition_mgm_lc2_archive.test partition_mgm_lc2_ar-20080627221711-8qlj0fnzmn8ealq0-17
mysql-test/suite/parts/t/partition_mgm_lc2_innodb-master.opt partition_mgm_lc2_in-20080627221711-8qlj0fnzmn8ealq0-18
mysql-test/suite/parts/t/partition_mgm_lc2_innodb.test partition_mgm_lc2_in-20080627221711-8qlj0fnzmn8ealq0-19
mysql-test/suite/parts/t/partition_mgm_lc2_memory-master.opt partition_mgm_lc2_me-20080627221711-8qlj0fnzmn8ealq0-20
mysql-test/suite/parts/t/partition_mgm_lc2_memory.test partition_mgm_lc2_me-20080627221711-8qlj0fnzmn8ealq0-21
mysql-test/suite/parts/t/partition_mgm_lc2_myisam-master.opt partition_mgm_lc2_my-20080627221711-8qlj0fnzmn8ealq0-22
mysql-test/suite/parts/t/partition_mgm_lc2_myisam.test partition_mgm_lc2_my-20080627221711-8qlj0fnzmn8ealq0-23
mysql-test/suite/parts/t/partition_mgm_lc2_ndb-master.opt partition_mgm_lc2_nd-20080627221711-8qlj0fnzmn8ealq0-24
mysql-test/suite/parts/t/partition_mgm_lc2_ndb.test partition_mgm_lc2_nd-20080627221711-8qlj0fnzmn8ealq0-25
mysql-test/suite/parts/t/partition_recover_myisam-master.opt partition_repair_myi-20080609121315-mjya2e9ekn7bunzm-1
mysql-test/suite/parts/t/partition_recover_myisam.test partition_repair_myi-20080609121315-mjya2e9ekn7bunzm-2
mysql-test/suite/parts/t/partition_repair_myisam.test partition_repair_myi-20080815080314-tlhpksvl0sq8wt2j-1
mysql-test/suite/parts/t/partition_special_innodb-master.opt partition_special_in-20080820144724-bzie0bzvoedh1dkz-1
mysql-test/suite/rpl/r/rpl_plugin_load.result rpl_plugin_load.resu-20080819134621-2h1f2zhh65l3f2ga-1
mysql-test/suite/rpl/t/rpl_plugin_load-master.opt rpl_plugin_loadmaste-20080819134617-ct984kgpmf1isynu-1
mysql-test/suite/rpl/t/rpl_plugin_load-slave.opt rpl_plugin_loadslave-20080819134617-ct984kgpmf1isynu-2
mysql-test/suite/rpl/t/rpl_plugin_load.test rpl_plugin_load.test-20080819134617-ct984kgpmf1isynu-3
mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt sp1f-rpl_row_err_daisycha-20051222053501-3qqohpgemyrpktrz3dh6jjwmr7fvva5p
mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt sp1f-rpl_row_err_daisycha-20051222053502-dfv7cml5eevz6nkruqzt3e7udb3cjdif
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt sp1f-rpl_truncate_7ndb_2m-20060622194417-zimlzlewstxy7a4vcxzvgrxrdijkfzh3
mysql-test/t/concurrent_innodb_safelog-master.opt mysqltesttconcurrent-20080815184607-o3b7qk2sgmrmva8u-3
mysql-test/t/concurrent_innodb_safelog.test mysqltesttconcurrent-20080815184607-o3b7qk2sgmrmva8u-4
mysql-test/t/concurrent_innodb_unsafelog-master.opt mysqltesttconcurrent-20080815184607-o3b7qk2sgmrmva8u-5
mysql-test/t/concurrent_innodb_unsafelog.test mysqltesttconcurrent-20080815184607-o3b7qk2sgmrmva8u-6
mysql-test/t/innodb-autoinc.test innodbautoinc.test-20080820011033-t6ci67x700jby4dt-3
mysql-test/t/innodb_bug34300.test innodb_bug34300.test-20080820011033-t6ci67x700jby4dt-4
modified:
BUILD/check-cpu sp1f-checkcpu-20050427105035-uyuek6wv2z7qfr6kn4agmmury46u3vqo
Makefile.am sp1f-makefile.am-19700101030959-jbbpiygwpgybyqknlavdxxupbrjonu7h
include/my_sys.h sp1f-my_sys.h-19700101030959-lyllvna5vzqfcjnmlcrutgqocylhtb54
libmysqld/lib_sql.cc sp1f-lib_sql.cc-20010411110351-gt5febleap73tqvapkesopvqtuht5sf5
mysql-test/Makefile.am sp1f-makefile.am-20001206082022-36vvdlhec52v4kcxab5ees7yomxvj4dl
mysql-test/include/concurrent.inc sp1f-innodb_concurrent.te-20051222053459-lwg5sp2ww5pt2wipchfkjjvnmslyp3g3
mysql-test/include/have_lowercase0.inc sp1f-have_lowercase0.inc-20050818184753-5hr5h7dbooixey5u3zn6qjvl4t6btvdq
mysql-test/lib/mtr_report.pl sp1f-mtr_report.pl-20041230152648-5foxu5uozo2rvqqrcdpi6gnt4o3z47is
mysql-test/r/csv.result sp1f-csv.result-20040813035429-xygspmdjj5llofwnj6e4ahynqepuqyue
mysql-test/r/federated.result sp1f-federated.result-20041211200117-zbuxe4bh3vyrane2ehku7szsgbfbhkvd
mysql-test/r/func_regexp.result sp1f-func_regexp.result-20001228015633-lato3cclevlrpkbsvdiy7n5qwje2lcnw
mysql-test/r/handler_innodb.result sp1f-innodb_handler.resul-20020821205505-jopsqbjuqwwxb5hvf3r2wn37vobunxru
mysql-test/r/innodb-autoinc-optimize.result innodbautoincoptimiz-20080731195133-3r5roqkhjy8tnp3r-1
mysql-test/r/innodb.result sp1f-innobase.result-20010112144027-uy46ajwex4ez4tbibcn4wnopkxm2vamd
mysql-test/r/innodb_mysql.result sp1f-innodb_mysql.result-20060426055153-bychbbfnqtvmvrwccwhn24i6yi46uqjv
mysql-test/r/join.result sp1f-join.result-20001228015633-f4navd6fbbzksvhaaqulo5ihgevkjty2
mysql-test/r/lowercase0.require sp1f-lowercase0.require-20040306084333-k5et36nayyxd5ad2kuicvexbibsdxbmy
mysql-test/r/metadata.result sp1f-metadata.result-20040330162426-eqab2um6q6qwnwcnuj5aeikattseomkf
mysql-test/r/partition.result sp1f-partition.result-20050718113029-xlmjyugiq5h2b5wjp236ipsmkmej7i62
mysql-test/r/ps_1general.result sp1f-ps_1general.result-20040701142628-mnroykiputkb67hocznz5eijpxjhx4da
mysql-test/r/ps_2myisam.result sp1f-ps_2myisam.result-20040701142628-22vop64okggcdoqso4kw7aq3d2augzd4
mysql-test/r/ps_3innodb.result sp1f-ps_3innodb.result-20040701142628-fyardhwsjvwfcltumzytqqssdpgu3e5d
mysql-test/r/ps_4heap.result sp1f-ps_4heap.result-20040701142628-qkny2md7rdyjymvmzg3d3c2x73o2wbfo
mysql-test/r/ps_5merge.result sp1f-ps_5merge.result-20040701142628-iu2zuhkhkly6pfhedemkatfcnxidbg6x
mysql-test/r/ps_ddl.result sp1f-ps_ddl.result-20071215004622-7wxecn5bjzrz7scbog54tuaaobpayisn
mysql-test/r/show_check.result sp1f-show_check.result-20001228015634-5hf7elb3nj3zmuz6tosvytmbu52bploi
mysql-test/r/sp.result sp1f-sp.result-20030117133802-duandg3yzagzyv7zhhbbt2kcomcegpc7
mysql-test/r/subselect3.result sp1f-subselect3.result-20061031174245-v7hvtc7uwevifiq4lziwv5gdcxpeak7t
mysql-test/r/trigger-trans.result sp1f-triggertrans.result-20060324115813-w4usj55vsjrwkifw2agfkyjl7t4si4f4
mysql-test/r/type_newdecimal.result sp1f-type_newdecimal.resu-20050208224936-kj6dxol5i7zbbfohybib53ffje5i63mk
mysql-test/suite/funcs_1/datadict/processlist_val.inc sp1f-processlist_val.inc-20070815194641-3hfsmyh3jr2gjhvgms52iydpkamdbnoz
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result sp1f-a_processlist_val_no-20070815194641-puz2vi6caqirb4nqzumushorqyuniraq
mysql-test/suite/funcs_1/r/processlist_val_ps.result sp1f-b_processlist_val_ps-20070815194641-kl4wj4y6bete5txk6xnyppp2h5atsodw
mysql-test/suite/ndb/r/ndb_partition_key.result sp1f-ndb_partition_key.re-20060627163411-ixq3dicsx23hp74olwtatoknhgmi6aup
mysql-test/suite/ndb/r/ps_7ndb.result sp1f-ps_7ndb.result-20040925150736-rcbl5rusdndurdccp43qyii5seddo34w
mysql-test/suite/ndb/t/ndb_partition_key.test sp1f-ndb_partition_key.te-20060627163256-zw6fazq4zq6r35nxo5djghahjlqcxv7y
mysql-test/suite/parts/inc/partition_alter4.inc sp1f-partition_alter4.inc-20070206122149-ivgy3eokfvjfwn3rvgp3aj2mdyqav7pb
mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result sp1f-partition_alter1_1_2-20080513231048-gvhb6v7nwg7es5oa2fgsyepczwbbsjgz
mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result sp1f-partition_alter1_1_2-20080513231048-ibvqvplo53vrvjs2wzrkrh5vaxmodixm
mysql-test/suite/parts/r/partition_alter1_1_innodb.result sp1f-partition_alter1_1_i-20080513231048-vw2fpqt45z7sziy2g2fygoa5bkl7p7jh
mysql-test/suite/parts/r/partition_alter1_1_myisam.result sp1f-partition_alter1_1_m-20080513231048-c6i674jghn6f4qszjht76lxfxtfshxxp
mysql-test/suite/parts/r/partition_alter1_2_innodb.result sp1f-partition_alter1_2_i-20080513231048-wfv352otdjdtnpaxsto6mcy6ld3hiv3g
mysql-test/suite/parts/r/partition_alter1_2_myisam.result sp1f-partition_alter1_2_m-20080513231048-js52yzqp26p7455im7swficligsnnaki
mysql-test/suite/parts/r/partition_alter2_innodb.result sp1f-partition_alter2_inn-20070206122236-eyhxvxhpzj3lubwixqbk3kzvjjgjhimo
mysql-test/suite/parts/r/partition_alter2_myisam.result sp1f-partition_alter2_myi-20070206122236-jpkrr2v2pgpksws5xs3ecgy3jjd5od6c
mysql-test/suite/parts/r/partition_alter4_innodb.result sp1f-partition_alter4_inn-20070206122237-ps26d32thnnu62bm5h4yc4jrptmt6yo3
mysql-test/suite/parts/r/partition_alter4_myisam.result sp1f-partition_alter4_myi-20070206122237-mpvhyhw3yqaxbqo75qhhaheutafxbipw
mysql-test/suite/parts/r/partition_basic_innodb.result sp1f-partition_basic_inno-20070206122237-pzpy2hvit34fxpvkxic73muh7h66lqhm
mysql-test/suite/parts/r/partition_basic_myisam.result sp1f-partition_basic_myis-20070206122237-ra3v2mwwwyd2tuddpu2ahvjvhg6wipqy
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result sp1f-partition_basic_syml-20080206141352-wwg6qk37quijmoqlubhbsgrkvybphmoc
mysql-test/suite/parts/r/partition_engine_innodb.result sp1f-partition_engine_inn-20070206122237-wnuontlk4bznsuooodvayhyqpkojyjbi
mysql-test/suite/parts/r/partition_engine_myisam.result sp1f-partition_engine_myi-20070206122237-2dovgbiyyvkmhmgarswhz3lgwi3awwq4
mysql-test/suite/parts/r/partition_special_innodb.result sp1f-partition_special_in-20070206122237-m4b4imng5obl5tl3xuwk673w32d6fsds
mysql-test/suite/parts/t/disabled.def sp1f-disabled.def-20070206122237-rolafbig4ipaf3oe5t7uowq76quzqjmh
mysql-test/suite/parts/t/partition_special_innodb.test sp1f-partition_special_in-20070206122239-ric3u7bjjmi6nzboyfzdbfiepzkx6i7k
mysql-test/suite/rpl/r/rpl_failed_optimize.result sp1f-rpl_failed_optimize.-20041103172259-bsr2f2kj7hrg6w4p3cjoztpznhjzsrrn
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result sp1f-rpl_innodb_mixed_dml-20070206122521-55gg47nv2ebmatncbhfe7ihcle7wzd6n
mysql-test/t/csv.test sp1f-csv.test-20040813035429-r4segxdqrdhxsixrtpgiksyj6dmyiylv
mysql-test/t/federated.test sp1f-federated.test-20041211200119-aht6hujozcouca6joz5eaiq55jk6psb5
mysql-test/t/func_regexp.test sp1f-func_regexp.test-20001228015635-gro22csmqth5yt7blhlmgfbvqvepstsx
mysql-test/t/innodb.test sp1f-innobase.test-20010112144027-wr4vc4ttrijucvuc5szdhgvh4rayp4nr
mysql-test/t/join.test sp1f-join.test-20001228015636-punt3oq3irbqswtbrlkelkxape6lttnl
mysql-test/t/lowercase_table3.test sp1f-lowercase_table3.tes-20040306084333-hnvnsyhtqiysn2fmfz3zkqfjy3mivo4d
mysql-test/t/partition.test sp1f-partition.test-20050718113034-pbo3ht3bf4gfa3mz44on3sqafyctwo35
mysql-test/t/ps_ddl.test sp1f-ps_ddl.test-20071215004622-2fkvss6xi7zvoksbhhmbwak3gs54jnbo
mysql-test/t/show_check.test sp1f-show_check.test-20001228015637-uv35wm2ryvpkyrr6ojhmi2nq6x6jgdod
mysql-test/t/sp.test sp1f-sp.test-20030117133803-b6pcfv2yscbqkur5fszep7acmdg7nf5k
mysql-test/t/subselect3.test sp1f-subselect3.test-20061031174245-pcxt5ljylerxhx2jkfhrbqfv5vqcazlz
mysql-test/t/type_newdecimal.test sp1f-type_newdecimal.test-20050208224936-e244l5ugrk3oditjqp53n6izptkrteq2
mysys/mf_pack.c sp1f-mf_pack.c-19700101030959-u7bzjnr4w3idabvny244w5gzcf33butm
mysys/my_static.c sp1f-my_static.c-19700101030959-vmmfiyygpz2awmm7d3pguy4rsuugbhcs
mysys/my_static.h sp1f-my_static.h-19700101030959-dbwatp4fo5hc64pxr5dr4q5jdawhqmbb
mysys/safemalloc.c sp1f-safemalloc.c-19700101030959-lzukndsycy7ifkiblxgakgzfmfevnjau
netware/BUILD/compile-linux-tools sp1f-compilelinuxtools-20030304040434-gihpmyjr3madhleotjxjgsdxkyvwn2qh
netware/BUILD/nwbootstrap sp1f-nwbootstrap-20030304040435-rz4o5ic6onmenwlgmz2ggjccc2plsxlk
netware/Makefile.am sp1f-makefile.am-20030128063823-wnb5jye7tjfortocwlygtkfa6oalmopy
netware/mysql_install_db.c sp1f-mysql_install_db.c-20030131234059-aaouo7hwocceqmnzk72rfxmfwynbhf2r
sql/ha_partition.cc sp1f-ha_partition.cc-20050718113037-eoky4qluumb5dmdyg5z6n2fvdkgutxms
sql/ha_partition.h sp1f-ha_partition.h-20050718113038-4xxwqkuu2xgxqtrwfbc43zgfyfcwzjsq
sql/handler.cc sp1f-handler.cc-19700101030959-ta6zfrlbxzucylciyro3musjsdpocrdh
sql/handler.h sp1f-handler.h-19700101030959-mumq2hpilkpgxuf22ftyv5kbilysnzvn
sql/item.cc sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn
sql/item.h sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa
sql/item_cmpfunc.cc sp1f-item_cmpfunc.cc-19700101030959-hrk7pi2n6qpwxauufnkizirsoucdcx2e
sql/mysql_priv.h sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
sql/protocol.cc sp1f-net_pkg.cc-19700101030959-7izj6xxqwgfgxuikg6t24dhcwdedbl6i
sql/sql_class.cc sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
sql/sql_parse.cc sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
sql/sql_partition.cc sp1f-sql_partition.cc-20050718113038-57h5bzswps6cel2y7k7qideue3ghbg3u
sql/sql_plugin.cc sp1f-sql_plugin.cc-20051105112032-hrm64p6xfjq33ud6zy3uivpo7azm75a2
sql/sql_show.cc sp1f-sql_show.cc-19700101030959-umlljfnpplg452h7reeyqr4xnbmlkvfj
sql/sql_table.cc sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
sql/sql_yacc.yy sp1f-sql_yacc.yy-19700101030959-wvn4qyy2drpmge7kaq3dysprbhlrv27j
sql/thr_malloc.cc sp1f-thr_malloc.cc-19700101030959-sg5hfbdswjtjtdjtmvppuc2eedch3p3s
storage/csv/ha_tina.cc sp1f-ha_tina.cc-20040813035429-5pwcme2ehkkuei6gu6ueo4tfldeeyw7l
storage/federated/ha_federated.cc sp1f-ha_federated.cc-20041211200120-gu52ex5sicbua5vtoocuki3ltllsvm2c
storage/innobase/buf/buf0buf.c sp1f-buf0buf.c-20010217121858-zsvjkxdlbzvmglvi56wvmv7ze3f7nzda
storage/innobase/ha/ha0ha.c sp1f-ha0ha.c-20010217121900-7eeddcimsybfjkvoqwri3mblfyffqvbg
storage/innobase/handler/ha_innodb.cc sp1f-ha_innobase.cc-20001205235417-rlet3ei56gdrss673dssnrqgug67lwno
storage/innobase/include/buf0buf.h sp1f-buf0buf.h-20010217121901-vpbalw25sk5hdhxje55whqtj6vke5awa
storage/innobase/include/mach0data.h sp1f-mach0data.h-20010217121903-66grfy3b6skgudvdli4owdshxnvcjo2o
storage/innobase/include/mach0data.ic sp1f-mach0data.ic-20010217121903-n2kjcumh2n3j5ydrwt5cllgns7c4kpyw
storage/innobase/include/srv0srv.h sp1f-srv0srv.h-20010217121907-oei3on7bcl3tqesmlbtyoybnevxxx2j5
storage/innobase/lock/lock0lock.c sp1f-lock0lock.c-20010217121909-slawfq55wuitbo2ujz7h5doebhwxfmhe
storage/innobase/row/row0sel.c sp1f-row0sel.c-20010217121914-c6o7vqncdgzrorm4pko5tpdlfeyujhvq
storage/innobase/srv/srv0srv.c sp1f-srv0srv.c-20010217121915-oxgww23dgwrrrgscuox5pkpnefaged77
storage/myisam/mi_check.c sp1f-mi_check.c-19700101030959-yzbhnjgzcmqdyj4zz5codhkkw5eedp6f
strings/decimal.c sp1f-decimal.c-20041018120639-qqm4oeadwhbdhuxgwlc657il4tu44n6m
tests/mysql_client_test.c sp1f-client_test.c-20020614002636-eqy2zzksgelocknwbbogfuwxfwqy7q5x
------------------------------------------------------------
revno: 2646.19.3
revision-id: joerg@stripped
parent: df@stripped
parent: hezx@stripped
committer: Joerg Bruehe <joerg@stripped>
branch nick: push-5.1
timestamp: Fr 2008-08-15 14:44:02 +0200
message:
Merge from main.
removed:
mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt sp1f-rpl_row_err_daisycha-20051222053501-3qqohpgemyrpktrz3dh6jjwmr7fvva5p
mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt sp1f-rpl_row_err_daisycha-20051222053502-dfv7cml5eevz6nkruqzt3e7udb3cjdif
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt sp1f-rpl_truncate_7ndb_2m-20060622194417-zimlzlewstxy7a4vcxzvgrxrdijkfzh3
modified:
mysql-test/extra/binlog_tests/binlog_insert_delayed.test sp1f-binlog_insert_delaye-20060830072242-2hmev3jbodvzh7uux7herlkzhb7aohl3
mysql-test/extra/rpl_tests/rpl_row_basic.test sp1f-rpl_row_basic.inc-20051222053451-qbja3f3vz3mf5ikwca7eeqkxutnnzlbi
mysql-test/include/show_binlog_events.inc sp1f-show_binlog_events.i-20060309000406-nqb4sdmx2mjdjig7nf3fzjrwwew33xxu
mysql-test/suite/binlog/r/binlog_killed_simulate.result sp1f-binlog_killed_simula-20071031094843-hn7c5gekip7rxgka7cic7saaqoy6afkn
mysql-test/suite/binlog/r/binlog_row_binlog.result sp1f-binlog_row_binlog.re-20051222053451-vl3rsa7i5wuxj6pjofa7aylzersn25i6
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result sp1f-binlog_row_mix_innod-20051222053451-e65hkpwkx65zhmyddgnozkwk6mudqlhi
mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result sp1f-binlog_statement_ins-20060830072242-ae5aq73ikpygjrrlevkwrvywkie3alrk
mysql-test/suite/binlog/r/binlog_stm_binlog.result sp1f-binlog.result-20050223135507-y6mkcjto5zdkpgaevaqo5epoafa3yiq5
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result sp1f-mix_innodb_myisam_bi-20030822133916-l72xhg2oxjthj6ichxowk55lrbjebfxa
mysql-test/suite/rpl/r/rpl_loaddata_map.result sp1f-rpl_loaddata_map.res-20071221203440-ccy2zkl5istm7qrpaydhz3lbzt355aie
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result sp1f-rpl_row_basic_2myisa-20051222053452-4mwybeg7asrg6l6usde7gfdw6u4cmx2h
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result sp1f-rpl_row_basic_3innod-20051222053452-vbynyu35bdhjizxhznism7jalbzil7l2
mysql-test/suite/rpl/r/rpl_stm_log.result sp1f-rpl_log.result-20010621191923-r3yiuhrqrbautxnc66pw6bzlo6qp7sds
mysql-test/suite/rpl/r/rpl_variables.result sp1f-rpl_variables.result-20080307125934-bmna6r5yow4f3ycjtdpgiz3pt7i7et3n
mysql-test/suite/rpl/t/rpl_incident.test sp1f-rpl_incident.test-20070329183104-4h7hbwsdf5gkjzjtglmvxyi2jfnjleax
mysql-test/suite/rpl/t/rpl_loaddata_map.test sp1f-rpl_loaddata_map.tes-20071221203441-mv3utq2yoptnzg4fduprkm4vnmlai3mo
mysql-test/suite/rpl/t/rpl_trunc_temp.test sp1f-rpl_trunc_temp.test-20060308091544-gcft6ji3qjdrefet7hmbql6f3m4bt243
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test sp1f-rpl_truncate_7ndb_2.-20060622194418-iezhg6gzwibksi4t4mc2n54isf4324ag
mysql-test/suite/rpl/t/rpl_variables.test sp1f-rpl_variables.test-20080307125934-j7mfvdj2g6f44doczush4gyq3q2peauf
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result sp1f-rpl_row_basic_7ndb.r-20060112185042-qnln6taptlwuulawjqhqz4q3noofqdfa
mysql-test/suite/rpl_ndb/t/disabled.def sp1f-disabled.def-20070627122758-45lp6netjm4252w3f7gby7yzpiimkijr
sql/sql_binlog.cc sp1f-sql_binlog.cc-20051222053449-o6vkdfrjkuledkjdwz2jx3zykz4izfsz
------------------------------------------------------------
revno: 2646.19.2
revision-id: df@stripped
parent: joerg@stripped
parent: df@stripped
committer: Daniel Fischer <df@stripped>
branch nick: mysql-5.1-build
timestamp: Mi 2008-08-13 18:46:53 +0200
message:
merge
modified:
zlib/gzio.c sp1f-gzio.c-20020319040627-dzt3rl3kklylxis35ym3ldjtzvu7xagn
------------------------------------------------------------
revno: 1810.3769.1
revision-id: df@stripped
parent: kpettersson@stripped
committer: Daniel Fischer <df@stripped>
branch nick: mysql-5.0-build
timestamp: Mi 2008-08-13 18:44:05 +0200
message:
let's try to avoid re-defining _vsnprintf on Windows
modified:
zlib/gzio.c sp1f-gzio.c-20020319040627-dzt3rl3kklylxis35ym3ldjtzvu7xagn
------------------------------------------------------------
revno: 2736.1.1
revision-id: kpettersson@stripped
parent: kgeorge@stripped
parent: kpettersson@stripped
committer: Kristofer Pettersson <kpettersson@stripped>
branch nick: mysql-5.1-bugteam
timestamp: Do 2008-09-11 13:23:12 +0200
message:
Auto merge.
modified:
sql/sql_insert.cc sp1f-sql_insert.cc-19700101030959-xgwqe5svnimxudzdcuitauljzz2zjk5g
------------------------------------------------------------
revno: 2718.1.11
revision-id: kpettersson@stripped
parent: davi.arnaut@stripped
committer: Kristofer Pettersson <kpettersson@stripped>
branch nick: mysql-5.1-bug38692
timestamp: Mi 2008-09-10 16:58:03 +0200
message:
Bug#38692 concurrent inserts cause valgrind errors in Query_cache::invalidate
If a delayed insert thread was aborted by a concurrent 'truncate table'
statement, then the diagnostic area would fail with an assert in a debug build
because no actual error message was pushed on the stack despite a thread
being killed.
This patch adds an error message to the stack.
modified:
sql/sql_insert.cc sp1f-sql_insert.cc-19700101030959-xgwqe5svnimxudzdcuitauljzz2zjk5g
Attachment: [text/text/x-diff] patch-2738.diff
| Thread |
|---|
| • bzr commit into mysql-5.1 tree (Matthias.Leich:2738) Bug#31233, Bug#35720,Bug#35987, Bug#37098, Bug#37938, Bug#38692, Bug#39803 | Matthias Leich | 16 Sep |
