From: Date: June 27 2008 7:44pm Subject: bzr push into mysql-5.0 branch (joerg:2636 to 2637) Bug#37623 List-Archive: http://lists.mysql.com/commits/48671 X-Bug: 37623 Message-Id: <20080627174408.DD9F83B3CA@trift-lap.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 2637 Joerg Bruehe 2008-06-27 [merge] Take the fix for bug#37623 (Suffix "-64bit" is duplicated) into the 5.0-build team tree. modified: scripts/make_binary_distribution.sh 2636 Joerg Bruehe 2008-06-26 [merge] Merge the main 5.0 tree into 5.0-build. added: mysql-test/include/wait_condition.inc mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc mysql-test/suite/funcs_1/datadict/is_routines.inc mysql-test/suite/funcs_1/datadict/is_schemata.inc mysql-test/suite/funcs_1/datadict/is_tables.inc mysql-test/suite/funcs_1/datadict/is_triggers.inc mysql-test/suite/funcs_1/datadict/is_views.inc mysql-test/suite/funcs_1/datadict/tables.inc mysql-test/suite/funcs_1/include/bug28309_skip.inc mysql-test/suite/funcs_1/include/tb3.inc mysql-test/suite/funcs_1/r/is_cml_innodb.result mysql-test/suite/funcs_1/r/is_cml_memory.result mysql-test/suite/funcs_1/r/is_cml_myisam.result mysql-test/suite/funcs_1/r/is_cml_ndb.result mysql-test/suite/funcs_1/r/is_columns_is_embedded.result mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result mysql-test/suite/funcs_1/r/is_routines_embedded.result mysql-test/suite/funcs_1/r/is_schemata_embedded.result mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result mysql-test/suite/funcs_1/r/is_tables_embedded.result mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result mysql-test/suite/funcs_1/r/is_triggers_embedded.result mysql-test/suite/funcs_1/r/is_views_embedded.result mysql-test/suite/funcs_1/r/ndb_trig_0102.result mysql-test/suite/funcs_1/r/ndb_trig_03.result mysql-test/suite/funcs_1/r/ndb_trig_0407.result mysql-test/suite/funcs_1/r/ndb_trig_08.result mysql-test/suite/funcs_1/r/ndb_trig_09.result mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result mysql-test/suite/funcs_1/t/is_cml_innodb.test mysql-test/suite/funcs_1/t/is_cml_memory.test mysql-test/suite/funcs_1/t/is_cml_myisam.test mysql-test/suite/funcs_1/t/is_cml_ndb.test mysql-test/suite/funcs_1/t/is_columns_is_embedded.test mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test mysql-test/suite/funcs_1/t/is_routines_embedded.test mysql-test/suite/funcs_1/t/is_schemata_embedded.test mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test mysql-test/suite/funcs_1/t/is_tables_embedded.test mysql-test/suite/funcs_1/t/is_tables_myisam_embedded.test mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test mysql-test/suite/funcs_1/t/is_triggers_embedded.test mysql-test/suite/funcs_1/t/is_views_embedded.test mysql-test/suite/funcs_1/t/ndb_trig_0102.test mysql-test/suite/funcs_1/t/ndb_trig_03.test mysql-test/suite/funcs_1/t/ndb_trig_0407.test mysql-test/suite/funcs_1/t/ndb_trig_08.test mysql-test/suite/funcs_1/t/ndb_trig_09.test mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test modified: Makefile.am client/mysql.cc mysql-test/Makefile.am mysql-test/r/func_misc.result mysql-test/r/mysql.result mysql-test/suite/funcs_1/datadict/columns.inc mysql-test/suite/funcs_1/datadict/tables1.inc mysql-test/suite/funcs_1/datadict/tables2.inc mysql-test/suite/funcs_1/include/innodb_tb1.inc mysql-test/suite/funcs_1/include/innodb_tb3.inc mysql-test/suite/funcs_1/include/innodb_tb4.inc mysql-test/suite/funcs_1/include/memory_tb4.inc mysql-test/suite/funcs_1/include/myisam_tb1.inc mysql-test/suite/funcs_1/include/myisam_tb3.inc mysql-test/suite/funcs_1/include/myisam_tb4.inc mysql-test/suite/funcs_1/r/innodb_trig_0102.result mysql-test/suite/funcs_1/r/innodb_trig_03.result mysql-test/suite/funcs_1/r/innodb_trig_0407.result mysql-test/suite/funcs_1/r/innodb_trig_08.result mysql-test/suite/funcs_1/r/innodb_trig_09.result mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result mysql-test/suite/funcs_1/r/innodb_trig_frkey.result mysql-test/suite/funcs_1/r/is_columns_innodb.result mysql-test/suite/funcs_1/r/is_columns_memory.result mysql-test/suite/funcs_1/r/is_columns_myisam.result mysql-test/suite/funcs_1/r/is_tables_innodb.result mysql-test/suite/funcs_1/r/is_tables_is.result mysql-test/suite/funcs_1/r/is_tables_memory.result mysql-test/suite/funcs_1/r/is_tables_myisam.result mysql-test/suite/funcs_1/r/is_tables_mysql.result mysql-test/suite/funcs_1/r/is_tables_ndb.result mysql-test/suite/funcs_1/r/memory_trig_0102.result mysql-test/suite/funcs_1/r/memory_trig_03.result mysql-test/suite/funcs_1/r/memory_trig_0407.result mysql-test/suite/funcs_1/r/memory_trig_08.result mysql-test/suite/funcs_1/r/memory_trig_09.result mysql-test/suite/funcs_1/r/memory_trig_1011ext.result mysql-test/suite/funcs_1/r/myisam_trig_0102.result mysql-test/suite/funcs_1/r/myisam_trig_03.result mysql-test/suite/funcs_1/r/myisam_trig_0407.result mysql-test/suite/funcs_1/r/myisam_trig_08.result mysql-test/suite/funcs_1/r/myisam_trig_09.result mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result mysql-test/suite/funcs_1/storedproc/storedproc_06.inc mysql-test/suite/funcs_1/storedproc/storedproc_10.inc mysql-test/suite/funcs_1/t/disabled.def mysql-test/suite/funcs_1/t/innodb_trig_0102.test mysql-test/suite/funcs_1/t/innodb_trig_03.test mysql-test/suite/funcs_1/t/innodb_trig_0407.test mysql-test/suite/funcs_1/t/innodb_trig_08.test mysql-test/suite/funcs_1/t/innodb_trig_09.test mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test mysql-test/suite/funcs_1/t/innodb_trig_frkey.test mysql-test/suite/funcs_1/t/is_basics_mixed.test mysql-test/suite/funcs_1/t/is_column_privileges.test mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test mysql-test/suite/funcs_1/t/is_columns.test mysql-test/suite/funcs_1/t/is_columns_innodb.test mysql-test/suite/funcs_1/t/is_columns_is.test mysql-test/suite/funcs_1/t/is_columns_memory.test mysql-test/suite/funcs_1/t/is_columns_myisam.test mysql-test/suite/funcs_1/t/is_columns_mysql.test mysql-test/suite/funcs_1/t/is_columns_ndb.test mysql-test/suite/funcs_1/t/is_key_column_usage.test mysql-test/suite/funcs_1/t/is_routines.test mysql-test/suite/funcs_1/t/is_schema_privileges.test mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test mysql-test/suite/funcs_1/t/is_schemata.test mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test mysql-test/suite/funcs_1/t/is_statistics.test mysql-test/suite/funcs_1/t/is_statistics_mysql.test mysql-test/suite/funcs_1/t/is_table_constraints.test mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test mysql-test/suite/funcs_1/t/is_table_privileges.test mysql-test/suite/funcs_1/t/is_tables.test mysql-test/suite/funcs_1/t/is_tables_innodb.test mysql-test/suite/funcs_1/t/is_tables_memory.test mysql-test/suite/funcs_1/t/is_tables_myisam.test mysql-test/suite/funcs_1/t/is_tables_mysql.test mysql-test/suite/funcs_1/t/is_tables_ndb.test mysql-test/suite/funcs_1/t/is_triggers.test mysql-test/suite/funcs_1/t/is_user_privileges.test mysql-test/suite/funcs_1/t/is_views.test mysql-test/suite/funcs_1/t/memory_trig_0102.test mysql-test/suite/funcs_1/t/memory_trig_03.test mysql-test/suite/funcs_1/t/memory_trig_0407.test mysql-test/suite/funcs_1/t/memory_trig_08.test mysql-test/suite/funcs_1/t/memory_trig_09.test mysql-test/suite/funcs_1/t/memory_trig_1011ext.test mysql-test/suite/funcs_1/t/memory_views.test mysql-test/suite/funcs_1/t/myisam_trig_0102.test mysql-test/suite/funcs_1/t/myisam_trig_03.test mysql-test/suite/funcs_1/t/myisam_trig_0407.test mysql-test/suite/funcs_1/t/myisam_trig_08.test mysql-test/suite/funcs_1/t/myisam_trig_09.test mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test mysql-test/suite/funcs_1/triggers/trig_frkey.inc mysql-test/suite/funcs_1/triggers/triggers_0102.inc mysql-test/suite/funcs_1/triggers/triggers_03.inc mysql-test/suite/funcs_1/triggers/triggers_0407.inc mysql-test/suite/funcs_1/triggers/triggers_08.inc mysql-test/suite/funcs_1/triggers/triggers_09.inc mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc mysql-test/suite/funcs_1/views/func_view.inc mysql-test/suite/funcs_1/views/views_master.inc mysql-test/t/func_misc.test mysql-test/t/mysql_delimiter.sql mysql-test/t/subselect.test mysys/errors.c sql/share/charsets/README strings/CHARSET_INFO.txt tests/mysql_client_test.c === modified file 'scripts/make_binary_distribution.sh' --- a/scripts/make_binary_distribution.sh 2008-04-28 19:53:52 +0000 +++ b/scripts/make_binary_distribution.sh 2008-06-27 17:12:42 +0000 @@ -61,6 +61,7 @@ system=`echo $system | sed -e 's/[a-z]*- system=`echo $system | sed -e 's/darwin6.*/osx10.2/g'` system=`echo $system | sed -e 's/darwin7.*/osx10.3/g'` system=`echo $system | sed -e 's/darwin8.*/osx10.4/g'` +system=`echo $system | sed -e 's/darwin9.*/osx10.5/g'` system=`echo $system | sed -e 's/\(aix4.3\).*/\1/g'` system=`echo $system | sed -e 's/\(aix5.1\).*/\1/g'` system=`echo $system | sed -e 's/\(aix5.2\).*/\1/g'`