From: Date: July 23 2008 3:20pm Subject: bzr push into mysql-6.0-falcon branch (olav:2753 to 2754) Bug#37622 List-Archive: http://lists.mysql.com/commits/50319 X-Bug: 37622 Message-Id: <20080723132037.827.qmail@khepri11> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 2754 Olav Sandstaa 2008-07-23 Part of fix of Bug#37622 Falcon does not compile on Solaris 9 on SPARC using Sun Studio compiler. Changes the INCLUDES macro to avoid that the final continuation line will not be empty in case FALCON_SPARC_ASSEMBLY is not set. modified: storage/falcon/Makefile.am 2753 Vladislav Vaintroub 2008-07-22 [merge] merge from mysql-6.0-falcon removed: mysql-test/extra/binlog_tests/implicit.test mysql-test/r/merge-big.result mysql-test/r/parser.result mysql-test/suite/binlog/r/binlog_implicit_commit.result mysql-test/suite/binlog/t/binlog_implicit_commit.test mysql-test/suite/falcon/r/rpl_falcon_bug_37221.result mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test mysql-test/t/merge-big.test mysql-test/t/parser.test sql/backup/debug.h added: mysql-test/extra/binlog_tests/implicit.test mysql-test/include/ctype_ascii_order.inc mysql-test/include/have_debug_sync.inc mysql-test/r/backup_charsets.result mysql-test/r/backup_commit_restore.result mysql-test/r/backup_compression.result mysql-test/r/backup_lock_myisam.result mysql-test/r/backup_many_dbs.result mysql-test/r/backup_multi_blocks.result mysql-test/r/backup_myisam1.result mysql-test/r/backup_myisam2.result mysql-test/r/backup_no_be.result mysql-test/r/backup_nodata_driver.result mysql-test/r/backup_procedures.result mysql-test/r/backup_triggers_and_events.result mysql-test/r/backup_view_on_view.result mysql-test/r/backup_views.result mysql-test/r/ctype_cp866.result mysql-test/r/debug_sync.result mysql-test/r/have_debug_sync.require mysql-test/r/merge-sync.result mysql-test/r/myisamlog.result mysql-test/r/parser.result mysql-test/suite/backup/ mysql-test/suite/backup/r/ mysql-test/suite/backup/r/backup_online_testing.result mysql-test/suite/backup/t/ mysql-test/suite/backup/t/backup_online_testing.test mysql-test/suite/binlog/r/binlog_implicit_commit.result mysql-test/suite/binlog/t/binlog_implicit_commit.test mysql-test/suite/falcon/r/falcon_bug_38039.result mysql-test/suite/falcon/r/rpl_falcon_bug_37221.result mysql-test/suite/falcon/t/falcon_bug_38039.test mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test mysql-test/t/backup_charsets.test mysql-test/t/backup_commit_restore.test mysql-test/t/backup_compression.test mysql-test/t/backup_lock_myisam.test mysql-test/t/backup_many_dbs.test mysql-test/t/backup_multi_blocks.test mysql-test/t/backup_myisam1-master.opt mysql-test/t/backup_myisam1.test mysql-test/t/backup_myisam2.test mysql-test/t/backup_no_be.test mysql-test/t/backup_nodata_driver.test mysql-test/t/backup_procedures.test mysql-test/t/backup_triggers_and_events.test mysql-test/t/backup_view_on_view.test mysql-test/t/backup_views.test mysql-test/t/ctype_cp866.test mysql-test/t/debug_sync.test mysql-test/t/merge-sync.test mysql-test/t/myisamlog-master.opt mysql-test/t/myisamlog.test mysql-test/t/parser.test sql/backup/backup_info.cc sql/backup/backup_info.h sql/backup/be_logical.h sql/backup/be_nodata.cc sql/backup/be_nodata.h sql/backup/restore_info.h sql/debug_sync.cc storage/myisam/mi_examine_log.c storage/myisam/myisam_backup_engine.cc renamed: mysql-test/suite/falcon_team/r/falcon_bug_23962.result => mysql-test/suite/falcon/r/falcon_bug_23962.result mysql-test/suite/falcon_team/r/falcon_bug_27997.result => mysql-test/suite/falcon/r/falcon_bug_27997.result mysql-test/suite/falcon_team/r/falcon_bug_37080.result => mysql-test/suite/falcon/r/falcon_bug_37080.result mysql-test/suite/falcon_team/t/falcon_bug_23962.test => mysql-test/suite/falcon/t/falcon_bug_23962.test mysql-test/suite/falcon_team/t/falcon_bug_27997.test => mysql-test/suite/falcon/t/falcon_bug_27997.test mysql-test/suite/falcon_team/t/falcon_bug_37080.test => mysql-test/suite/falcon/t/falcon_bug_37080.test sql/backup/catalog.cc => sql/backup/image_info.cc sql/backup/catalog.h => sql/backup/image_info.h modified: .bzrignore CMakeLists.txt* client/mysql.cc client/mysqltest.c configure.in dbug/CMakeLists.txt* include/atomic/generic-msvc.h include/atomic/nolock.h include/config-win.h include/keycache.h include/my_global.h include/my_sys.h include/myisam.h libmysqld/CMakeLists.txt libmysqld/Makefile.am mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test mysql-test/lib/mtr_report.pl mysql-test/mysql-test-run.pl* mysql-test/r/backup.result mysql-test/r/backup_commit_blocker.result mysql-test/r/backup_ddl_blocker.result mysql-test/r/backup_errors.result mysql-test/r/backup_objects.result mysql-test/r/backup_progress.result mysql-test/r/backup_snapshot.result mysql-test/r/character_set_server_func.result mysql-test/r/ctype_big5.result mysql-test/r/ctype_gb2312.result mysql-test/r/ctype_gbk.result mysql-test/r/ctype_tis620.result mysql-test/r/ctype_utf32.result mysql-test/r/ctype_utf8.result mysql-test/r/fulltext2.result mysql-test/r/merge.result mysql-test/r/mysql.result mysql-test/r/xml.result mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result mysql-test/suite/falcon/r/falcon_bug_32833.result mysql-test/suite/falcon/r/falcon_options.result mysql-test/suite/falcon/r/falcon_options2.result mysql-test/suite/falcon/t/falcon_options2.test mysql-test/suite/funcs_1/r/is_columns_mysql.result mysql-test/suite/funcs_1/triggers/triggers_03.inc mysql-test/suite/funcs_1/triggers/triggers_08.inc mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc mysql-test/suite/rpl/t/disabled.def mysql-test/t/backup.test mysql-test/t/backup_commit_blocker.test mysql-test/t/backup_ddl_blocker.test mysql-test/t/backup_errors.test mysql-test/t/backup_objects.test mysql-test/t/backup_progress.test mysql-test/t/backup_security.test mysql-test/t/backup_snapshot.test mysql-test/t/character_set_server_func.test mysql-test/t/ctype_big5.test mysql-test/t/ctype_gb2312.test mysql-test/t/ctype_gbk.test mysql-test/t/ctype_tis620.test mysql-test/t/ctype_utf32.test mysql-test/t/ctype_utf8.test mysql-test/t/disabled.def mysql-test/t/fulltext2.test mysql-test/t/innodb-autoinc.test mysql-test/t/key_cache.test mysql-test/t/merge.test mysql-test/t/mysql_delimiter.sql mysql-test/t/system_mysql_db_fix50030.test mysql-test/t/system_mysql_db_fix50117.test mysql-test/t/xml.test mysql-test/valgrind.supp mysys/CMakeLists.txt mysys/default.c mysys/mf_iocache.c mysys/mf_keycache.c mysys/mf_pack.c mysys/my_thr_init.c mysys/thr_lock.c scripts/make_binary_distribution.sh scripts/mysql_system_tables.sql sql/CMakeLists.txt sql/Makefile.am sql/backup/CMakeLists.txt sql/backup/Makefile.am sql/backup/api_types.h sql/backup/backup_aux.h sql/backup/backup_engine.h sql/backup/backup_kernel.h sql/backup/backup_progress.cc sql/backup/backup_progress.h sql/backup/backup_stream.h sql/backup/backup_test.cc sql/backup/be_default.cc sql/backup/be_default.h sql/backup/be_native.h sql/backup/be_snapshot.cc sql/backup/be_snapshot.h sql/backup/be_thread.cc sql/backup/be_thread.h sql/backup/buffer_iterator.cc sql/backup/buffer_iterator.h sql/backup/data_backup.cc sql/backup/kernel.cc sql/backup/logger.cc sql/backup/logger.h sql/backup/stream.cc sql/backup/stream.h sql/backup/stream_services.h sql/backup/stream_v1.c sql/backup/stream_v1.h sql/backup/stream_v1_transport.c sql/ddl_blocker.cc sql/ddl_blocker.h sql/handler.cc sql/hostname.cc sql/item.cc sql/item_func.cc sql/item_xmlfunc.cc sql/lex.h sql/lock.cc sql/mysql_priv.h sql/mysqld.cc sql/set_var.cc sql/set_var.h sql/share/charsets/cp866.xml sql/share/errmsg.txt sql/si_objects.cc sql/si_objects.h sql/sql_array.h sql/sql_base.cc sql/sql_bitmap.h sql/sql_cache.cc sql/sql_class.cc sql/sql_class.h sql/sql_delete.cc sql/sql_insert.cc sql/sql_lex.h sql/sql_load.cc sql/sql_parse.cc sql/sql_repl.cc sql/sql_repl.h sql/sql_string.cc sql/sql_table.cc sql/sql_yacc.yy storage/archive/azio.h storage/falcon/BackLog.cpp storage/falcon/Configuration.cpp storage/falcon/Configuration.h storage/falcon/Database.cpp storage/falcon/DatabaseClone.cpp storage/falcon/Dbb.cpp storage/falcon/Dbb.h storage/falcon/IO.cpp storage/falcon/IOx.h storage/falcon/RepositoryVolume.cpp storage/falcon/SQLParse.cpp storage/falcon/SRLCreateTableSpace.cpp storage/falcon/SRLCreateTableSpace.h storage/falcon/Statement.cpp storage/falcon/StorageHandler.cpp storage/falcon/StorageHandler.h storage/falcon/TableSpace.cpp storage/falcon/TableSpace.h storage/falcon/TableSpaceManager.cpp storage/falcon/TableSpaceManager.h storage/falcon/ha_falcon.cpp storage/innobase/include/univ.i storage/myisam/CMakeLists.txt storage/myisam/Makefile.am storage/myisam/ft_parser.c storage/myisam/ft_update.c storage/myisam/ftdefs.h storage/myisam/ha_myisam.cc storage/myisam/ha_myisam.h storage/myisam/mi_check.c storage/myisam/mi_close.c storage/myisam/mi_create.c storage/myisam/mi_delete.c storage/myisam/mi_delete_all.c storage/myisam/mi_dynrec.c storage/myisam/mi_extra.c storage/myisam/mi_locking.c storage/myisam/mi_log.c storage/myisam/mi_open.c storage/myisam/mi_page.c storage/myisam/mi_panic.c storage/myisam/mi_rrnd.c storage/myisam/mi_static.c storage/myisam/mi_test2.c storage/myisam/mi_test3.c storage/myisam/mi_test_all.sh storage/myisam/mi_update.c storage/myisam/mi_write.c storage/myisam/myisam_ftdump.c storage/myisam/myisamchk.c storage/myisam/myisamdef.h storage/myisam/myisamlog.c storage/myisam/myisampack.c storage/myisammrg/ha_myisammrg.cc storage/myisammrg/myrg_info.c storage/myisammrg/myrg_open.c storage/myisammrg/myrg_queue.c storage/myisammrg/myrg_rrnd.c strings/ctype-big5.c strings/ctype-extra.c strings/ctype-gb2312.c strings/ctype-gbk.c strings/ctype-ucs2.c strings/ctype-utf8.c support-files/my-huge.cnf.sh support-files/my-large.cnf.sh support-files/my-medium.cnf.sh win/configure.js mysql-test/suite/falcon/r/falcon_bug_23962.result mysql-test/suite/falcon/r/falcon_bug_37080.result mysql-test/suite/falcon/t/falcon_bug_23962.test mysql-test/suite/falcon/t/falcon_bug_37080.test sql/backup/image_info.cc sql/backup/image_info.h === modified file 'storage/falcon/Makefile.am' === modified file 'storage/falcon/Makefile.am' --- a/storage/falcon/Makefile.am 2008-07-19 03:03:39 +0000 +++ b/storage/falcon/Makefile.am 2008-07-23 12:19:47 +0000 @@ -22,9 +22,8 @@ -D_REENTRANT -D_PTHREADS -DFALCONDB -DSTORAGE_ENGINE -DNAMESPACE=Nfs INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include \ - -I$(top_srcdir)/regex -I$(top_srcdir)/sql \ - -I$(srcdir) -I$(srcdir)/TransformLib @ZLIB_INCLUDES@ \ - @FALCON_SPARC_ASSEMBLY@ + -I$(top_srcdir)/regex -I$(top_srcdir)/sql -I$(srcdir) \ + -I$(srcdir)/TransformLib @ZLIB_INCLUDES@ @FALCON_SPARC_ASSEMBLY@ falcon_headers= Agent.h Alias.h Application.h \ AsciiBlob.h \