#At file:///work2/6.0/mysql-6.0-bugteam-push/
------------------------------------------------------------
revno: 2677
revision-id: mleich@stripped
parent: mleich@stripped
parent: mleich@stripped
committer: Matthias Leich mleich@stripped
branch nick: mysql-6.0-bugteam-push
timestamp: Fr 2008-06-20 16:23:03 +0200
message:
Null merge, because this stuff is already
within the branch
------------------------------------------------------------
revno: 2497.254.6
revision-id: mleich@stripped
parent: davi@stripped
parent: mleich@stripped
committer: Matthias Leich mleich@stripped
branch nick: mysql-5.1-bugteam-push
timestamp: Fr 2008-06-20 14:55:17 +0200
message:
Automatic merge
added:
mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc is_key_column_usage.-20080616172551-o1lp5nf531z43ni3-1
mysql-test/suite/funcs_1/datadict/is_routines.inc is_routines.inc-20080616173239-ix495ppzuvfztxtp-1
mysql-test/suite/funcs_1/datadict/is_schemata.inc is_schemata.inc-20080616173354-g6sp7yr6m0jdu58y-1
mysql-test/suite/funcs_1/datadict/is_tables.inc is_tables.inc-20080616173512-ff9s4j222984ysd2-1
mysql-test/suite/funcs_1/datadict/is_triggers.inc is_triggers.inc-20080616173844-eisfa6g47d5u2dyu-1
mysql-test/suite/funcs_1/datadict/is_views.inc is_views.inc-20080616173951-t1vpprqbs4bxzxyh-1
mysql-test/suite/funcs_1/datadict/tables.inc tables.inc-20080616173633-7yhsidwwv1m7q0xm-1
mysql-test/suite/funcs_1/include/bug28309_skip.inc bug28309_skip.inc-20080616172322-58wedw314zudnymc-1
mysql-test/suite/funcs_1/r/is_cml_innodb.result is_cml_innodb.result-20080616171935-sl04j972o55obadv-1
mysql-test/suite/funcs_1/r/is_cml_memory.result is_cml_memory.result-20080616171935-sl04j972o55obadv-2
mysql-test/suite/funcs_1/r/is_cml_myisam.result is_cml_myisam.result-20080616171935-sl04j972o55obadv-3
mysql-test/suite/funcs_1/r/is_cml_ndb.result is_cml_ndb.result-20080616171935-sl04j972o55obadv-4
mysql-test/suite/funcs_1/r/is_columns_is_embedded.result is_columns_is_embedd-20080616171935-sl04j972o55obadv-5
mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result is_columns_myisam_em-20080616171935-sl04j972o55obadv-6
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result is_columns_mysql_emb-20080616171935-sl04j972o55obadv-7
mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result is_key_column_usage_-20080616171935-sl04j972o55obadv-8
mysql-test/suite/funcs_1/r/is_routines_embedded.result is_routines_embedded-20080616171935-sl04j972o55obadv-9
mysql-test/suite/funcs_1/r/is_schemata_embedded.result is_schemata_embedded-20080616171935-sl04j972o55obadv-10
mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result is_statistics_mysql_-20080616171935-sl04j972o55obadv-11
mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result is_table_constraints-20080616171935-sl04j972o55obadv-12
mysql-test/suite/funcs_1/r/is_tables_embedded.result is_tables_embedded.r-20080616171935-sl04j972o55obadv-13
mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result is_tables_myisam_emb-20080616171935-sl04j972o55obadv-14
mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result is_tables_mysql_embe-20080616171935-sl04j972o55obadv-15
mysql-test/suite/funcs_1/r/is_triggers_embedded.result is_triggers_embedded-20080616171935-sl04j972o55obadv-16
mysql-test/suite/funcs_1/r/is_views_embedded.result is_views_embedded.re-20080616171935-sl04j972o55obadv-17
mysql-test/suite/funcs_1/t/is_cml_innodb.test is_cml_innodb.test-20080616171930-zyj9h7bdkbtux050-1
mysql-test/suite/funcs_1/t/is_cml_memory.test is_cml_memory.test-20080616171930-zyj9h7bdkbtux050-2
mysql-test/suite/funcs_1/t/is_cml_myisam.test is_cml_myisam.test-20080616171930-zyj9h7bdkbtux050-3
mysql-test/suite/funcs_1/t/is_cml_ndb.test is_cml_ndb.test-20080616171930-zyj9h7bdkbtux050-4
mysql-test/suite/funcs_1/t/is_columns_is_embedded.test is_columns_is_embedd-20080616171930-zyj9h7bdkbtux050-5
mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test is_columns_myisam_em-20080616171930-zyj9h7bdkbtux050-6
mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test is_columns_mysql_emb-20080616171930-zyj9h7bdkbtux050-7
mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test is_key_column_usage_-20080616171930-zyj9h7bdkbtux050-8
mysql-test/suite/funcs_1/t/is_routines_embedded.test is_routines_embedded-20080616171930-zyj9h7bdkbtux050-9
mysql-test/suite/funcs_1/t/is_schemata_embedded.test is_schemata_embedded-20080616171930-zyj9h7bdkbtux050-10
mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test is_statistics_mysql_-20080616171930-zyj9h7bdkbtux050-11
mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test is_table_constraints-20080616171930-zyj9h7bdkbtux050-12
mysql-test/suite/funcs_1/t/is_tables_embedded.test is_tables_embedded.t-20080616171930-zyj9h7bdkbtux050-13
mysql-test/suite/funcs_1/t/is_tables_myisam_embedded.test is_tables_myisam_emb-20080616171930-zyj9h7bdkbtux050-14
mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test is_tables_mysql_embe-20080616171930-zyj9h7bdkbtux050-15
mysql-test/suite/funcs_1/t/is_triggers_embedded.test is_triggers_embedded-20080616171930-zyj9h7bdkbtux050-16
mysql-test/suite/funcs_1/t/is_views_embedded.test is_views_embedded.te-20080616171930-zyj9h7bdkbtux050-17
modified:
mysql-test/suite/funcs_1/datadict/columns.inc sp1f-columns.inc-20080307163305-z5fe3rsuxgodb7vdv4inxhsgx2crdll3
mysql-test/suite/funcs_1/datadict/tables1.inc sp1f-tables1.inc-20080307163305-s6gzaiievmm4owpzuqj47yif53p5yftw
mysql-test/suite/funcs_1/datadict/tables2.inc sp1f-tables2.inc-20080307163305-ao7hz2ott2tj4o2kkqjc2gc24niwcd5u
mysql-test/suite/funcs_1/include/innodb_tb1.inc sp1f-innodb_tb1.inc-20070206175435-dbhgpmvh3jvpjycnat6rnhcadtkbbz3t
mysql-test/suite/funcs_1/include/innodb_tb3.inc sp1f-innodb_tb3.inc-20070206175435-226s3vpm7hwqyfqfmlgzunwuabt2vjlh
mysql-test/suite/funcs_1/include/innodb_tb4.inc sp1f-innodb_tb4.inc-20070206175435-3ea4nbjs2navylp4tmvdp6qirkhu5p7j
mysql-test/suite/funcs_1/include/memory_tb4.inc sp1f-memory_tb4.inc-20070206175435-upp4xio5f63ns35tmigesipt2yywz6jf
mysql-test/suite/funcs_1/include/myisam_tb1.inc sp1f-myisam_tb1.inc-20070206175435-ppvqzhwj4urfshvsx3ima2aiolt6u3ul
mysql-test/suite/funcs_1/include/myisam_tb3.inc sp1f-myisam_tb3.inc-20070206175435-46ozmsyoeusi6vqkhzhowmiyzh7iqxd5
mysql-test/suite/funcs_1/include/myisam_tb4.inc sp1f-myisam_tb4.inc-20070206175435-avrt3lfdhhz2djc5yrzaqerbhaaqc73a
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result sp1f-innodb_trig_frkey.re-20070206175436-dsfxk5e5qw7igoylrhnmbrfa5y6ay5dq
mysql-test/suite/funcs_1/r/is_columns_innodb.result sp1f-is_columns_innodb.re-20080307163304-7nvpqbmjf5zbzojk4qdiaynstw3y3j2g
mysql-test/suite/funcs_1/r/is_columns_memory.result sp1f-is_columns_memory.re-20080307163304-w4pvmhlppwq7353yai3dn4grdmlhelnx
mysql-test/suite/funcs_1/r/is_columns_myisam.result sp1f-is_columns_myisam.re-20080307163304-yilcnout3bbyjf6a6axasqktx5uraj7v
mysql-test/suite/funcs_1/r/is_tables_innodb.result sp1f-is_tables_innodb.res-20080307163304-54jwsyg4phs6uxdi7hxmg456xc4g3wiq
mysql-test/suite/funcs_1/r/is_tables_is.result sp1f-is_tables_is.result-20080307163304-6xl5vbegso6wet3dzoehxb645vntxpig
mysql-test/suite/funcs_1/r/is_tables_memory.result sp1f-is_tables_memory.res-20080307163304-xbkbbqpb3cmhqlf3yavzgjubmtzcqiwu
mysql-test/suite/funcs_1/r/is_tables_myisam.result sp1f-is_tables_myisam.res-20080307163304-e4a7cotuvanfvlzekx7hbwyhb5f2gk73
mysql-test/suite/funcs_1/r/is_tables_mysql.result sp1f-is_tables_mysql.resu-20080307163304-uuf3e2hr4j4mfefd7ticnk564tguxpnq
mysql-test/suite/funcs_1/r/is_tables_ndb.result sp1f-is_tables_ndb.result-20080307163304-unqw2ogbf6mofodourgduawt5bo4z23u
mysql-test/suite/funcs_1/r/memory_bitdata.result sp1f-memory_bitdata.resul-20070206175436-3le2pg5sk2jf2l4plsvma72ac7w2pngv
mysql-test/suite/funcs_1/r/memory_cursors.result sp1f-memory_cursors.resul-20070206175436-f3tayb7whyo6ey2ycxum2hjapvjvauss
mysql-test/suite/funcs_1/r/memory_func_view.result sp1f-memory_func_view.res-20070206175436-3fqxnwbedehhtbacqfdpguyzlzigftqi
mysql-test/suite/funcs_1/r/memory_storedproc.result sp1f-memory_storedproc.re-20070206175436-kdub7wmixdd5iahs4y6t6osgcc2uajyb
mysql-test/suite/funcs_1/r/memory_storedproc_02.result sp1f-memory_storedproc_02-20070206175436-q7m6iwxkrg5fsyyaopqleovbyclohsqa
mysql-test/suite/funcs_1/r/memory_storedproc_03.result sp1f-memory_storedproc_03-20070206175436-4ikdlvt6xd7nydjw7avzlybmwlema6mg
mysql-test/suite/funcs_1/r/memory_storedproc_06.result sp1f-memory_storedproc_06-20070206175436-mkddiv47qjuyyscnfysysoquxbumda2a
mysql-test/suite/funcs_1/r/memory_storedproc_07.result sp1f-memory_storedproc_07-20070206175436-cwgznnhbnyjpgihauhlt5gewjp3rewon
mysql-test/suite/funcs_1/r/memory_storedproc_08.result sp1f-memory_storedproc_08-20070206175436-76ha7p4xjz53vo6uu2hai2auo5aovihe
mysql-test/suite/funcs_1/r/memory_storedproc_10.result sp1f-memory_storedproc_10-20070206175436-afnzhtvntodt2hppwnzcyncsnc6doprv
mysql-test/suite/funcs_1/r/memory_trig_0102.result sp1f-memory_trig_0102.res-20070206175436-3vo6jvwyznevrpzwxagzuvd7pjnwgu32
mysql-test/suite/funcs_1/r/memory_trig_03.result sp1f-memory_trig_03.resul-20070206175436-pxa3il3tcnaspjngarefebn7l7dqis2y
mysql-test/suite/funcs_1/r/memory_trig_03e.result sp1f-memory_trig_03e.resu-20070206121931-astuoci5wwzwr7wv32sxex25mrbrubnh
mysql-test/suite/funcs_1/r/memory_trig_0407.result sp1f-memory_trig_0407.res-20070206175436-ami35yone2dq3k5mwehgyqkykjfqrzw6
mysql-test/suite/funcs_1/r/memory_trig_08.result sp1f-memory_trig_08.resul-20070206175436-l6timuowetepntkcpq24cfaxnqbaukeb
mysql-test/suite/funcs_1/r/memory_trig_09.result sp1f-memory_trig_09.resul-20070206175436-wpykodzbwjreeqwlkrcdgq2spuiwcdk4
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result sp1f-memory_trig_1011ext.-20070206175436-lk6rwxzv6hisbya5l5jurcn2hxde56pt
mysql-test/suite/funcs_1/r/memory_views.result sp1f-memory_views.result-20070206175437-khvv746ejvtr4mpnkcmar2cw7vakd3dy
mysql-test/suite/funcs_1/r/myisam_bitdata.result sp1f-myisam_bitdata.resul-20070206175437-om5hmmlcqmwnymfhfwbp3sw4hqww2kfr
mysql-test/suite/funcs_1/r/myisam_cursors.result sp1f-myisam_cursors.resul-20070206175437-mvulawtnuuvc4gbj5edrcvn2re4w4hif
mysql-test/suite/funcs_1/r/myisam_func_view.result sp1f-myisam_func_view.res-20070206175437-hx5547ncsoco2bpruecyswjziotocyhd
mysql-test/suite/funcs_1/r/myisam_storedproc.result sp1f-myisam_storedproc.re-20070206175437-milfj5u3wkpto57wryhyj4dp7limye6p
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result sp1f-myisam_storedproc_02-20070206175437-dpdqu7jirwudocmnf35kk5wc3lgirzpf
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result sp1f-myisam_storedproc_03-20070206175437-ab6pxhhfz2bk3qyp4ommm25uuwgrkth7
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result sp1f-myisam_storedproc_06-20070206175437-znhjaonki53ni5aqhhnqolm346l5sl7v
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result sp1f-myisam_storedproc_07-20070206175437-wkux2saiiiyekqhp62ptd65pjwd2i46v
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result sp1f-myisam_storedproc_08-20070206175437-z46xsvscoscrlklrejjtprhjp67cklp3
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result sp1f-myisam_storedproc_10-20070206175437-rzl3p3npjpdpfoz2dbcm3wqmfs6ezkr3
mysql-test/suite/funcs_1/r/myisam_trig_0102.result sp1f-myisam_trig_0102.res-20070206175437-lsgr75qs52skqoxhdrmgrfykhylpj22u
mysql-test/suite/funcs_1/r/myisam_trig_03.result sp1f-myisam_trig_03.resul-20070206175437-zfqieq3khktj2e5eulyiu2wu2bdmd6zh
mysql-test/suite/funcs_1/r/myisam_trig_03e.result sp1f-myisam_trig_03e.resu-20070206121932-o2gyohgtmdu45yaby2p7rod6a3iwlczm
mysql-test/suite/funcs_1/r/myisam_trig_0407.result sp1f-myisam_trig_0407.res-20070206175437-cnomsj2jcwpfpfoop2cran2lszr33ig2
mysql-test/suite/funcs_1/r/myisam_trig_08.result sp1f-myisam_trig_08.resul-20070206175437-ckwl4sej56qizaff5gcl27iv2bipcv6l
mysql-test/suite/funcs_1/r/myisam_trig_09.result sp1f-myisam_trig_09.resul-20070206175437-o5nt24kekznzixwwetwhvxd3qsfrdbdl
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result sp1f-myisam_trig_1011ext.-20070206175437-wm77dmka5iagttd7vctzxk42xhnc46vv
mysql-test/suite/funcs_1/r/myisam_views.result sp1f-myisam_views.result-20070206175437-lee63kgmijo2j5tzireezdypyd7hdk2v
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc sp1f-storedproc_06.inc-20070206175437-c7xqg62jkkref7qpcatb4e55xbbsho2a
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc sp1f-storedproc_10.inc-20070206175437-2llraij5epdgtaq77iaisyp4mp5zvuyh
mysql-test/suite/funcs_1/t/innodb_storedproc.test sp1f-innodb_storedproc.te-20070206175438-c34inucjhsyts5wlw7neck5chfhprwwa
mysql-test/suite/funcs_1/t/innodb_trig_03e.test sp1f-innodb_trig_03e.test-20070206121933-vt3qwyecvkmbjh6bia6yhoftrootoe2o
mysql-test/suite/funcs_1/t/innodb_trig_frkey.test sp1f-innodb_trig_frkey.te-20070206175438-dgw564ulwjqa3np5kqwz4fyb3jmceh5t
mysql-test/suite/funcs_1/t/is_basics_mixed.test sp1f-is_basics_mixed.test-20080307163303-2oztqto5drasm5vyg5fyh3g56she4g2m
mysql-test/suite/funcs_1/t/is_character_sets.test sp1f-is_character_sets.te-20080307163303-sh7gl44qtwqrcdsztbpx5taoka3urt7q
mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test sp1f-is_collation_charact-20080307163303-4mp7io5o3istho5ivu5ptsno62teryqn
mysql-test/suite/funcs_1/t/is_collations.test sp1f-is_collations.test-20080307163303-2tga3tl7jkfgl64m5ghyoy77ft3vldmt
mysql-test/suite/funcs_1/t/is_column_privileges.test sp1f-is_column_privileges-20080307163303-keh233ljpco5rbvthqlvqn6htu3rwoul
mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test sp1f-is_column_privileges-20080307163303-qsrajwvnttvdrmet6qbemglnyjnv5zzw
mysql-test/suite/funcs_1/t/is_columns.test sp1f-is_columns.test-20080307163303-oc6d2ty4yotleyggin56cmja47omykqf
mysql-test/suite/funcs_1/t/is_columns_innodb.test sp1f-is_columns_innodb.te-20080307163303-ydhchvgdgr7tz52bxhm73ccve5epvt3s
mysql-test/suite/funcs_1/t/is_columns_is.test sp1f-is_columns_is.test-20080307163303-projhl5aviz6wflvnkcoukmxy6nra32g
mysql-test/suite/funcs_1/t/is_columns_memory.test sp1f-is_columns_memory.te-20080307163303-3s7f5zel2pwihh3nqizpkc4muhwdasuy
mysql-test/suite/funcs_1/t/is_columns_myisam.test sp1f-is_columns_myisam.te-20080307163303-6xhvptc257jg7y6u3bffwjyhudfwcfv2
mysql-test/suite/funcs_1/t/is_columns_mysql.test sp1f-is_columns_mysql.tes-20080307163303-4c42lnhewccbri2xpvxd73k6xpmn6wk2
mysql-test/suite/funcs_1/t/is_columns_ndb.test sp1f-is_columns_ndb.test-20080307163303-jrfiypvi6yqiqvfm5g2th4ct2ap74o7r
mysql-test/suite/funcs_1/t/is_engines.test sp1f-is_engines.test-20080307191812-h5miljufcdsmjcoawzlpqfqd7jojnw53
mysql-test/suite/funcs_1/t/is_events.test sp1f-is_events.test-20080307191812-ff6ss7aktfqpbhycwnpfx43mlepsxpjv
mysql-test/suite/funcs_1/t/is_key_column_usage.test sp1f-is_key_column_usage.-20080307163303-g6lnlxtwlx5rb2lfoj4zwixuygtjgtl7
mysql-test/suite/funcs_1/t/is_routines.test sp1f-is_routines.test-20080307163303-yfrnfl6aslpuumbfiwue4p365bsybjiw
mysql-test/suite/funcs_1/t/is_schema_privileges.test sp1f-is_schema_privileges-20080307163303-eugcpzkateacqmjqqycvpggpr7eishuu
mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test sp1f-is_schema_privileges-20080307163303-zcqapeo6rdvz4paumijy7hmxqrcipjra
mysql-test/suite/funcs_1/t/is_schemata.test sp1f-is_schemata.test-20080307163303-54pnt42gy4hjdz7jfow7tksaawj4j6gl
mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test sp1f-is_schemata_is_mysql-20080307163303-ixnetelefdvudzhgpsfopoa4ny35vm6c
mysql-test/suite/funcs_1/t/is_statistics.test sp1f-is_statistics.test-20080307163303-dbmzsieluhz42cagud4wnzgausim6ei4
mysql-test/suite/funcs_1/t/is_statistics_mysql.test sp1f-is_statistics_mysql.-20080307163303-numoc7si6lwk2nxc7h6nywbjs5h6wh2t
mysql-test/suite/funcs_1/t/is_table_constraints.test sp1f-is_table_constraints-20080307163303-vcivq6dpe2t2frgih6r7hcxegob557er
mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test sp1f-is_table_constraints-20080307163303-l6pipblq3xd46ammvhmnj5j5x2jyt6ah
mysql-test/suite/funcs_1/t/is_table_privileges.test sp1f-is_table_privileges.-20080307163303-2ypv6eleg6mhm3sq27ghvief5q6kh4qo
mysql-test/suite/funcs_1/t/is_tables.test sp1f-is_tables.test-20080307163304-ztatzhai44munfzegibcmjpp2qksanih
mysql-test/suite/funcs_1/t/is_tables_innodb.test sp1f-is_tables_innodb.tes-20080307163304-mlacutwl76d6qzw452fxxijizyl2ne5q
mysql-test/suite/funcs_1/t/is_tables_memory.test sp1f-is_tables_memory.tes-20080307163304-55qlmh6jhk2mck6letlks2hxgkgeknw2
mysql-test/suite/funcs_1/t/is_tables_myisam.test sp1f-is_tables_myisam.tes-20080307163304-l63n4ojzbywi5cwj2riqkfb5p66e3ql3
mysql-test/suite/funcs_1/t/is_tables_mysql.test sp1f-is_tables_mysql.test-20080307163304-42vrqq7pnz4rikmjvmlez5db2ouhi6p4
mysql-test/suite/funcs_1/t/is_tables_ndb.test sp1f-is_tables_ndb.test-20080307163304-d66dufq3pvwyeu5enhytsdjiqudlmhno
mysql-test/suite/funcs_1/t/is_triggers.test sp1f-is_triggers.test-20080307163304-wyea7aw7hg2dgwbuotbivvq2b7c3ww5k
mysql-test/suite/funcs_1/t/is_user_privileges.test sp1f-is_user_privileges.t-20080307163304-3z62hmj34bfvetpdgcjchxgwplpzamkn
mysql-test/suite/funcs_1/t/is_views.test sp1f-is_views.test-20080307163304-qqycf44pn24qw6utbuodxwblnutvv643
mysql-test/suite/funcs_1/t/memory_bitdata.test sp1f-memory_bitdata.test-20070206175438-6a6dftnatk6ksefzbdhw27y2iodvujrt
mysql-test/suite/funcs_1/t/memory_cursors.test sp1f-memory_cursors.test-20070206175438-zrelts6k7ku7ol5xie5o6vz4ovrn6iff
mysql-test/suite/funcs_1/t/memory_func_view.test sp1f-memory_func_view.tes-20070206175438-acg77l6vpbpsz5ydzoj6kuif3d6kwmtg
mysql-test/suite/funcs_1/t/memory_storedproc.test sp1f-memory_storedproc.te-20070206175438-74cot34q2ym67orv2nktrk7stv3m3o7p
mysql-test/suite/funcs_1/t/memory_storedproc_02.test sp1f-memory_storedproc_02-20070206175438-ct2yr4anyjrnkeybyu57ms55nj55wsw5
mysql-test/suite/funcs_1/t/memory_storedproc_03.test sp1f-memory_storedproc_03-20070206175438-tjkimfo6bg3diwnxl6ryxr6kljsvcwyr
mysql-test/suite/funcs_1/t/memory_storedproc_06.test sp1f-memory_storedproc_06-20070206175438-lxig2ukapqip7ngjiueew5v6u3kpjzx2
mysql-test/suite/funcs_1/t/memory_storedproc_07.test sp1f-memory_storedproc_07-20070206175438-pqcldenoeobb4codvbuwx4o4pqlblisf
mysql-test/suite/funcs_1/t/memory_storedproc_08.test sp1f-memory_storedproc_08-20070206175438-qt3nhcu6vfdzpjhezunh4e5sw7r44odd
mysql-test/suite/funcs_1/t/memory_storedproc_10.test sp1f-memory_storedproc_10-20070206175438-nkzecmdbwevlxbzibrmjz5vtn4vhjzid
mysql-test/suite/funcs_1/t/memory_trig_0102.test sp1f-memory_trig_0102.tes-20070206175438-kt7imrplki3vnguoz7ev3xqvi676voem
mysql-test/suite/funcs_1/t/memory_trig_03.test sp1f-memory_trig_03.test-20070206175438-kjpgh7awqdqdewgdxejebdmpv56bhxkp
mysql-test/suite/funcs_1/t/memory_trig_03e.test sp1f-memory_trig_03e.test-20070206121934-skdh4elirjolyzrhzxxzc7t67oqpf6n4
mysql-test/suite/funcs_1/t/memory_trig_0407.test sp1f-memory_trig_0407.tes-20070206175438-3fmfr5e4arp267rsnstbescawqjqkg3o
mysql-test/suite/funcs_1/t/memory_trig_08.test sp1f-memory_trig_08.test-20070206175438-hhpy43xf5fsggoh52jtvmd5rb7iqvndk
mysql-test/suite/funcs_1/t/memory_trig_09.test sp1f-memory_trig_09.test-20070206175438-tzcisjxtp7zl45h57rqofw7mmyl2zvxn
mysql-test/suite/funcs_1/t/memory_trig_1011ext.test sp1f-memory_trig_1011ext.-20070206175438-zdhfamx7oygpnsl3rsyd7wj2sc2c2n7p
mysql-test/suite/funcs_1/t/memory_views.test sp1f-memory_views.test-20070206175439-xqihcda3ine7bi6hopaac7a4xytisplb
mysql-test/suite/funcs_1/t/myisam_bitdata.test sp1f-myisam_bitdata.test-20070206175439-r355ponscepzsgjfux46tqq7n4f3dtsi
mysql-test/suite/funcs_1/t/myisam_cursors.test sp1f-myisam_cursors.test-20070206175439-gpnwx3huuzfaevqtojqqbcaejdfysho2
mysql-test/suite/funcs_1/t/myisam_func_view.test sp1f-myisam_func_view.tes-20070206175439-w27iaoy4feiybie5rx6uphl52zrl3r6e
mysql-test/suite/funcs_1/t/myisam_storedproc.test sp1f-myisam_storedproc.te-20070206175439-l2zw7tyynnjgflqv73byupz7f7c7ddth
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test sp1f-myisam_storedproc_02-20070206175439-yj4jp6zakzptjxw5hpyvzd7wopiw7vkr
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test sp1f-myisam_storedproc_03-20070206175439-3xk52ro7zuubqeonuc5b3kouqzhcs4hk
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test sp1f-myisam_storedproc_06-20070206175439-une6ic4dshquomqiof3wvn37zrn2mvpe
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test sp1f-myisam_storedproc_07-20070206175439-njnlp4mw6qml6nlpqwijxyy4lhth3zrn
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test sp1f-myisam_storedproc_08-20070206175439-rz2dm4wboiwsjwumspawac3ws4gjj2y6
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test sp1f-myisam_storedproc_10-20070206175439-nng7gi4agosxtfgxfo6hp6fdgw3ub67x
mysql-test/suite/funcs_1/t/myisam_trig_0102.test sp1f-myisam_trig_0102.tes-20070206175439-xyiyxciujeuuvnoeaozzk2sbrpwz44bi
mysql-test/suite/funcs_1/t/myisam_trig_03.test sp1f-myisam_trig_03.test-20070206175439-beaflheb5rzzxcui5c33xjit7g6kjhsm
mysql-test/suite/funcs_1/t/myisam_trig_03e.test sp1f-myisam_trig_03e.test-20070206121934-w4gn6gwy3lozgxujnbipx4kcefmalcp4
mysql-test/suite/funcs_1/t/myisam_trig_0407.test sp1f-myisam_trig_0407.tes-20070206175439-ipgr5agogavxuirtrodvkkhbgw3raqga
mysql-test/suite/funcs_1/t/myisam_trig_08.test sp1f-myisam_trig_08.test-20070206175439-56e2mu6bevfc5jbltrg3uqmfjwqqxmfl
mysql-test/suite/funcs_1/t/myisam_trig_09.test sp1f-myisam_trig_09.test-20070206175439-2bzvyx6ouwy3kb27e4umfvvjyti4qu6j
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test sp1f-myisam_trig_1011ext.-20070206175439-iprx5iw6vmrk2vn6xn7qhpdobrm2ozp3
mysql-test/suite/funcs_1/t/myisam_views.test sp1f-myisam_views.test-20070206175439-kf45zedqswta3i4kjm2cx7yerz4xxl4y
mysql-test/suite/funcs_1/t/ndb_storedproc.test sp1f-ndb_storedproc.test-20080108125557-6vlsdbhpceoqo6wwe3o5vwggj7qnr5gp
mysql-test/suite/funcs_1/t/ndb_trig_03e.test sp1f-ndb_trig_03e.test-20070206121934-ehwa4ip5m7feanpv3hiwpiqhulafk7dr
mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test sp1f-a_processlist_priv_n-20070815194641-jc23md36xweqgyinwr2p72d6pk6w4e55
mysql-test/suite/funcs_1/t/processlist_priv_ps.test sp1f-b_processlist_priv_p-20070815194641-p24aqqdswa2r3pdpljjnz326ybs3befz
mysql-test/suite/funcs_1/t/processlist_val_no_prot.test sp1f-a_processlist_val_no-20070815194641-a5gas775cr2em6dcm4qyxkrfddlykbei
mysql-test/suite/funcs_1/t/processlist_val_ps.test sp1f-b_processlist_val_ps-20070815194641-2tbrp4mfz7vcdjcwtpb3kahnfz6paymp
mysql-test/suite/funcs_1/triggers/trig_frkey.inc sp1f-trig_frkey.inc-20070206175439-s6yywz4idr664fal4r36b5avem7hvq3x
mysql-test/suite/funcs_1/triggers/triggers_03.inc sp1f-triggers_03.inc-20070206175439-xg3hkddw3jqmctyrsxwrxp5rutis24zo
mysql-test/suite/funcs_1/views/func_view.inc sp1f-func_view.inc-20070206175439-2khajzogmehxdksl4yhgbs3l65nofqb4
mysql-test/suite/funcs_1/views/views_master.inc sp1f-views_master.inc-20070206175440-b5nt3ii7bl6bewe5lefiyqghwdhssryz
------------------------------------------------------------
revno: 2497.254.5
revision-id: davi@stripped
parent: gshchepa@stripped
committer: Davi Arnaut <davi@stripped>
branch nick: 37003-5.1
timestamp: Do 2008-06-19 13:00:53 -0300
message:
Silence unused variable warning by printing the variables value.
modified:
mysys/stacktrace.c sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
------------------------------------------------------------
revno: 2497.254.4
revision-id: gshchepa@stripped
parent: gshchepa@stripped
parent: davi@stripped
committer: Gleb Shchepa <gshchepa@stripped>
branch nick: mysql-5.1-bugteam
timestamp: Do 2008-06-19 19:26:00 +0500
message:
auto merge
modified:
client/mysqltest.c sp1f-mysqltest.c-20001010065317-ix4zw26srlev7yugcz455ux22zwyynyf
configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
include/my_stacktrace.h sp1f-stacktrace.h-20010513221240-cbiiu5humlsaar4gwejtppmg4trxkj47
mysys/stacktrace.c sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
sql/mysqld.cc sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
------------------------------------------------------------
revno: 2497.255.1
revision-id: davi@stripped
parent: davi@stripped
committer: Davi Arnaut <davi@stripped>
branch nick: 37003-5.1
timestamp: Do 2008-06-19 11:02:32 -0300
message:
Bug#37003 Tests sporadically crashes with embedded server
Another problem is that the backtrace facility wasn't being
enabled for non-Linux targets even if the target OS has the
backtrace functions. Also, the stacktrace functions inside
mysqltest were being used without proper checks for their
presence in the build.
modified:
client/mysqltest.c sp1f-mysqltest.c-20001010065317-ix4zw26srlev7yugcz455ux22zwyynyf
configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
include/my_stacktrace.h sp1f-stacktrace.h-20010513221240-cbiiu5humlsaar4gwejtppmg4trxkj47
mysys/stacktrace.c sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
sql/mysqld.cc sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
------------------------------------------------------------
revno: 2497.254.3
revision-id: gshchepa@stripped
parent: davi@stripped
parent: gshchepa@stripped
committer: Gleb Shchepa <gshchepa@stripped>
branch nick: mysql-5.1-bugteam
timestamp: Do 2008-06-19 18:32:14 +0500
message:
auto merge with local tree (bug #37076)
modified:
mysql-test/extra/rpl_tests/rpl_row_basic.test sp1f-rpl_row_basic.inc-20051222053451-qbja3f3vz3mf5ikwca7eeqkxutnnzlbi
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_ndb/r/rpl_row_basic_7ndb.result sp1f-rpl_row_basic_7ndb.r-20060112185042-qnln6taptlwuulawjqhqz4q3noofqdfa
sql/field.h sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
------------------------------------------------------------
revno: 2497.254.2
revision-id: davi@stripped
parent: davi@stripped
committer: Davi Arnaut <davi@stripped>
branch nick: 37003-5.1
timestamp: Mi 2008-06-18 13:17:15 -0300
message:
Bug#37003 Tests sporadically crashes with embedded server
The problem was that when a embedded linked version of mysqltest
crashed there was no way to obtain a stack trace if no core file
is available. Another problem is that the embedded version of
libmysql was not behaving (crash) the same as the non-embedded with
respect to sending commands to a explicitly closed connection.
The solution is to generate a mysqltest's stack trace on crash
and to enable "reconnect" if the connection handle was explicitly
closed so the behavior matches the non-embedded one.
renamed:
sql/stacktrace.c => mysys/stacktrace.c sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
sql/stacktrace.h => include/my_stacktrace.h sp1f-stacktrace.h-20010513221240-cbiiu5humlsaar4gwejtppmg4trxkj47
modified:
client/CMakeLists.txt sp1f-cmakelists.txt-20060831175236-tdyayhfqw2zme3vhwbn6l2lno4em3u3t
client/Makefile.am sp1f-makefile.am-19700101030959-zpaig4zjwqhmsob3ypilmrcrkq7pu6gf
client/mysqltest.c sp1f-mysqltest.c-20001010065317-ix4zw26srlev7yugcz455ux22zwyynyf
configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
include/Makefile.am sp1f-makefile.am-19700101030959-42ptynoryou25hajenjryzqyuvicbucw
libmysqld/CMakeLists.txt sp1f-cmakelists.txt-20060403082523-x3vxka3k56u2wpzwcrlpykznlz2akpxd
libmysqld/Makefile.am sp1f-makefile.am-20010411110351-26htpk3ynkyh7pkfvnshztqrxx3few4g
libmysqld/lib_sql.cc sp1f-lib_sql.cc-20010411110351-gt5febleap73tqvapkesopvqtuht5sf5
mysql-test/t/sql_low_priority_updates_func.test sp1f-sql_low_priority_upd-20080410131408-eqzq6h4x5mufb23pfu3wucvqrgy7732d
mysys/CMakeLists.txt sp1f-cmakelists.txt-20060831175237-shgpjtu5x7rmyswxjiriviagwnm5kvpd
mysys/Makefile.am sp1f-makefile.am-19700101030959-36zaboyabq4ooqfc2jpion3pic7yhpgb
sql/CMakeLists.txt sp1f-cmakelists.txt-20060831175237-esoeu5kpdtwjvehkghwy6fzbleniq2wy
sql/Makefile.am sp1f-makefile.am-19700101030959-xsjdiakci3nqcdd4xl4yomwdl5eo2f3q
sql/mysqld.cc sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
mysys/stacktrace.c sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
include/my_stacktrace.h sp1f-stacktrace.h-20010513221240-cbiiu5humlsaar4gwejtppmg4trxkj47
------------------------------------------------------------
revno: 2497.254.1
revision-id: davi@stripped
parent: mattiasj@stripped
committer: Davi Arnaut <davi@stripped>
branch nick: 33873-5.1
timestamp: Di 2008-06-17 11:12:21 -0300
message:
Bug#33873: Fast ALTER TABLE doesn't work with multibyte character sets
The problem was that when comparing tables for a possible
fast alter table, the comparison was being performed using
the parsed information and not the final definition.
The solution is to use the possible final table layout to
compare if a fast alter is possible or not.
modified:
mysql-test/include/mix1.inc sp1f-innodb_mysql.test-20060426055153-mgtahdmgajg7vffqbq4xrmkzbhvanlaz
mysql-test/r/alter_table.result sp1f-alter_table.result-20001228015632-hk5kqhiea33uxdjhnqa2vnagoypjqbi3
mysql-test/r/innodb_mysql.result sp1f-innodb_mysql.result-20060426055153-bychbbfnqtvmvrwccwhn24i6yi46uqjv
mysql-test/t/alter_table.test sp1f-alter_table.test-20001228015635-ibytgjjpm4y57rzxqoascmr2hqujnjge
sql/sql_table.cc sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
Attachment: [text/text/x-diff] patch-2677.diff
| Thread |
|---|
| • bzr commit into mysql-6.0 tree (MatthiasLeichmleich:2677) Bug#28309,Bug#33873, Bug#37003 | MatthiasLeichmleich | 20 Jun |
