| List: | Commits | « Previous MessageNext Message » | |
| From: | Matthias Leich | Date: | September 3 2008 3:22pm |
| Subject: | bzr push into mysql-5.0 tree (Matthias.Leich:2646 to 2680) Bug#21226, Bug#24176, Bug#27526, Bug#28309, Bug#29738, Bug#30129, Bug#30394, Bug#31605, B... | ||
| View as plain text | |||
------------------------------------------------------------ revno: 2680 revision-id: kgeorge@stripped parent: gshchepa@stripped parent: davi.arnaut@stripped committer: Georgi Kodinov <kgeorge@stripped> branch nick: merge-5.0-bugteam timestamp: Thu 2008-08-28 12:18:35 +0300 message: merge 5.0-main -> 5.0-bugteam ------------------------------------------------------------ revno: 2671.2.1 revision-id: davi.arnaut@stripped parent: gluh@stripped parent: ramil@stripped committer: Davi Arnaut <Davi.Arnaut@stripped> branch nick: mysql-5.0 timestamp: Tue 2008-08-26 15:27:04 -0300 message: Merge of mysql-5.0-bugteam branch. 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/myisam.result sp1f-myisam.result-20010411215653-pgxkk2xg4lh3nxresmfnsuszf5h3nont mysql-test/r/symlink.result sp1f-symlink.result-20010605003810-qspjjr4hwq7gpdhzyictx52ddrlmxaco mysql-test/r/udf.result sp1f-udf.result-20060215161120-pm5l3nyny5gbznc2egfu4bhwgxbuc6wz mysql-test/t/myisam.test sp1f-myisam.test-20010411215653-cdmhjqbeu3xtipkauwbbirystludnac3 mysql-test/t/symlink.test sp1f-symlink.test-20010605003810-7slktyzeszzfljtnmdbque4ow3azjqty mysys/my_symlink.c sp1f-my_symlink.c-20010531091851-nnlz7igptpjfrbgf6sspd6vtv2hv63ab mysys/thr_lock.c sp1f-thr_lock.c-19700101030959-igvxgo25qd7i2moc4pgo5eoth3xp34mh sql/mysql_priv.h sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci sql/mysqld.cc sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj sql/set_var.cc sp1f-set_var.cc-20020723153119-nwbpg2pwpz55pfw7yfzaxt7hsszzy7y3 sql/sql_parse.cc sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd sql/sql_udf.cc sp1f-sql_udf.cc-19700101030959-tk7ysmv4dpwkfhtdovfbqe5i6uvq67ft sql/unireg.h sp1f-unireg.h-19700101030959-6vhptb2vfyo4mcjkgdm3n5uw6u64czfo ------------------------------------------------------------ revno: 2679 revision-id: gshchepa@stripped parent: epotemkin@stripped committer: Gleb Shchepa <gshchepa@stripped> branch nick: mysql-5.0-bugteam timestamp: Thu 2008-08-28 02:10:37 +0500 message: Bug #37799: SELECT with a BIT column in WHERE clause returns unexpected result If: 1. a table has a not nullable BIT column c1 with a length shorter than 8 bits and some additional not nullable columns c2 etc, and 2. the WHERE clause is like: (c1 = constant) AND c2 ..., the SELECT query returns unexpected result set. The server stores BIT columns in a tricky way to save disk space: if column's bit length is not divisible by 8, the server places reminder bits among the null bits at the start of a record. The rest bytes are stored in the record itself, and Field::ptr points to these rest bytes. However if a bit length of the whole column is less than 8, there are no remaining bytes, and there is nothing to store in the record at its regular place. In this case Field::ptr points to bytes actually occupied by the next column in a record. If both columns (BIT and the next column) are NOT NULL, the Field::eq function incorrectly deduces that this is the same column, so query transformation/equal item elimination code (see build_equal_items_for_cond) may mix these columns and damage conditions containing references to them. modified: mysql-test/r/type_bit.result sp1f-type_bit.result-20041217140559-ppf6bkjkl3r4tbmlt7ngn46zm6tapa46 mysql-test/t/type_bit.test sp1f-type_bit.test-20041217140559-tzpygypzmjyjiukpq75swmn6zq4ytqe4 sql/field.h sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp ------------------------------------------------------------ revno: 2678 revision-id: epotemkin@stripped parent: sergefp@stripped committer: Evgeny Potemkin <epotemkin@stripped> branch nick: 38195-bug-5.0-bugteam timestamp: Wed 2008-08-27 17:03:17 +0400 message: Bug#38195: Incorrect handling of aggregate functions when loose index scan is used causes server crash. When the loose index scan access method is used values of aggregated functions are precomputed by it. Aggregation of such functions shouldn't be performed in this case and functions should be treated as normal ones. The create_tmp_table function wasn't taking this into account and this led to a crash if a query has MIN/MAX aggregate functions and employs temporary table and loose index scan. Now the JOIN::exec and the create_tmp_table functions treat MIN/MAX aggregate functions as normal ones when the loose index scan is used. modified: mysql-test/r/group_min_max.result sp1f-group_min_max.result-20040827133611-aqzadxttbw23mkanmvdsiaambv2pcy27 mysql-test/t/group_min_max.test sp1f-group_min_max.test-20040827133612-bbe7hj6l7byvtyxsg4iicylzflsgy6vj sql/sql_select.cc sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb ------------------------------------------------------------ revno: 2677 revision-id: sergefp@stripped parent: ramil@stripped committer: Sergey Petrunia <sergefp@stripped> branch nick: mysql-5.0-bugteam-bug36639 timestamp: Mon 2008-08-25 21:02:54 +0400 message: BUG#36639: subselect.test crashes on 64 bit pentium4 when compiled for valgrind, commit into 5.0 - Use the compiler's default copy constructor for QUICK_RANGE_SELECT. bcopy(this, copy, ...) call caused some odd action on gcc-4.1.2 on x86_64 modified: sql/opt_range.cc sp1f-opt_range.cc-19700101030959-afe3wtevb7zwrg4xyibt35uamov5r7ds sql/opt_range.h sp1f-opt_range.h-19700101030959-c2qbh5kplyvzfgawblxt4md4ubdpxfdy ------------------------------------------------------------ revno: 2676 revision-id: ramil@stripped parent: ramil@stripped committer: Ramil Kalimullin <ramil@stripped> branch nick: mysql-5.0-bugteam timestamp: Tue 2008-08-26 18:51:06 +0500 message: Fix for bug#37277: Potential crash when a spatial index isn't the first key Typo fixed. No test case as we actually don't use rtree_get_first() and rtree_get_next() at present. modified: myisam/rt_index.c sp1f-rt_index.c-20020220101115-g73ue5aednwitjcl3kv42tqfijyn3454 ------------------------------------------------------------ revno: 2675 revision-id: ramil@stripped parent: holyfoot@stripped committer: Ramil Kalimullin <ramil@stripped> branch nick: mysql-5.0-bugteam timestamp: Tue 2008-08-26 18:48:50 +0500 message: Fix for bug #37310: 'on update CURRENT_TIMESTAMP' option crashes the table Problem: data consistency check (maximum record length) for a correct MyISAM table with CHECKSUM=1 and ROW_FORMAT=DYNAMIC option may fail due to wrong inner MyISAM parameter. In result we may have the table marked as 'corrupted'. Fix: properly set MyISAM maximum record length parameter. modified: myisam/mi_create.c sp1f-mi_create.c-19700101030959-i6lazhpsyf7ggr2yjukf6xxybhraxup3 mysql-test/r/myisam.result sp1f-myisam.result-20010411215653-pgxkk2xg4lh3nxresmfnsuszf5h3nont mysql-test/t/myisam.test sp1f-myisam.test-20010411215653-cdmhjqbeu3xtipkauwbbirystludnac3 ------------------------------------------------------------ revno: 2674 revision-id: holyfoot@stripped parent: holyfoot@stripped committer: Alexey Botchkov <holyfoot@stripped> branch nick: 50mrg timestamp: Tue 2008-08-26 14:21:07 +0500 message: merging fixes modified: mysql-test/r/symlink.result sp1f-symlink.result-20010605003810-qspjjr4hwq7gpdhzyictx52ddrlmxaco mysql-test/t/symlink.test sp1f-symlink.test-20010605003810-7slktyzeszzfljtnmdbque4ow3azjqty ------------------------------------------------------------ revno: 2673 revision-id: holyfoot@stripped parent: holyfoot@stripped parent: davi.arnaut@stripped committer: Alexey Botchkov <holyfoot@stripped> branch nick: 50mrg timestamp: Tue 2008-08-26 13:32:43 +0500 message: merging fix modified: myisam/mi_static.c sp1f-mi_static.c-19700101030959-tdmnpz55hlrequ6y4hc3azz6hpxqfv75 mysql-test/r/udf.result sp1f-udf.result-20060215161120-pm5l3nyny5gbznc2egfu4bhwgxbuc6wz mysys/my_symlink.c sp1f-my_symlink.c-20010531091851-nnlz7igptpjfrbgf6sspd6vtv2hv63ab mysys/thr_lock.c sp1f-thr_lock.c-19700101030959-igvxgo25qd7i2moc4pgo5eoth3xp34mh sql/mysql_priv.h sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci sql/mysqld.cc sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj sql/set_var.cc sp1f-set_var.cc-20020723153119-nwbpg2pwpz55pfw7yfzaxt7hsszzy7y3 sql/sql_parse.cc sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd sql/sql_udf.cc sp1f-sql_udf.cc-19700101030959-tk7ysmv4dpwkfhtdovfbqe5i6uvq67ft sql/unireg.h sp1f-unireg.h-19700101030959-6vhptb2vfyo4mcjkgdm3n5uw6u64czfo ------------------------------------------------------------ revno: 2671.1.2 revision-id: davi.arnaut@stripped parent: gluh@stripped committer: Davi Arnaut <Davi.Arnaut@stripped> branch nick: 36579-5.0 timestamp: Mon 2008-08-25 10:18:52 -0300 message: Bug#36579 Dumping information about locks in use may lead to a server crash Dumping information about locks in use by sending a SIGHUP signal to the server or by invoking the "mysqladmin debug" command may lead to a server crash in debug builds or to undefined behavior in production builds. The problem was that a mutex that protects a lock object (THR_LOCK) might have been destroyed before the lock object was actually removed from the list of locks in use, causing a race condition with other threads iterating over the list. The solution is to destroy the mutex only after removing lock object from the list. modified: mysys/thr_lock.c sp1f-thr_lock.c-19700101030959-igvxgo25qd7i2moc4pgo5eoth3xp34mh ------------------------------------------------------------ revno: 2671.1.1 revision-id: gluh@stripped parent: gluh@stripped committer: Sergey Glukhov <gluh@stripped> branch nick: mysql-5.0-bugteam timestamp: Mon 2008-08-25 17:11:59 +0500 message: Bug#37428 Potential security issue with UDFs - linux shellcode execution. plugin_dir option backported from 5.1 modified: mysql-test/r/udf.result sp1f-udf.result-20060215161120-pm5l3nyny5gbznc2egfu4bhwgxbuc6wz sql/mysql_priv.h sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci sql/mysqld.cc sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj sql/set_var.cc sp1f-set_var.cc-20020723153119-nwbpg2pwpz55pfw7yfzaxt7hsszzy7y3 sql/sql_udf.cc sp1f-sql_udf.cc-19700101030959-tk7ysmv4dpwkfhtdovfbqe5i6uvq67ft sql/unireg.h sp1f-unireg.h-19700101030959-6vhptb2vfyo4mcjkgdm3n5uw6u64czfo ------------------------------------------------------------ revno: 2672 revision-id: holyfoot@stripped parent: gluh@stripped committer: Alexey Botchkov <holyfoot@stripped> branch nick: 50mrg timestamp: Fri 2008-08-22 17:31:53 +0500 message: Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. test_if_data_home_dir fixed to look into real path. Checks added to mi_open for symlinks into data home directory. per-file messages: include/my_sys.h Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. my_is_symlink interface added include/myisam.h Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. myisam_test_invalid_symlink interface added myisam/mi_check.c Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. mi_open_datafile calls modified myisam/mi_open.c Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. code added to mi_open to check for symlinks into data home directory. mi_open_datafile now accepts 'original' file path to check if it's an allowed symlink. myisam/mi_static.c Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. myisam_test_invlaid_symlink defined myisam/myisamchk.c Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. mi_open_datafile call modified myisam/myisamdef.h Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. mi_open_datafile interface modified - 'real_path' parameter added mysql-test/r/symlink.test Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. error codes corrected as some patch now rejected pointing inside datahome mysql-test/r/symlink.result Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. error messages corrected in the result mysys/my_symlink.c Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. my_is_symlink() implementsd my_realpath() now returns the 'realpath' even if a file isn't a symlink sql/mysql_priv.h Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. test_if_data_home_dir interface sql/mysqld.cc Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. myisam_test_invalid_symlik set with the 'test_if_data_home_dir' sql/sql_parse.cc Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. error messages corrected test_if_data_home_dir code fixed 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_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 mysql-test/t/symlink.test sp1f-symlink.test-20010605003810-7slktyzeszzfljtnmdbque4ow3azjqty mysys/my_symlink.c sp1f-my_symlink.c-20010531091851-nnlz7igptpjfrbgf6sspd6vtv2hv63ab sql/mysql_priv.h sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci sql/mysqld.cc sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj sql/sql_parse.cc sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd ------------------------------------------------------------ revno: 2671 revision-id: gluh@stripped parent: kgeorge@stripped committer: Sergey Glukhov <gluh@stripped> branch nick: mysql-5.0-bugteam timestamp: Wed 2008-08-20 14:49:28 +0500 message: Bug#38291 memory corruption and server crash with view/sp/function Send_field.org_col_name has broken value on secondary execution. It happens when result field is created from the field which belongs to view due to forgotten assignment of some Send_field attributes. The fix: set Send_field.org_col_name,org_table_name with correct value during Send_field intialization. modified: mysql-test/r/metadata.result sp1f-metadata.result-20040330162426-eqab2um6q6qwnwcnuj5aeikattseomkf mysql-test/r/sp.result sp1f-sp.result-20030117133802-duandg3yzagzyv7zhhbbt2kcomcegpc7 mysql-test/t/sp.test sp1f-sp.test-20030117133803-b6pcfv2yscbqkur5fszep7acmdg7nf5k sql/item.cc sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn tests/mysql_client_test.c sp1f-client_test.c-20020614002636-eqy2zzksgelocknwbbogfuwxfwqy7q5x ------------------------------------------------------------ revno: 2670 revision-id: kgeorge@stripped parent: kgeorge@stripped parent: joerg@stripped committer: Georgi Kodinov <kgeorge@stripped> branch nick: test-5.0-bugteam timestamp: Tue 2008-08-19 14:55:36 +0300 message: merged 5.0-main to 5.0-bugteam 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: 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 sql/ha_innodb.cc sp1f-ha_innobase.cc-20001205235417-rlet3ei56gdrss673dssnrqgug67lwno ------------------------------------------------------------ revno: 2646.2.4 revision-id: joerg@stripped parent: mysqldev@stripped committer: Joerg Bruehe <joerg@stripped> branch nick: mysql-5.0 timestamp: Wed 2008-08-13 12:34:35 +0200 message: Correct the version number to 5.0.70. modified: configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw ------------------------------------------------------------ revno: 2646.2.3 revision-id: mysqldev@stripped parent: timothy.smith@stripped author: timothy.smith@stripped committer: mysqldev <mysqldev@stripped> branch nick: mysql-5.0 timestamp: Wed 2008-08-13 11:05:24 +0200 message: Raise version number after cloning 5.0.68 modified: configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw ------------------------------------------------------------ revno: 2646.2.2 tags: clone-5.0.68-build revision-id: timothy.smith@stripped parent: davi.arnaut@stripped parent: timothy.smith@stripped committer: Timothy Smith <timothy.smith@stripped> branch nick: 50 timestamp: Wed 2008-08-13 00:11:11 -0600 message: Merge some 5.0 innodb changes 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: 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 sql/ha_innodb.cc sp1f-ha_innobase.cc-20001205235417-rlet3ei56gdrss673dssnrqgug67lwno ------------------------------------------------------------ revno: 2648.1.5 revision-id: timothy.smith@stripped parent: timothy.smith@stripped committer: Timothy Smith <timothy.smith@stripped> branch nick: ib-5.0-bugteam timestamp: Thu 2008-08-07 18:25:24 -0600 message: Cherry-pick fix for Bug#35220 from innodb-5.0-ss2475 snapshot. Bug#35220: ALTER TABLE too picky on reserved word "foreign" In ALTER TABLE, change the internal parser to search for ``FOREIGN[[:space:]]'' instead of only ``FOREIGN'' when parsing ALTER TABLE ... DROP FOREIGN KEY ...; otherwise it could be mistaken with ALTER TABLE ... DROP foreign_col; (This fix is already present in MySQL 5.1 and higher.) added: mysql-test/r/innodb_bug35220.result innodb_bug35220.resu-20080808002154-8ndjebe0ousvoomb-2 mysql-test/t/innodb_bug35220.test innodb_bug35220.test-20080808002154-8ndjebe0ousvoomb-1 modified: innobase/dict/dict0dict.c sp1f-dict0dict.c-20010217121859-dhmp6wllhccos4vvwyuqz5dmuctjxgmm ------------------------------------------------------------ revno: 2648.1.4 revision-id: timothy.smith@stripped parent: kgeorge@stripped committer: Timothy Smith <timothy.smith@stripped> branch nick: ib-5.0-bugteam timestamp: Thu 2008-07-31 15:47:57 -0600 message: Cherry-pick InnoDB fixes for Bug#34286, Bug#35352, and Bug#36600 from snapshot innodb-5.0-ss2475. Bug #34286 Assertion failure in thread 2816 in file .\row\row0sel.c line 3500 Since autoinc init performs a MySQL SELECT query to determine the auto-inc value, set prebuilt->sql_stat_start = TRUE so that it is performed like any normal SELECT, regardless of the context in which it was invoked. Bug #35352 If InnoDB crashes with UNDO slots full error the error persists on restart We've added a heuristic that checks the size of the UNDO slots cache lists (insert and upate). If either of cached lists has more than 500 entries then we add any UNDO slots that are freed, to the common free list instead of the cache list, this is to avoid the case where all the free slots end up in only one of the lists on startup after a crash. Tested with test case for 26590 and passes all mysql-test(s). Bug #36600 SHOW STATUS takes a lot of CPU in buf_get_latched_pages_number Fixed by removing the Innodb_buffer_pool_pages_latched variable from SHOW STATUS output in non-UNIV_DEBUG compilation. added: mysql-test/r/innodb-autoinc-optimize.result innodbautoincoptimiz-20080731195133-3r5roqkhjy8tnp3r-1 mysql-test/t/innodb-autoinc-optimize.test innodbautoincoptimiz-20080731195133-3r5roqkhjy8tnp3r-2 modified: innobase/buf/buf0buf.c sp1f-buf0buf.c-20010217121858-zsvjkxdlbzvmglvi56wvmv7ze3f7nzda 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 sql/ha_innodb.cc sp1f-ha_innobase.cc-20001205235417-rlet3ei56gdrss673dssnrqgug67lwno ------------------------------------------------------------ revno: 2669 revision-id: kgeorge@stripped parent: chad@stripped committer: Georgi Kodinov <kgeorge@stripped> branch nick: test-5.0-bugteam timestamp: Tue 2008-08-19 13:36:24 +0300 message: Bug#38195: Incorrect handling of aggregate functions when loose index scan is used causes server crash. Revert the fix : unstable test case revealed by pushbuild modified: mysql-test/r/group_min_max.result sp1f-group_min_max.result-20040827133611-aqzadxttbw23mkanmvdsiaambv2pcy27 mysql-test/t/group_min_max.test sp1f-group_min_max.test-20040827133612-bbe7hj6l7byvtyxsg4iicylzflsgy6vj sql/sql_select.cc sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb ------------------------------------------------------------ revno: 2668 revision-id: chad@stripped parent: chad@stripped committer: Chad MILLER <chad@stripped> branch nick: mysql-5.0-bugteam timestamp: Mon 2008-08-18 13:28:46 -0400 message: Bug#27526: BUILD/check_cpu misbehaving on Debian testing more clever gcc version checking. modified: BUILD/check-cpu sp1f-checkcpu-20050427105035-uyuek6wv2z7qfr6kn4agmmury46u3vqo ------------------------------------------------------------ revno: 2667 revision-id: chad@stripped parent: chad@stripped parent: chad@stripped committer: Chad MILLER <chad@stripped> branch nick: mysql-5.0-bugteam timestamp: Mon 2008-08-18 13:23:05 -0400 message: Merge from 5.0-bugteam trunk. modified: 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 ------------------------------------------------------------ revno: 2665.1.1 revision-id: chad@stripped parent: chad@stripped parent: chad@stripped committer: Chad MILLER <chad@stripped> branch nick: 5.0-bugteam timestamp: Mon 2008-08-18 11:00:19 -0400 message: Merge from 5.0-bugteam local. modified: 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 ------------------------------------------------------------ revno: 2648.2.1 revision-id: chad@stripped parent: igor@stripped committer: Chad MILLER <chad@stripped> branch nick: mysql-5.0-bugteam--bug30129 timestamp: Wed 2008-08-06 09:25:03 -0400 message: Bug#30129: mysql_install_db appears to run normally, but the databases \ are not created {Netware} The init and test sql files were not created at cross-compilation time. Now, make them in the default build rule. Additionally, remove the "fix" SQL instructions, which are unnecessary for newly initialized databases. Also, clean up the english in an error message, and BZRify nwbootstrap. modified: 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 ------------------------------------------------------------ revno: 2666 revision-id: chad@stripped parent: chad@stripped committer: Chad MILLER <chad@stripped> branch nick: mysql-5.0-bugteam timestamp: Mon 2008-08-18 13:06:27 -0400 message: Bug#30394: Empty HOME environment variable causes several utilities to crash Tilde expansion could fail when it was to expand to an empty string (such as when HOME is set to an empty string), especially on systems where size_t is unsigned. modified: mysys/mf_pack.c sp1f-mf_pack.c-19700101030959-u7bzjnr4w3idabvny244w5gzcf33butm ------------------------------------------------------------ revno: 2665 revision-id: chad@stripped parent: chad@stripped committer: Chad MILLER <chad@stripped> branch nick: mysql-5.0-bugteam timestamp: Fri 2008-08-15 16:13:27 -0400 message: Bug#37301 Length and Max_length differ with no obvious reason(2nd version) Length value is the length of the field, Max_length is the length of the field value. So Max_length can not be more than Length. The fix: fixed calculation of the Item_empty_string item length (Patch applied and queued on demand of Trudy/Davi.) modified: 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/t/show_check.test sp1f-show_check.test-20001228015637-uv35wm2ryvpkyrr6ojhmi2nq6x6jgdod sql/item.h sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa sql/sql_show.cc sp1f-sql_show.cc-19700101030959-umlljfnpplg452h7reeyqr4xnbmlkvfj tests/mysql_client_test.c sp1f-client_test.c-20020614002636-eqy2zzksgelocknwbbogfuwxfwqy7q5x ------------------------------------------------------------ revno: 2664 revision-id: chad@stripped parent: chad@stripped committer: Chad MILLER <chad@stripped> branch nick: mysql-5.0-bugteam timestamp: Fri 2008-08-15 15:46:21 -0400 message: Bug#36270: incorrect calculation result - works in 4.1 but not in 5.0 or 5.1 When the fractional part in a multiplication of DECIMALs overflowed, we truncated the first operand rather than the longest. Now truncating least significant places instead for more precise multiplications. (Queuing at demand of Trudy/Davi.) modified: mysql-test/r/type_newdecimal.result sp1f-type_newdecimal.resu-20050208224936-kj6dxol5i7zbbfohybib53ffje5i63mk mysql-test/t/type_newdecimal.test sp1f-type_newdecimal.test-20050208224936-e244l5ugrk3oditjqp53n6izptkrteq2 strings/decimal.c sp1f-decimal.c-20041018120639-qqm4oeadwhbdhuxgwlc657il4tu44n6m ------------------------------------------------------------ revno: 2663 revision-id: chad@stripped parent: ramil@stripped committer: Chad MILLER <chad@stripped> branch nick: mysql-5.0-bugteam timestamp: Fri 2008-08-15 13:55:05 -0400 message: Correcting tree name in bzr config. Should not include team suffix. modified: .bzr-mysql/default.conf default.conf-20080521211852-kry0hytlir1epmpv-2 ------------------------------------------------------------ revno: 2662 revision-id: ramil@stripped parent: epotemkin@stripped committer: Ramil Kalimullin <ramil@stripped> branch nick: mysql-5.0-bugteam timestamp: Fri 2008-08-15 11:40:05 +0500 message: Fix for bug #34779: crash in checksum table on federated tables with blobs containing nulls Problem: FEDERATED SE improperly stores NULL fields in the record buffer. Fix: store them properly. modified: mysql-test/r/federated.result sp1f-federated.result-20041211200117-zbuxe4bh3vyrane2ehku7szsgbfbhkvd mysql-test/t/federated.test sp1f-federated.test-20041211200119-aht6hujozcouca6joz5eaiq55jk6psb5 sql/ha_federated.cc sp1f-ha_federated.cc-20041211200120-gu52ex5sicbua5vtoocuki3ltllsvm2c ------------------------------------------------------------ revno: 2661 revision-id: epotemkin@stripped parent: epotemkin@stripped committer: Evgeny Potemkin <epotemkin@stripped> branch nick: 38195-bug-5.0-bugteam timestamp: Thu 2008-08-14 23:55:18 +0400 message: Fixed failing test case for the bug#38195. modified: mysql-test/r/group_min_max.result sp1f-group_min_max.result-20040827133611-aqzadxttbw23mkanmvdsiaambv2pcy27 mysql-test/t/group_min_max.test sp1f-group_min_max.test-20040827133612-bbe7hj6l7byvtyxsg4iicylzflsgy6vj ------------------------------------------------------------ revno: 2660 revision-id: epotemkin@stripped parent: davi.arnaut@stripped committer: Evgeny Potemkin <epotemkin@stripped> branch nick: 38195-bug-5.0-bugteam timestamp: Wed 2008-08-13 22:24:55 +0400 message: Bug#38195: Incorrect handling of aggregate functions when loose index scan is used causes server crash. When the loose index scan access method is used values of aggregated functions are precomputed by it. Aggregation of such functions shouldn't be performed in this case and functions should be treated as normal ones. The create_tmp_table function wasn't taking this into account and this led to a crash if a query has MIN/MAX aggregate functions and employs temporary table and loose index scan. Now the JOIN::exec and the create_tmp_table functions treat MIN/MAX aggregate functions as normal ones when the loose index scan is used. modified: mysql-test/r/group_min_max.result sp1f-group_min_max.result-20040827133611-aqzadxttbw23mkanmvdsiaambv2pcy27 mysql-test/t/group_min_max.test sp1f-group_min_max.test-20040827133612-bbe7hj6l7byvtyxsg4iicylzflsgy6vj sql/sql_select.cc sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb ------------------------------------------------------------ revno: 2659 revision-id: davi.arnaut@stripped parent: davi.arnaut@stripped parent: davi.arnaut@stripped committer: Davi Arnaut <Davi.Arnaut@stripped> branch nick: mysql-5.0-bugteam timestamp: Tue 2008-08-12 16:52:52 -0300 message: Merge and fix tree name. modified: .bzr-mysql/default.conf default.conf-20080521211852-kry0hytlir1epmpv-2 ------------------------------------------------------------ revno: 2646.2.1 revision-id: davi.arnaut@stripped parent: kpettersson@stripped parent: davi.arnaut@stripped committer: Davi Arnaut <Davi.Arnaut@stripped> branch nick: mysql-5.0 timestamp: Tue 2008-08-12 15:51:00 -0300 message: Merge mysql-5.0-bugteam into mysql-5.0 modified: client/mysql_upgrade.c sp1f-mysql_upgrade.c-20060428040559-3xcugp4nhhb6qfwfacoqw3d4ibgbeboz 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/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: 2658 revision-id: davi.arnaut@stripped parent: marc.alff@stripped committer: Davi Arnaut <Davi.Arnaut@stripped> branch nick: mysql-5.0-bugteam timestamp: Mon 2008-08-11 20:27:09 -0300 message: Bug#38486: Crash when using cursor protocol Post-merge fix: mysql_client_test.c is compiled by C compilers and some C compilers don't support mixed declarations and code and it's explicitly forbidden by ISO C90. modified: tests/mysql_client_test.c sp1f-client_test.c-20020614002636-eqy2zzksgelocknwbbogfuwxfwqy7q5x ------------------------------------------------------------ revno: 2657 revision-id: marc.alff@stripped parent: marc.alff@stripped parent: marc.alff@stripped committer: Marc Alff <marc.alff@stripped> branch nick: mysql-5.0-38296 timestamp: Mon 2008-08-11 15:21:29 -0600 message: Merge mysql-5.0-bugteam -> local bugfix branch modified: client/mysql_upgrade.c sp1f-mysql_upgrade.c-20060428040559-3xcugp4nhhb6qfwfacoqw3d4ibgbeboz mysys/mf_keycache.c sp1f-mf_keycache.c-19700101030959-wtigyxt4n6zscc6ezr56wziqguyc5bds sql/sql_cursor.cc sp1f-sql_cursor.cc-20050921221059-bbaoove6aneee3jlqberlbdxsq7k3qrl tests/mysql_client_test.c sp1f-client_test.c-20020614002636-eqy2zzksgelocknwbbogfuwxfwqy7q5x ------------------------------------------------------------ revno: 2655.1.3 revision-id: marc.alff@stripped parent: chad@stripped committer: Marc Alff <marc.alff@stripped> branch nick: mysql-5.0-37302 timestamp: Mon 2008-08-11 15:08:12 -0600 message: Bug#37302 (missing DBUG_RETURN macro in function "find_key_block" (5.0 only)) Fixed missing DBUG_RETURN in the function find_key_block modified: mysys/mf_keycache.c sp1f-mf_keycache.c-19700101030959-wtigyxt4n6zscc6ezr56wziqguyc5bds ------------------------------------------------------------ revno: 2655.1.2 revision-id: chad@stripped parent: chad@stripped parent: davi.arnaut@stripped committer: Chad MILLER <chad@stripped> branch nick: mysql-5.0-bugteam timestamp: Mon 2008-08-11 13:56:54 -0400 message: Merge from bugteam 5.0 trunk. modified: sql/sql_cursor.cc sp1f-sql_cursor.cc-20050921221059-bbaoove6aneee3jlqberlbdxsq7k3qrl tests/mysql_client_test.c sp1f-client_test.c-20020614002636-eqy2zzksgelocknwbbogfuwxfwqy7q5x ------------------------------------------------------------ revno: 2655.2.2 revision-id: davi.arnaut@stripped parent: kpettersson@stripped committer: Davi Arnaut <Davi.Arnaut@stripped> branch nick: mysql-5.0-bugteam timestamp: Mon 2008-08-11 10:08:21 -0300 message: Post-merge fix: Silence warning due to type mismatch. modified: client/mysql_upgrade.c sp1f-mysql_upgrade.c-20060428040559-3xcugp4nhhb6qfwfacoqw3d4ibgbeboz ------------------------------------------------------------ revno: 2655.2.1 revision-id: kpettersson@stripped parent: chad@stripped parent: kpettersson@stripped committer: Kristofer Pettersson <kpettersson@stripped> branch nick: mysql-5.0-bugteam timestamp: Mon 2008-08-11 13:00:48 +0200 message: Automerge modified: sql/sql_cursor.cc sp1f-sql_cursor.cc-20050921221059-bbaoove6aneee3jlqberlbdxsq7k3qrl tests/mysql_client_test.c sp1f-client_test.c-20020614002636-eqy2zzksgelocknwbbogfuwxfwqy7q5x ------------------------------------------------------------ revno: 2651.1.1 revision-id: kpettersson@stripped parent: kpettersson@stripped committer: Kristofer Pettersson <kpettersson@stripped> branch nick: mysql-5.0-bugteam-bug24176 timestamp: Mon 2008-08-11 11:40:54 +0200 message: Bug#38486 Crash when using cursor protocol Server side cursors were not initialized properly and this caused a reference to uninitialized memory. modified: sql/sql_cursor.cc sp1f-sql_cursor.cc-20050921221059-bbaoove6aneee3jlqberlbdxsq7k3qrl tests/mysql_client_test.c sp1f-client_test.c-20020614002636-eqy2zzksgelocknwbbogfuwxfwqy7q5x ------------------------------------------------------------ revno: 2655.1.1 revision-id: chad@stripped parent: chad@stripped committer: Chad MILLER <chad@stripped> branch nick: mysql-5.0-bugteam timestamp: Mon 2008-08-11 11:28:35 -0400 message: Backport compiler warning fix from 5.1-bugteam. modified: client/mysql_upgrade.c sp1f-mysql_upgrade.c-20060428040559-3xcugp4nhhb6qfwfacoqw3d4ibgbeboz ------------------------------------------------------------ revno: 2656 revision-id: marc.alff@stripped parent: chad@stripped committer: Marc Alff <marc.alff@stripped> branch nick: mysql-5.0-38296 timestamp: Mon 2008-08-11 10:10:00 -0600 message: Bug#38296 (low memory crash with many conditions in a query) This fix is for 5.0 only : back porting the 6.0 patch manually The parser code in sql/sql_yacc.yy needs to be more robust to out of memory conditions, so that when parsing a query fails due to OOM, the thread gracefully returns an error. Before this fix, a new/alloc returning NULL could: - cause a crash, if dereferencing the NULL pointer, - produce a corrupted parsed tree, containing NULL nodes, - alter the semantic of a query, by silently dropping token values or nodes With this fix: - C++ constructors are *not* executed with a NULL "this" pointer when operator new fails. This is achieved by declaring "operator new" with a "throw ()" clause, so that a failed new gracefully returns NULL on OOM conditions. - calls to new/alloc are tested for a NULL result, - The thread diagnostic area is set to an error status when OOM occurs. This ensures that a request failing in the server properly returns an ER_OUT_OF_RESOURCES error to the client. - OOM conditions cause the parser to stop immediately (MYSQL_YYABORT). This prevents causing further crashes when using a partially built parsed tree in further rules in the parser. No test scripts are provided, since automating OOM failures is not instrumented in the server. Tested under the debugger, to verify that an error in alloc_root cause the thread to returns gracefully all the way to the client application, with an ER_OUT_OF_RESOURCES error. modified: mysys/my_alloc.c sp1f-my_alloc.c-19700101030959-2elyak7fz3lr6z6agqmrqfm3zhgayb4x sql/field.h sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp sql/item.h sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa sql/sp_head.cc sp1f-sp_head.cc-20021208185920-jtgc5wvyqdnu2gvcdus3gazrfhxbofxd sql/sql_lex.h sp1f-sql_lex.h-19700101030959-sgldb2sooc7twtw5q7pgjx7qzqiaa3sn sql/sql_list.h sp1f-sql_list.h-19700101030959-hyddr5nvvtrgbk7llgnah4i4bf6ugspn 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 ------------------------------------------------------------ revno: 2655 revision-id: chad@stripped parent: chad@stripped committer: Chad MILLER <chad@stripped> branch nick: mysql-5.0-bugteam--bug31605 timestamp: Thu 2008-08-07 12:24:39 -0400 message: Bug#31605: mysql_upgrade relies on Linux /proc filesystem when not \ running on Windows We used two OS-specific methods of looking up the executable name, which don't work outside of those two kinds of OSes (Linux+Solaris and Windows). We assume that if the user ran this program with a certain name, we can run the other sibling programs with a similar name. (re-patch in bzr) modified: client/mysql_upgrade.c sp1f-mysql_upgrade.c-20060428040559-3xcugp4nhhb6qfwfacoqw3d4ibgbeboz ------------------------------------------------------------ revno: 2654 revision-id: chad@stripped parent: chad@stripped committer: Chad MILLER <chad@stripped> branch nick: mysql-5.0-bugteam timestamp: Wed 2008-08-06 16:25:25 -0400 message: Bug#37201: make tags doesn't work in bazaar server trees Fall back to "find" if bzr is unavailable. Don't fail for paths that have spaces in them. modified: support-files/build-tags sp1f-buildtags-20020120021651-m24xl4ywynpwgh3jn7hgrhntp5i6doq7 ------------------------------------------------------------ revno: 2653 revision-id: chad@stripped parent: kpettersson@stripped committer: Chad MILLER <chad@stripped> branch nick: mysql-5.0-bugteam timestamp: Wed 2008-08-06 15:27:28 -0400 message: Bug#37201: make tags doesn't work in bazaar server trees bk sfiles -> bzr ls modified: support-files/build-tags sp1f-buildtags-20020120021651-m24xl4ywynpwgh3jn7hgrhntp5i6doq7 ------------------------------------------------------------ revno: 2652 revision-id: kpettersson@stripped parent: kpettersson@stripped parent: kgeorge@stripped committer: Kristofer Pettersson <kpettersson@stripped> branch nick: mysql-5.0-bugteam timestamp: Mon 2008-08-04 14:37:28 +0200 message: automerge modified: mysql-test/r/func_if.result sp1f-func_if.result-20020422204140-g35vcmdj5gsz4cilvxrzqnuipiwjknxl 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/subselect.test sp1f-subselect.test-20020512204640-lyqrayx6uwsn7zih6y7kerkenuitzbvr scripts/mysql_system_tables.sql sp1f-mysql_system_tables.-20070226104923-4n5a67fuifobcyhhicfbacpsv5npohgv sql/item.cc sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn sql/item_cmpfunc.cc sp1f-item_cmpfunc.cc-19700101030959-hrk7pi2n6qpwxauufnkizirsoucdcx2e sql/item_func.cc sp1f-item_func.cc-19700101030959-3wmsx76yvc25sroqpfrx2n77kqdxxn3y sql/sql_select.cc sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb ------------------------------------------------------------ revno: 2648.1.3 revision-id: kgeorge@stripped parent: kgeorge@stripped committer: Georgi Kodinov <kgeorge@stripped> branch nick: B37662-5.0-bugteam timestamp: Thu 2008-07-31 12:28:04 +0300 message: Bug#34159: mysql_install_db fails with sql_mode=TRADITIONAL Reset session sql_mode before creating system tables as it is done in the mysql_fix_privilege_tables.sql script. modified: scripts/mysql_system_tables.sql sp1f-mysql_system_tables.-20070226104923-4n5a67fuifobcyhhicfbacpsv5npohgv ------------------------------------------------------------ revno: 2648.1.2 revision-id: kgeorge@stripped parent: igor@stripped committer: Georgi Kodinov <kgeorge@stripped> branch nick: B37662-5.0-bugteam timestamp: Wed 2008-07-30 14:07:37 +0300 message: Bug#37662 nested if() inside sum() is parsed in exponential time min() and max() functions are implemented in MySQL as macros. This means that max(a,b) is expanded to: ((a) > (b) ? (a) : (b)) Note how 'a' is quoted two times. Now imagine 'a' is a recursive function call that's several 10s of levels deep. And the recursive function does max() with a function arg as well to dive into recursion. This means that simple function call can take most of the clock time. Identified and fixed several such calls to max()/min() : including the IF() sql function implementation. modified: mysql-test/r/func_if.result sp1f-func_if.result-20020422204140-g35vcmdj5gsz4cilvxrzqnuipiwjknxl mysql-test/t/func_if.test sp1f-func_if.test-20020422204141-q7i5g4jckjd6a5k66ybo2si2cvk3wbfl sql/item.cc sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn sql/item_cmpfunc.cc sp1f-item_cmpfunc.cc-19700101030959-hrk7pi2n6qpwxauufnkizirsoucdcx2e sql/item_func.cc sp1f-item_func.cc-19700101030959-3wmsx76yvc25sroqpfrx2n77kqdxxn3y ------------------------------------------------------------ revno: 2648.1.1 revision-id: igor@stripped parent: davi.arnaut@stripped parent: igor@stripped committer: Igor Babaev <igor@stripped> branch nick: mysql-5.0-bugteam timestamp: Mon 2008-07-28 01:24:56 -0700 message: Merge modified: mysql-test/r/subselect.result sp1f-subselect.result-20020512204640-zgegcsgavnfd7t7eyrf7ibuqomsw7uzo mysql-test/t/subselect.test sp1f-subselect.test-20020512204640-lyqrayx6uwsn7zih6y7kerkenuitzbvr sql/sql_select.cc sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb ------------------------------------------------------------ revno: 2646.1.1 revision-id: igor@stripped parent: kpettersson@stripped committer: Igor Babaev <igor@stripped> branch nick: mysql-5.0-bug38191 timestamp: Sat 2008-07-26 13:44:07 -0700 message: Fixed bug #38191. Calling List<Cached_item>::delete_elements for the same list twice caused a crash of the server in the function JOIN::cleaunup. Ensured that delete_elements() in JOIN::cleanup would be called only once. modified: mysql-test/r/subselect.result sp1f-subselect.result-20020512204640-zgegcsgavnfd7t7eyrf7ibuqomsw7uzo mysql-test/t/subselect.test sp1f-subselect.test-20020512204640-lyqrayx6uwsn7zih6y7kerkenuitzbvr sql/sql_select.cc sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb ------------------------------------------------------------ revno: 2651 revision-id: kpettersson@stripped parent: kpettersson@stripped committer: Kristofer Pettersson <kpettersson@stripped> branch nick: mysql-5.0-bugteam timestamp: Tue 2008-07-29 15:58:15 +0200 message: Bug#29738 Error message not properly translated to Serbian Community contribution fix for Serbian translation in error message list. modified: sql/share/errmsg.txt sp1f-errmsg.txt-20041213212820-do5w642w224ja7ctyqhyl6iihdmpkzv5 ------------------------------------------------------------ revno: 2650 revision-id: kpettersson@stripped parent: kpettersson@stripped committer: Kristofer Pettersson <kpettersson@stripped> branch nick: mysql-5.0-bugteam timestamp: Tue 2008-07-29 15:37:09 +0200 message: Bug#37781 mysql_drop_user calls get_current_user() twice for no reason Fixed typo and removed duplicate call to get_current_user. modified: sql/sql_acl.cc sp1f-sql_acl.cc-19700101030959-c4hku3uqxzujthqnndeprbrhamqy6a4i ------------------------------------------------------------ revno: 2649 revision-id: kpettersson@stripped parent: davi.arnaut@stripped parent: kpettersson@stripped committer: Kristofer Pettersson <kpettersson@stripped> branch nick: mysql-5.0-bugteam timestamp: Tue 2008-07-29 15:15:04 +0200 message: auto merge modified: sql/sql_parse.cc sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd ------------------------------------------------------------ revno: 2631.6.1 revision-id: kpettersson@stripped parent: joerg@stripped committer: Kristofer Pettersson <kpettersson@stripped> branch nick: mysql-5.0-bug21226 timestamp: Wed 2008-06-18 21:09:30 +0200 message: Bug#21226 FLUSH PRIVILEGES does not provided feedback when it fails. If during a FLUSH PRIVILEGES the server fails to load the new privilege tables, the error message is lost. This patch is a back port from 5.1 which adresses this issue by setting the server in an error state if a failure occurrs. This patch also corrects an incorrect variable assignment which might cause an error state to be reverted by coincidence. modified: sql/sql_parse.cc sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd ------------------------------------------------------------ revno: 2648 revision-id: davi.arnaut@stripped parent: kgeorge@stripped committer: Davi Arnaut <Davi.Arnaut@stripped> branch nick: 33362-5.0 timestamp: Thu 2008-07-24 11:14:34 -0300 message: Cherry-pick Bug#33362 from mysql-5.1 modified: mysql-test/r/query_cache_merge.result sp1f-query_cache_merge.re-20030822010738-2zakbz2cym5ituizcsbijndpnajh4fkl mysql-test/t/query_cache_merge.test sp1f-query_cache_merge.te-20030822010739-lp5enqy5wop4adawh4eqs4zefcihl7pr sql/sql_cache.cc sp1f-sql_cache.cc-19700101030959-74bsqwcnhboovijsogcenqana5inu6wo ------------------------------------------------------------ revno: 2647 revision-id: kgeorge@stripped parent: kpettersson@stripped committer: Georgi Kodinov <kgeorge@stripped> branch nick: B37830-5.0-bugteam timestamp: Wed 2008-07-23 14:25:00 +0300 message: Bug#37830 : ORDER BY ASC/DESC - no difference Range scan in descending order for c <= <col> <= c type of ranges was ignoring the DESC flag. However some engines like InnoDB have the primary key parts as a suffix for every secondary key. When such primary key suffix is used for ordering ignoring the DESC is not valid. But we generally would like to do this because it's faster. Fixed by performing only reverse scan if the primary key is used. Removed some dead code in the process. modified: mysql-test/r/innodb_mysql.result sp1f-innodb_mysql.result-20060426055153-bychbbfnqtvmvrwccwhn24i6yi46uqjv mysql-test/t/innodb_mysql.test sp1f-innodb_mysql.test-20060426055153-mgtahdmgajg7vffqbq4xrmkzbhvanlaz sql/opt_range.cc sp1f-opt_range.cc-19700101030959-afe3wtevb7zwrg4xyibt35uamov5r7ds sql/opt_range.h sp1f-opt_range.h-19700101030959-c2qbh5kplyvzfgawblxt4md4ubdpxfdy sql/sql_select.cc sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb ------------------------------------------------------------ revno: 2646 revision-id: kpettersson@stripped parent: kpettersson@stripped parent: timothy.smith@stripped committer: Kristofer Pettersson <kpettersson@stripped> branch nick: mysql-5.0-bugteam timestamp: Tue 2008-07-22 12:55:15 +0200 message: merge 5.0->5.0-bugteam modified: configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw include/my_sys.h sp1f-my_sys.h-19700101030959-lyllvna5vzqfcjnmlcrutgqocylhtb54 mysys/default.c sp1f-default.c-19700101030959-yapqvlw42xojx5avf7fykpwrwpf3yvtz mysys/mf_pack.c sp1f-mf_pack.c-19700101030959-u7bzjnr4w3idabvny244w5gzcf33butm scripts/make_binary_distribution.sh sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy ------------------------------------------------------------ revno: 2631.1.12 revision-id: timothy.smith@stripped parent: timothy.smith@stripped parent: mysqldev@stripped committer: Timothy Smith <timothy.smith@stripped> branch nick: 5.0-build timestamp: Sun 2008-07-20 21:59:47 -0600 message: Merge latest changes from 5.0-build ------------------------------------------------------------ revno: 2631.5.1 revision-id: mysqldev@stripped parent: mysqldev@stripped parent: kgeorge@stripped author: kent@stripped committer: mysqldev <mysqldev@stripped> branch nick: mysql-5.0-build timestamp: Sat 2008-07-19 02:52:13 +0200 message: Merge from mysql-5.0.66-release modified: mysys/default.c sp1f-default.c-19700101030959-yapqvlw42xojx5avf7fykpwrwpf3yvtz ------------------------------------------------------------ revno: 2631.1.11 revision-id: timothy.smith@stripped parent: mysqldev@stripped parent: timothy.smith@stripped committer: Timothy Smith <timothy.smith@stripped> branch nick: 5.0-build timestamp: Fri 2008-07-18 21:46:03 -0600 message: Merge 5.0.66a-release changes modified: include/my_sys.h sp1f-my_sys.h-19700101030959-lyllvna5vzqfcjnmlcrutgqocylhtb54 mysys/default.c sp1f-default.c-19700101030959-yapqvlw42xojx5avf7fykpwrwpf3yvtz mysys/mf_pack.c sp1f-mf_pack.c-19700101030959-u7bzjnr4w3idabvny244w5gzcf33butm ------------------------------------------------------------ revno: 2639.9.1 revision-id: timothy.smith@stripped parent: gshchepa@stripped parent: mysqldev@stripped committer: Timothy Smith <timothy.smith@stripped> branch nick: 5.0 timestamp: Thu 2008-07-17 11:08:49 -0600 message: Merge in changes from mysql-5.0.66a-release into 5.0. Includes fix for Bug #38180, "options are read from ~/my.cnf instead of ~/.my.cnf" modified: include/my_sys.h sp1f-my_sys.h-19700101030959-lyllvna5vzqfcjnmlcrutgqocylhtb54 mysys/default.c sp1f-default.c-19700101030959-yapqvlw42xojx5avf7fykpwrwpf3yvtz mysys/mf_pack.c sp1f-mf_pack.c-19700101030959-u7bzjnr4w3idabvny244w5gzcf33butm ------------------------------------------------------------ revno: 2631.4.4 revision-id: mysqldev@stripped parent: timothy.smith@stripped author: kent.boortz@stripped committer: mysqldev <mysqldev@stripped> branch nick: mysql-5.0.66a-release timestamp: Thu 2008-07-17 01:33:45 +0200 message: Set version to 5.0.66a modified: configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw ------------------------------------------------------------ revno: 2631.4.3 revision-id: timothy.smith@stripped parent: kgeorge@stripped committer: Timothy Smith <timothy.smith@stripped> branch nick: 5.0.66-bug38180 timestamp: Wed 2008-07-16 16:58:45 -0600 message: Bug #38180 options are read from ~/my.cnf instead of ~/.my.cnf Pull out some of unpack_dirname() into normalize_dirname(); this new function does not expand "~" to the home directory. Use this function in unpack_dirname(), and use it during init_default_directories() to remove duplicate entries without losing track of which directory is a user's home dir. modified: include/my_sys.h sp1f-my_sys.h-19700101030959-lyllvna5vzqfcjnmlcrutgqocylhtb54 mysys/default.c sp1f-default.c-19700101030959-yapqvlw42xojx5avf7fykpwrwpf3yvtz mysys/mf_pack.c sp1f-mf_pack.c-19700101030959-u7bzjnr4w3idabvny244w5gzcf33butm ------------------------------------------------------------ revno: 2631.4.2 tags: mysql-5.0.66 revision-id: kgeorge@stripped parent: kgeorge@stripped committer: Georgi Kodinov <kgeorge@stripped> branch nick: merge-5.0.66-release timestamp: Wed 2008-07-09 13:03:48 +0300 message: fixed a compilation warning on windows 64. modified: mysys/default.c sp1f-default.c-19700101030959-yapqvlw42xojx5avf7fykpwrwpf3yvtz ------------------------------------------------------------ revno: 2631.4.1 revision-id: kgeorge@stripped parent: mysqldev@stripped parent: mats@stripped committer: Georgi Kodinov <kgeorge@stripped> branch nick: merge-5.0.66-release timestamp: Wed 2008-07-09 12:59:28 +0300 message: automatic merge of 5.0-bugteam into the 5.0.66 release clone. added: mysql-test/r/parser.result parser.result-20080707155630-vdiryhmexytcgu8d-1 mysql-test/t/parser.test parser.test-20080707155639-r5y8iqlookh6z34g-1 modified: mysql-test/include/have_archive.inc sp1f-have_archive.inc-20040525194737-y4dmzku2drx4axo3jj4crhl5w7q7iiee mysql-test/include/have_bdb.inc sp1f-have_bdb.inc-20001227013105-mu5cxige5b2f4imsv2ssex36t2junk5o mysql-test/include/have_big5.inc sp1f-have_big5.inc-20031224125944-5tkectrdy42o4sp27tc264vbtsbsp5zk mysql-test/include/have_blackhole.inc sp1f-have_blackhole.inc-20050323001036-3jxeejqyoix6dpttshyi3jeryqgpooir mysql-test/include/have_case_sensitive_file_system.inc sp1f-have_case_sensitive_-20060504065503-xptfsecuke5rlv6udm4ekadrhqqvcnnx mysql-test/include/have_compress.inc sp1f-have_compress.inc-20030410005021-njgg6a7oquvfrivtxbgw52jil6wqvjj7 mysql-test/include/have_cp1250_ch.inc sp1f-have_cp1250_ch.inc-20050303101530-hgs6b3lnqann3p7ezzu2oork2bt4c73e mysql-test/include/have_cp932.inc sp1f-have_cp932.inc-20050201103742-esjnhrejoad6u7kin5dcrqhy3cp6cjkv mysql-test/include/have_crypt.inc sp1f-have_crypt.inc-20030128063823-w7dzdgugtv7agyrien2f6sembnqf34ki mysql-test/include/have_csv.inc sp1f-have_csv.inc-20040813035428-w2b3gagsm3lfvmbd732lii7yvqi43ekc mysql-test/include/have_eucjpms.inc sp1f-have_eucjpms.inc-20050201103743-twgzhhnrnqlyk22if43qv5pp6x6mhh3j mysql-test/include/have_euckr.inc sp1f-have_euckr.inc-20051209123331-7j7l35wk7rqbeilf5h2llsgozan57mps mysql-test/include/have_exampledb.inc sp1f-have_exampledb.inc-20040814001331-foxu3jwldzsro54gptl7zst3czglytrj mysql-test/include/have_federated_db.inc sp1f-have_federated_db.in-20041211200116-6vsirzjnw3te4kahmtywdbkqlhy4kmes mysql-test/include/have_gb2312.inc sp1f-have_gb2312.inc-20051209123331-r3djrxfcjo25jhnahmhfpnb5exjh45rw mysql-test/include/have_gbk.inc sp1f-have_gbk.inc-20050722160355-sjecbg3iondw577wdombapw2jo4xnvku mysql-test/include/have_geometry.inc sp1f-have_geometry.inc-20040527153127-b6ftjxs6dm3wyzfjvvhq5mxrkf66nuls mysql-test/include/have_innodb.inc sp1f-have_innobase.inc-20010112144027-m7j2l7rwqewdpugmkwq5nkpcxx7tvweb mysql-test/include/have_latin2_ch.inc sp1f-have_latin2_ch.inc-20060320122819-24bzpko4oaio3gzcxwqxph366tvvcjhb mysql-test/include/have_log_bin.inc sp1f-have_log_bin.inc-20070514123848-agt6xmmfof6c7xqzuz3pb2huybwua5j5 mysql-test/include/have_lowercase0.inc sp1f-have_lowercase0.inc-20050818184753-5hr5h7dbooixey5u3zn6qjvl4t6btvdq mysql-test/include/have_multi_ndb.inc sp1f-have_multi_ndb.inc-20050307085452-uck5le2dkc4p6fsvb2s5wmzmcxvu3fvp mysql-test/include/have_ndb.inc sp1f-have_ndb.inc-20040415091459-pytgw6q4edqnevluroaxsv6fsywtyljf mysql-test/include/have_query_cache.inc sp1f-have_query_cache.inc-20020322205505-kc3o7uzgw4xnuu3qrlacp5xh7pza6exx mysql-test/include/have_sjis.inc sp1f-have_sjis.inc-20040325102937-o7cuiclffpte3ihjypzjt3ddqzkwftpg mysql-test/include/have_ssl.inc sp1f-have_ssl.inc-20010831212155-3qqpwe7dttrbcnqqyicfjurswzmnwgwq mysql-test/include/have_tis620.inc sp1f-have_tis620.inc-20031225161058-e77xn25ogqkblhtwdursdputw3ab4bek mysql-test/include/have_ucs2.inc sp1f-have_ucs2.inc-20030523101002-dylfpt3tlwxfx3fomq4nuxs23v32bkk5 mysql-test/include/have_udf.inc sp1f-have_udf.inc-20060215161119-xf74h7vjdqy73koybl4szdso2mj6cr5n mysql-test/include/have_ujis.inc sp1f-have_ujis.inc-20030523101003-tlztpr4vjkmdr665l2xwom3sf4onqy5b mysql-test/r/comments.result sp1f-comments.result-20001228015633-2ql73oomawbtd5elwbpba222o2swoxjd mysql-test/r/ps.result sp1f-ps.result-20040405154119-efxzt5onloys45nfjak4gt44kr4awkdi mysql-test/r/varbinary.result sp1f-varbinary.result-20001228015635-pcxyf7w4q5jybfqyuuvfynr5uuak6p3e mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test is_columns_myisam_em-20080616171930-zyj9h7bdkbtux050-6 mysql-test/t/varbinary.test sp1f-varbinary.test-20001228015637-ybyfiywltszj2rgppkg54u23qdenoedx mysys/default.c sp1f-default.c-19700101030959-yapqvlw42xojx5avf7fykpwrwpf3yvtz sql/item.cc sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn sql/log_event.cc sp1f-log_event.cc-19700101030959-msmqlflsngxosswid2hpzxly5vfqdddc sql/sp_head.h sp1f-sp_head.h-20021208185920-yrolg3rzamehfoejkbiai4q7njg5w6cd sql/sql_lex.cc sp1f-sql_lex.cc-19700101030959-4pizwlu5rqkti27gcwsvxkawq6bc2kph sql/sql_parse.cc sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd sql/sql_yacc.yy sp1f-sql_yacc.yy-19700101030959-wvn4qyy2drpmge7kaq3dysprbhlrv27j ------------------------------------------------------------ revno: 2631.1.10 revision-id: mysqldev@stripped parent: joerg@stripped parent: mysqldev@stripped author: Jonathan Perkin <jperkin@stripped> committer: mysqldev <mysqldev@stripped> branch nick: mysql-5.0-build timestamp: Wed 2008-07-16 12:28:44 +0200 message: Merge from mysql-5.0.60sp1-release ------------------------------------------------------------ revno: 2610.4.8 tags: mysql-5.0.60sp1 revision-id: mysqldev@stripped parent: mysqldev@stripped author: Jonathan Perkin <jperkin@stripped> committer: mysqldev <mysqldev@stripped> branch nick: mysql-5.0.60sp1-release timestamp: Fri 2008-06-27 18:43:45 +0200 message: Revert NDB version bump completely. modified: configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw ------------------------------------------------------------ revno: 2610.4.7 revision-id: mysqldev@stripped parent: mysqldev@stripped author: Jonathan Perkin <jperkin@stripped> committer: mysqldev <mysqldev@stripped> branch nick: mysql-5.0.60sp1-release timestamp: Fri 2008-06-27 18:13:50 +0200 message: Try different sp1 suffix for NDB. modified: configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw ------------------------------------------------------------ revno: 2610.4.6 revision-id: mysqldev@stripped parent: sp1r-kent@stripped/kent-amd64.(none)-20080428195352-51450 author: Jonathan Perkin <jperkin@stripped> committer: mysqldev <mysqldev@stripped> branch nick: mysql-5.0.60sp1-release timestamp: Fri 2008-06-27 12:58:07 +0200 message: Version number bump for 5.0.60sp1 modified: configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw ------------------------------------------------------------ revno: 2631.1.9 revision-id: joerg@stripped parent: joerg@stripped parent: gshchepa@stripped committer: Joerg Bruehe <joerg@stripped> branch nick: push-5.0 timestamp: Mon 2008-07-14 12:39:32 +0200 message: Merge main 5.0 into 5.0-build added: mysql-test/r/parser.result parser.result-20080707155630-vdiryhmexytcgu8d-1 mysql-test/t/parser.test parser.test-20080707155639-r5y8iqlookh6z34g-1 modified: mysql-test/include/have_archive.inc sp1f-have_archive.inc-20040525194737-y4dmzku2drx4axo3jj4crhl5w7q7iiee mysql-test/include/have_bdb.inc sp1f-have_bdb.inc-20001227013105-mu5cxige5b2f4imsv2ssex36t2junk5o mysql-test/include/have_big5.inc sp1f-have_big5.inc-20031224125944-5tkectrdy42o4sp27tc264vbtsbsp5zk mysql-test/include/have_blackhole.inc sp1f-have_blackhole.inc-20050323001036-3jxeejqyoix6dpttshyi3jeryqgpooir mysql-test/include/have_case_sensitive_file_system.inc sp1f-have_case_sensitive_-20060504065503-xptfsecuke5rlv6udm4ekadrhqqvcnnx mysql-test/include/have_compress.inc sp1f-have_compress.inc-20030410005021-njgg6a7oquvfrivtxbgw52jil6wqvjj7 mysql-test/include/have_cp1250_ch.inc sp1f-have_cp1250_ch.inc-20050303101530-hgs6b3lnqann3p7ezzu2oork2bt4c73e mysql-test/include/have_cp932.inc sp1f-have_cp932.inc-20050201103742-esjnhrejoad6u7kin5dcrqhy3cp6cjkv mysql-test/include/have_crypt.inc sp1f-have_crypt.inc-20030128063823-w7dzdgugtv7agyrien2f6sembnqf34ki mysql-test/include/have_csv.inc sp1f-have_csv.inc-20040813035428-w2b3gagsm3lfvmbd732lii7yvqi43ekc mysql-test/include/have_eucjpms.inc sp1f-have_eucjpms.inc-20050201103743-twgzhhnrnqlyk22if43qv5pp6x6mhh3j mysql-test/include/have_euckr.inc sp1f-have_euckr.inc-20051209123331-7j7l35wk7rqbeilf5h2llsgozan57mps mysql-test/include/have_exampledb.inc sp1f-have_exampledb.inc-20040814001331-foxu3jwldzsro54gptl7zst3czglytrj mysql-test/include/have_federated_db.inc sp1f-have_federated_db.in-20041211200116-6vsirzjnw3te4kahmtywdbkqlhy4kmes mysql-test/include/have_gb2312.inc sp1f-have_gb2312.inc-20051209123331-r3djrxfcjo25jhnahmhfpnb5exjh45rw mysql-test/include/have_gbk.inc sp1f-have_gbk.inc-20050722160355-sjecbg3iondw577wdombapw2jo4xnvku mysql-test/include/have_geometry.inc sp1f-have_geometry.inc-20040527153127-b6ftjxs6dm3wyzfjvvhq5mxrkf66nuls mysql-test/include/have_innodb.inc sp1f-have_innobase.inc-20010112144027-m7j2l7rwqewdpugmkwq5nkpcxx7tvweb mysql-test/include/have_latin2_ch.inc sp1f-have_latin2_ch.inc-20060320122819-24bzpko4oaio3gzcxwqxph366tvvcjhb mysql-test/include/have_log_bin.inc sp1f-have_log_bin.inc-20070514123848-agt6xmmfof6c7xqzuz3pb2huybwua5j5 mysql-test/include/have_lowercase0.inc sp1f-have_lowercase0.inc-20050818184753-5hr5h7dbooixey5u3zn6qjvl4t6btvdq mysql-test/include/have_multi_ndb.inc sp1f-have_multi_ndb.inc-20050307085452-uck5le2dkc4p6fsvb2s5wmzmcxvu3fvp mysql-test/include/have_ndb.inc sp1f-have_ndb.inc-20040415091459-pytgw6q4edqnevluroaxsv6fsywtyljf mysql-test/include/have_query_cache.inc sp1f-have_query_cache.inc-20020322205505-kc3o7uzgw4xnuu3qrlacp5xh7pza6exx mysql-test/include/have_sjis.inc sp1f-have_sjis.inc-20040325102937-o7cuiclffpte3ihjypzjt3ddqzkwftpg mysql-test/include/have_ssl.inc sp1f-have_ssl.inc-20010831212155-3qqpwe7dttrbcnqqyicfjurswzmnwgwq mysql-test/include/have_tis620.inc sp1f-have_tis620.inc-20031225161058-e77xn25ogqkblhtwdursdputw3ab4bek mysql-test/include/have_ucs2.inc sp1f-have_ucs2.inc-20030523101002-dylfpt3tlwxfx3fomq4nuxs23v32bkk5 mysql-test/include/have_udf.inc sp1f-have_udf.inc-20060215161119-xf74h7vjdqy73koybl4szdso2mj6cr5n mysql-test/include/have_ujis.inc sp1f-have_ujis.inc-20030523101003-tlztpr4vjkmdr665l2xwom3sf4onqy5b mysql-test/r/comments.result sp1f-comments.result-20001228015633-2ql73oomawbtd5elwbpba222o2swoxjd mysql-test/r/func_misc.result sp1f-func_misc.result-20001228015633-4sy6dzzt7xcs4ubzcxloyguc7zhougbr mysql-test/r/ps.result sp1f-ps.result-20040405154119-efxzt5onloys45nfjak4gt44kr4awkdi mysql-test/r/varbinary.result sp1f-varbinary.result-20001228015635-pcxyf7w4q5jybfqyuuvfynr5uuak6p3e mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test is_columns_myisam_em-20080616171930-zyj9h7bdkbtux050-6 mysql-test/suite/funcs_2/charset/charset_master.test sp1f-charset_master.test-20070206175440-sgefy4i6nwwi43svr5asovdpgvmycuvr mysql-test/suite/funcs_2/t/innodb_charset.test sp1f-innodb_charset.test-20070206180358-jwznkkalaqtecydoobuidk436pokqmvc mysql-test/suite/funcs_2/t/memory_charset.test sp1f-memory_charset.test-20070206180358-5uoxm3xp5xysaoi3lql7pj3vous7wi6k mysql-test/suite/funcs_2/t/myisam_charset.test sp1f-myisam_charset.test-20070206180358-4ddnsur4zeb2tsnsl24l2b4pm463jajn mysql-test/suite/funcs_2/t/ndb_charset.test sp1f-ndb_charset.test-20070206180358-jzvzee7vehbt3ze2rsdpfbms3xbnqoha mysql-test/t/func_misc.test sp1f-func_misc.test-20001228015635-kayguwcdgtjnekzavvdzbsnqcdwfm36c mysql-test/t/varbinary.test sp1f-varbinary.test-20001228015637-ybyfiywltszj2rgppkg54u23qdenoedx mysys/default.c sp1f-default.c-19700101030959-yapqvlw42xojx5avf7fykpwrwpf3yvtz sql/item.cc sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn sql/item_strfunc.cc sp1f-item_strfunc.cc-19700101030959-yl2pwnrngmla3nmlgiuiwrztx3iu4ffl sql/log_event.cc sp1f-log_event.cc-19700101030959-msmqlflsngxosswid2hpzxly5vfqdddc sql/sp_head.h sp1f-sp_head.h-20021208185920-yrolg3rzamehfoejkbiai4q7njg5w6cd sql/sql_lex.cc sp1f-sql_lex.cc-19700101030959-4pizwlu5rqkti27gcwsvxkawq6bc2kph sql/sql_parse.cc sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd sql/sql_yacc.yy sp1f-sql_yacc.yy-19700101030959-wvn4qyy2drpmge7kaq3dysprbhlrv27j ------------------------------------------------------------ revno: 2631.1.8 revision-id: joerg@stripped parent: df@stripped parent: kent.boortz@stripped committer: Joerg Bruehe <joerg@stripped> branch nick: push-5.0 timestamp: Wed 2008-07-09 13:17:53 +0200 message: Merge from main 5.0 to 5.0-build. modified: configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw mysql-test/suite/funcs_1/datadict/charset_collation.inc sp1f-charset_collation.in-20080307163305-edrudf23pcobanheiax4mtuw42llel37 mysql-test/suite/funcs_1/t/charset_collation_1.test sp1f-charset_collation_1.-20080307163303-xoj2pleizxk54stjeffsheamxhopuxni mysql-test/suite/funcs_1/t/charset_collation_3.test sp1f-charset_collation_3.-20080307163303-wvj3wrresuqmlxzn3dvqppaajsi2ajdp support-files/my-huge.cnf.sh sp1f-myhuge.cnf.sh-19700101030959-lxpesdge7i55uifv6h5er3qwahcw2gcd support-files/my-innodb-heavy-4G.cnf.sh sp1f-myinnodbheavy4g.cnf.-20030703124143-qivhcjpd2lpxknabenjxpubfqsfsc5us support-files/my-large.cnf.sh sp1f-mylarge.cnf.sh-19700101030959-m6uuqs2wgt3r2vovo5bult4jzgodwav5 support-files/my-medium.cnf.sh sp1f-mymedium.cnf.sh-19700101030959-fef6lzd4w4yguzr5aseorrgv6btttf3x support-files/my-small.cnf.sh sp1f-mysmall.cnf.sh-19700101030959-mcqqfzzmkes6ywvy6ud3o7pvn46uifjp ------------------------------------------------------------ revno: 2631.1.7 revision-id: df@stripped parent: joerg@stripped committer: Daniel Fischer <df@stripped> branch nick: mysql-5.0-build timestamp: Sat 2008-07-05 09:44:10 +0200 message: ild can not be expected on all matching installs modified: configure.in sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw ------------------------------------------------------------ revno: 2631.1.6 revision-id: joerg@stripped parent: joerg@stripped parent: joerg@stripped committer: Joerg Bruehe <joerg@stripped> branch nick: push-5.0 timestamp: Fri 2008-06-27 19:42:31 +0200 message: Take the fix for bug#37623 (Suffix "-64bit" is duplicated) into the 5.0-build team tree. modified: scripts/make_binary_distribution.sh sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy ------------------------------------------------------------ revno: 2631.3.1 revision-id: joerg@stripped parent: kgeorge@stripped committer: Joerg Bruehe <joerg@stripped> branch nick: bug37623-5.0 timestamp: Fri 2008-06-27 19:12:42 +0200 message: OS X 10.5 is now a supported platform, so Apple's internal name ("darwin9") must be translated to ours ("osx10.5"). modified: scripts/make_binary_distribution.sh sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy ------------------------------------------------------------ revno: 2631.1.5 revision-id: joerg@stripped parent: joerg@stripped parent: mleich@stripped committer: Joerg Bruehe <joerg@stripped> branch nick: push-5.0 timestamp: Thu 2008-06-26 18:01:28 +0200 message: Merge the main 5.0 tree into 5.0-build. added: mysql-test/include/wait_condition.inc wait_condition.inc-20080624105104-7a4ft3j7x0jit3kn-1 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/include/tb3.inc tb3.inc-20080530141937-mozb7mvkoh46lye9-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/r/ndb_trig_0102.result ndb_trig_0102.result-20080530150730-o6suyuevwnd21dnb-1 mysql-test/suite/funcs_1/r/ndb_trig_03.result ndb_trig_03.result-20080530150730-o6suyuevwnd21dnb-2 mysql-test/suite/funcs_1/r/ndb_trig_0407.result ndb_trig_0407.result-20080530150730-o6suyuevwnd21dnb-3 mysql-test/suite/funcs_1/r/ndb_trig_08.result ndb_trig_08.result-20080530150730-o6suyuevwnd21dnb-4 mysql-test/suite/funcs_1/r/ndb_trig_09.result ndb_trig_09.result-20080530150730-o6suyuevwnd21dnb-5 mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result ndb_trig_1011ext.res-20080530150730-o6suyuevwnd21dnb-6 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 mysql-test/suite/funcs_1/t/ndb_trig_0102.test ndb_trig_0102.test-20080530150730-o6suyuevwnd21dnb-7 mysql-test/suite/funcs_1/t/ndb_trig_03.test ndb_trig_03.test-20080530150730-o6suyuevwnd21dnb-8 mysql-test/suite/funcs_1/t/ndb_trig_0407.test ndb_trig_0407.test-20080530150730-o6suyuevwnd21dnb-9 mysql-test/suite/funcs_1/t/ndb_trig_08.test ndb_trig_08.test-20080530150730-o6suyuevwnd21dnb-10 mysql-test/suite/funcs_1/t/ndb_trig_09.test ndb_trig_09.test-20080530150730-o6suyuevwnd21dnb-11 mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test ndb_trig_1011ext.tes-20080530150730-o6suyuevwnd21dnb-12 modified: Makefile.am sp1f-makefile.am-19700101030959-jbbpiygwpgybyqknlavdxxupbrjonu7h client/mysql.cc sp1f-mysql.cc-19700101030959-5sipizk7ehvbsi3tywrkdords5qy5zdl mysql-test/Makefile.am sp1f-makefile.am-20001206082022-36vvdlhec52v4kcxab5ees7yomxvj4dl mysql-test/r/func_misc.result sp1f-func_misc.result-20001228015633-4sy6dzzt7xcs4ubzcxloyguc7zhougbr mysql-test/r/mysql.result sp1f-mysql.result-20050517191330-5ywsflw7k6pttof273om5l2mb7pyiu22 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_0102.result sp1f-innodb_trig_0102.res-20070206175436-qayw77hubof3kdsbrmfmuzlhp4truay3 mysql-test/suite/funcs_1/r/innodb_trig_03.result sp1f-innodb_trig_03.resul-20070206175436-mq45jye6dgp4ghwjmpbv2txgz7fd6vrk mysql-test/suite/funcs_1/r/innodb_trig_0407.result sp1f-innodb_trig_0407.res-20070206175436-lr26htv2b4kgrxtjyuwq6jgeqasuw64d mysql-test/suite/funcs_1/r/innodb_trig_08.result sp1f-innodb_trig_08.resul-20070206175436-z4bpcbjwcioz74mswi5ezis27jwlvba4 mysql-test/suite/funcs_1/r/innodb_trig_09.result sp1f-innodb_trig_09.resul-20070206175436-iyvorcoemrp6r5aj4ljzyg47lafvpbme mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result sp1f-innodb_trig_1011ext.-20070206175436-q6b3sbvrtz66gnmemlan3xwnr3h4mrf3 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_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_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/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_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/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/disabled.def sp1f-disabled.def-20070206175437-omhbgzpxfjoru23leqkxfztodlmdl4af mysql-test/suite/funcs_1/t/innodb_trig_0102.test sp1f-innodb_trig_0102.tes-20070206175438-wnq54hui2ahzx5f366dyuzycw5nfuzcg mysql-test/suite/funcs_1/t/innodb_trig_03.test sp1f-innodb_trig_03.test-20070206175438-nwbzlq76xom5o6lxrkgsorchvqb7wb7l mysql-test/suite/funcs_1/t/innodb_trig_0407.test sp1f-innodb_trig_0407.tes-20070206175438-ncy4f2524qanf6mbjzibt7p6pskljp5n mysql-test/suite/funcs_1/t/innodb_trig_08.test sp1f-innodb_trig_08.test-20070206175438-3ahrmdhq7vh46vsv6ovks65k2sgi2xo3 mysql-test/suite/funcs_1/t/innodb_trig_09.test sp1f-innodb_trig_09.test-20070206175438-wemacblooxgqlqwnk3gx44jcdrjhylrq mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test sp1f-innodb_trig_1011ext.-20070206175438-ubrfdfvnpappcetkv6quhwn5cmr2vcer 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_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_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_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_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_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_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/triggers/trig_frkey.inc sp1f-trig_frkey.inc-20070206175439-s6yywz4idr664fal4r36b5avem7hvq3x mysql-test/suite/funcs_1/triggers/triggers_0102.inc sp1f-triggers_0102.inc-20070206175439-7gcmfnamt4jktnn5ksfrh2zdylfvqtvg mysql-test/suite/funcs_1/triggers/triggers_03.inc sp1f-triggers_03.inc-20070206175439-xg3hkddw3jqmctyrsxwrxp5rutis24zo mysql-test/suite/funcs_1/triggers/triggers_0407.inc sp1f-triggers_0407.inc-20070206175439-7nivnderbsg2gcbk6n7ru36sw4vdzpdl mysql-test/suite/funcs_1/triggers/triggers_08.inc sp1f-triggers_08.inc-20070206175439-odr5mhhamlpsqbh5gf4qg6mflxb7ibzj mysql-test/suite/funcs_1/triggers/triggers_09.inc sp1f-triggers_09.inc-20070206175439-fuwb4lyxepp2si3iyd4ldh7w7us57t6b mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc sp1f-triggers_1011ext.inc-20070206175439-jw5xjerrcfevxockml4n45jj7dwjjumw 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 mysql-test/t/func_misc.test sp1f-func_misc.test-20001228015635-kayguwcdgtjnekzavvdzbsnqcdwfm36c mysql-test/t/mysql_delimiter.sql sp1f-mysql_delimiter.sql-20050517191330-4lmz5vqkughkhhltprcorhzmopl564v2 mysql-test/t/subselect.test sp1f-subselect.test-20020512204640-lyqrayx6uwsn7zih6y7kerkenuitzbvr mysys/errors.c sp1f-errors.c-19700101030959-xfxez7oem4mhljuj3yhmevl3vohnvgh3 sql/share/charsets/README sp1f-readme-19700101030959-biiq664z5e4hu6e76gmanzfplb7dqfv5 strings/CHARSET_INFO.txt sp1f-charset_info.txt-20041018102512-ynunzmkv53gcy2f575oi7kp7isj5tbfi tests/mysql_client_test.c sp1f-client_test.c-20020614002636-eqy2zzksgelocknwbbogfuwxfwqy7q5x Attachment: [text/text/x-diff] patch-2680.diff
| Thread | ||
|---|---|---|
| • bzr push into mysql-5.0 tree (Matthias.Leich:2646 to 2680) Bug#21226,Bug#24176, Bug#27526, Bug#28309, Bug#29738, Bug#30129, Bug#30394, Bug#31605,Bug#3... | Matthias Leich | 3 Sep |
| • Re: bzr push into mysql-5.0 tree (Matthias.Leich:2646 to 2680)Bug#21226, Bug#24176, Bug#27526, Bug#28309, Bug#29738, Bug#30129, Bug#30394,Bug#31605, B... | Matthias Leich | 3 Sep |