From: Matthias Leich Date: September 16 2008 1:18pm Subject: bzr commit into mysql-5.1-bugteam tree (Matthias.Leich:2678) Bug#35987, Bug#37098, Bug#37938 List-Archive: http://lists.mysql.com/commits/54201 X-Bug: 37938 Message-Id: <20080916131810.423CDA41A2@five.local.lan> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1272281970923623500==" --===============1272281970923623500== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///work2/5.0/mysql-5.0-bugteam-federated/ ------------------------------------------------------------ revno: 2678 revision-id: matthias.leich@stripped parent: matthias.leich@stripped parent: patrick.crews@stripped committer: Matthias Leich branch nick: mysql-5.0-bugteam-federated timestamp: Di 2008-09-16 15:17:52 +0200 message: Merge actual bugteam tree -> local 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 mysql-test/r/mysqldump.result sp1f-mysqldump.result-20030924111344-ly2xhpckbj53fyoa7kllzxyruwj4cg54 mysql-test/t/mysqldump.test sp1f-mysqldump.test-20030924111344-fh6llfm45dls3uxwugociq3shkpxsxn3 scripts/make_binary_distribution.sh sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy sql/stacktrace.c sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq 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: 2676.1.3 revision-id: patrick.crews@stripped parent: vvaintroub@stripped committer: Patrick Crews 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: 2676.1.2 revision-id: vvaintroub@stripped parent: timothy.smith@stripped committer: Vladislav Vaintroub 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: 2676.1.1 revision-id: timothy.smith@stripped parent: kgeorge@stripped parent: joerg@stripped committer: Timothy Smith 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: 2646.3.7 revision-id: joerg@stripped parent: mysqldev@stripped parent: kgeorge@stripped committer: Joerg Bruehe 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: 2646.3.6 revision-id: mysqldev@stripped parent: kent@kent-amd64-20080829153041-dd726q3aw6yqc6ry author: timothy.smith@stripped committer: mysqldev 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.3.5 revision-id: kent@kent-amd64-20080829153041-dd726q3aw6yqc6ry parent: joerg@stripped committer: Kent Boortz 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: 2646.3.4 revision-id: joerg@stripped parent: timothy.smith@stripped parent: joerg@stripped committer: Joerg Bruehe 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: 2648.3.1 revision-id: joerg@stripped parent: kgeorge@stripped committer: Joerg Bruehe 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.3.3 revision-id: timothy.smith@stripped parent: joerg@stripped parent: gluh@stripped committer: Timothy Smith 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: 2646.3.2 revision-id: joerg@stripped parent: df@stripped parent: joerg@stripped committer: Joerg Bruehe 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.3.1 revision-id: df@stripped parent: kpettersson@stripped committer: Daniel Fischer 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 --===============1272281970923623500== MIME-Version: 1.0 Content-Type: text/text/x-diff; charset="us-ascii"; name="patch-2678.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline === modified file 'configure.in' --- a/configure.in 2008-08-13 10:34:35 +0000 +++ b/configure.in 2008-08-27 14:25:24 +0000 @@ -2810,6 +2810,9 @@ AC_CONFIG_SUBDIRS(innobase) fi + # "innochecksum" is not in the "innobase/" subdirectory, but should be switched + AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$have_innodb" = Xyes]) + case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in *solaris*-i?86-no-yes) if $CC -xildon 2>&1 | grep "illegal option" >/dev/null === modified file 'extra/Makefile.am' --- a/extra/Makefile.am 2007-02-22 15:41:51 +0000 +++ b/extra/Makefile.am 2008-08-25 19:07:41 +0000 @@ -45,7 +45,12 @@ $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ - resolve_stack_dump mysql_waitpid innochecksum + resolve_stack_dump mysql_waitpid +# "innochecksum" should be switched +if BUILD_INNODB_TOOLS +bin_PROGRAMS += innochecksum +endif + noinst_PROGRAMS = charset2html EXTRA_DIST = CMakeLists.txt === modified file 'man/Makefile.am' --- a/man/Makefile.am 2006-12-31 00:02:27 +0000 +++ b/man/Makefile.am 2008-08-25 19:07:41 +0000 @@ -21,5 +21,11 @@ man8_MANS = @man8_files@ EXTRA_DIST = $(man1_MANS) $(man8_MANS) +# 1) not needed in Unix binary packages, +# 2) programs not generated in 5.0: +install-data-hook: + rm -f $(DESTDIR)$(manlibdir)/man1/make_win_* + rm -f $(DESTDIR)$(manlibdir)/man1/ndb_print_* + # Don't update the files from bitkeeper %::SCCS/s.% === modified file 'mysql-test/r/mysqldump.result' --- a/mysql-test/r/mysqldump.result 2008-03-02 18:20:36 +0000 +++ b/mysql-test/r/mysqldump.result 2008-09-15 19:34:39 +0000 @@ -1,3 +1,8 @@ +Bug#37938 - Test "mysqldump" lacks various insert statements +Turn off concurrent inserts to avoid random errors +NOTE: We reset the variable back to saved value at the end of test +SET @OLD_CONCURRENT_INSERT = @@GLOBAL.CONCURRENT_INSERT; +SET @@GLOBAL.CONCURRENT_INSERT = 0; DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3; drop database if exists mysqldump_test_db; drop database if exists db1; @@ -3565,6 +3570,7 @@ -- Dump completed on DATE +SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT; # # End of 5.0 tests # === modified file 'mysql-test/t/mysqldump.test' --- a/mysql-test/t/mysqldump.test 2008-03-02 18:20:36 +0000 +++ b/mysql-test/t/mysqldump.test 2008-09-15 19:34:39 +0000 @@ -5,6 +5,14 @@ # Binlog is required --source include/have_log_bin.inc + +--echo Bug#37938 - Test "mysqldump" lacks various insert statements +--echo Turn off concurrent inserts to avoid random errors +--echo NOTE: We reset the variable back to saved value at the end of test +SET @OLD_CONCURRENT_INSERT = @@GLOBAL.CONCURRENT_INSERT; +SET @@GLOBAL.CONCURRENT_INSERT = 0; + + --disable_warnings DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3; drop database if exists mysqldump_test_db; @@ -1594,6 +1602,10 @@ --replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/ --exec $MYSQL_DUMP test +# We reset concurrent_inserts value to whatever it was at the start of the test +SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT; + + --echo # --echo # End of 5.0 tests --echo # === modified file 'scripts/make_binary_distribution.sh' --- a/scripts/make_binary_distribution.sh 2008-06-27 17:12:42 +0000 +++ b/scripts/make_binary_distribution.sh 2008-08-25 19:07:41 +0000 @@ -272,6 +272,8 @@ if [ -d man ] ; then $CP man/*.1 $BASE/man/man1 $CP man/*.8 $BASE/man/man8 + # In a Unix binary package, these tools and their manuals are not useful + rm -f $BASE/man/man1/make_win_* fi fi @@ -331,6 +333,7 @@ rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh \ $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution \ + $BASE/bin/make_win_* \ $BASE/bin/setsomevars $BASE/support-files/Makefile* \ $BASE/support-files/*.sh === modified file 'sql/stacktrace.c' --- a/sql/stacktrace.c 2008-02-19 11:37:39 +0000 +++ b/sql/stacktrace.c 2008-09-15 12:58:32 +0000 @@ -261,6 +261,7 @@ #else /* __WIN__*/ #include +#include /* Stack tracing on Windows is implemented using Debug Helper library(dbghelp.dll) @@ -349,6 +350,63 @@ exception_ptrs = ep; } + +/* + Get symbol path - semicolon-separated list of directories to search for debug + symbols. We expect PDB in the same directory as corresponding exe or dll, + so the path is build from directories of the loaded modules. If environment + variable _NT_SYMBOL_PATH is set, it's value appended to the symbol search path +*/ +static void get_symbol_path(char *path, size_t size) +{ + HANDLE hSnap; + char *envvar; + + path[0]= '\0'; + /* + Enumerate all modules, and add their directories to the path. + Avoid duplicate entries. + */ + hSnap= CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId()); + if (hSnap != INVALID_HANDLE_VALUE) + { + BOOL ret; + MODULEENTRY32 mod; + mod.dwSize= sizeof(MODULEENTRY32); + for (ret= Module32First(hSnap, &mod); ret; ret= Module32Next(hSnap, &mod)) + { + char *module_dir= mod.szExePath; + char *p= strrchr(module_dir,'\\'); + if (!p) + { + /* + Path separator was not found. Not known to happen, if ever happens, + will indicate current directory. + */ + module_dir[0]= '.'; + p= module_dir + 1; + } + *p++= ';'; + *p= '\0'; + + if (!strstr(path, module_dir)) + { + strncat(path, module_dir, size); + } + } + CloseHandle(hSnap); + } + + /* Add _NT_SYMBOL_PATH, if present. */ + envvar= getenv("_NT_SYMBOL_PATH"); + if(envvar) + { + strncat(path, envvar, size); + } +} + +#define MAX_SYMBOL_PATH 32768 + /* Platform SDK in VS2003 does not have definition for SYMOPT_NO_PROMPTS*/ #ifndef SYMOPT_NO_PROMPTS #define SYMOPT_NO_PROMPTS 0 @@ -365,6 +423,7 @@ int i; CONTEXT context; STACKFRAME64 frame={0}; + static char symbol_path[MAX_SYMBOL_PATH+1]; if(!exception_ptrs || !init_dbghelp_functions()) return; @@ -373,7 +432,8 @@ context = *(exception_ptrs->ContextRecord); /*Initialize symbols.*/ pSymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_NO_PROMPTS|SYMOPT_DEFERRED_LOADS|SYMOPT_DEBUG); - pSymInitialize(hProcess,NULL,TRUE); + get_symbol_path(symbol_path, MAX_SYMBOL_PATH); + pSymInitialize(hProcess, symbol_path, TRUE); /*Prepare stackframe for the first StackWalk64 call*/ frame.AddrFrame.Mode= frame.AddrPC.Mode= frame.AddrStack.Mode= AddrModeFlat; === modified file 'support-files/mysql.spec.sh' --- a/support-files/mysql.spec.sh 2008-03-22 00:43:13 +0000 +++ b/support-files/mysql.spec.sh 2008-08-25 19:07:41 +0000 @@ -591,6 +591,7 @@ %doc %attr(644, root, root) %{_infodir}/mysql.info* +%doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1* %doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1* %doc %attr(644, root, man) %{_mandir}/man1/myisam_ftdump.1* %doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1* @@ -610,6 +611,7 @@ %doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1* %doc %attr(644, root, man) %{_mandir}/man1/perror.1* %doc %attr(644, root, man) %{_mandir}/man1/replace.1* %doc %attr(644, root, man) %{_mandir}/man1/safe_mysqld.1* @@ -617,6 +619,7 @@ %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf %ghost %config(noreplace,missingok) %{_sysconfdir}/mysqlmanager.passwd +%attr(755, root, root) %{_bindir}/innochecksum %attr(755, root, root) %{_bindir}/my_print_defaults %attr(755, root, root) %{_bindir}/myisam_ftdump %attr(755, root, root) %{_bindir}/myisamchk @@ -661,6 +664,7 @@ %attr(755, root, root) %{_bindir}/mysql %attr(755, root, root) %{_bindir}/mysql_find_rows %attr(755, root, root) %{_bindir}/mysql_tableinfo +%attr(755, root, root) %{_bindir}/mysql_upgrade_shell %attr(755, root, root) %{_bindir}/mysql_waitpid %attr(755, root, root) %{_bindir}/mysqlaccess %attr(755, root, root) %{_bindir}/mysqladmin @@ -672,6 +676,8 @@ %doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_find_rows.1* +%doc %attr(644, root, man) %{_mandir}/man1/mysql_tableinfo.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1* @@ -713,6 +719,8 @@ %doc %attr(644, root, man) %{_mandir}/man1/ndb_config.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_desc.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_error_reporter.1* +%doc %attr(644, root, man) %{_mandir}/man1/ndb_mgm.1* +%doc %attr(644, root, man) %{_mandir}/man1/ndb_restore.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_select_all.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_select_count.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_show_tables.1* @@ -724,13 +732,16 @@ %attr(755, root, root) %{_bindir}/ndb_delete_all %attr(755, root, root) %{_bindir}/ndb_drop_index %attr(755, root, root) %{_bindir}/ndb_drop_table +%attr(755, root, root) %{_sbindir}/ndb_cpcd %doc %attr(644, root, man) %{_mandir}/man1/ndb_delete_all.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_index.1* %doc %attr(644, root, man) %{_mandir}/man1/ndb_drop_table.1* +%doc %attr(644, root, man) %{_mandir}/man1/ndb_cpcd.1* %files devel %defattr(-, root, root, 0755) %doc EXCEPTIONS-CLIENT +%doc %attr(644, root, man) %{_mandir}/man1/comp_err.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1* %attr(755, root, root) %{_bindir}/comp_err %attr(755, root, root) %{_bindir}/mysql_config @@ -784,6 +795,18 @@ # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Mon Aug 18 2008 Joerg Bruehe + +- Get rid of the "warning: Installed (but unpackaged) file(s) found:" + Some files were missing: + - Manual "mysqlbug" ("server" subpackage) + - Program "innochecksum" and its manual ("server" subpackage) + - Manuals "mysql_find_rows" + "mysql_tableinfo" ("client" subpackage) + - Script "mysql_upgrade_shell" ("client" subpackage) + - Manual "comp_err" ("devel" subpackage) + - Program "ndb_cpcd" and its manual ("ndb-extra" subpackage) + - Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage) + * Wed Mar 19 2008 Joerg Bruehe - Add the man pages for "ndbd" and "ndb_mgmd". === modified file 'win/create_manifest.js' --- a/win/create_manifest.js 2007-07-25 17:18:12 +0000 +++ b/win/create_manifest.js 2008-08-29 15:30:41 +0000 @@ -31,7 +31,17 @@ var end= supp_version.indexOf("-"); if (end == -1) end= supp_version.length; var app_version= supp_version.substring(0, end); - app_version+= ".0"; + var fourth_element= 0; + if(app_version.match(/[a-z]$/)) { + fourth_element+= (1 + app_version.charCodeAt(end-1) - "a".charCodeAt(0)); + app_version= app_version.substring(0,--end); + } + if(app_version.match(/sp[1-9]$/)) { + fourth_element+= 100*(app_version.charCodeAt(end-1) - "0".charCodeAt(0)); + app_version= app_version.substring(0, end-3); + end-= 3; + } + app_version+= "." + fourth_element; break; case "arch": var app_arch= parts[1]; === modified file 'zlib/gzio.c' --- a/zlib/gzio.c 2006-01-12 14:32:39 +0000 +++ b/zlib/gzio.c 2008-08-13 16:44:05 +0000 @@ -7,10 +7,10 @@ /* @(#) $Id$ */ +#include + #include "zutil.h" -#include - #ifdef NO_DEFLATE /* for compatibility with old definition */ # define NO_GZCOMPRESS #endif --===============1272281970923623500==--