Merge work:/home/bk/mysql-4.0 (13578a9c) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+84 −79

Original line number	Diff line number	Diff line
		@@ -59,9 +59,17 @@ PENDING/*
		TAGS
		aclocal.m4
		bdb/README
		bdb/btree/btree_auto.c
		bdb/build_unix/*
		bdb/build_vxworks/db.h
		bdb/build_vxworks/db_int.h
		bdb/build_win32/db.h
		bdb/build_win32/db_int.h
		bdb/build_win32/include.tcl
		bdb/build_win32/libdb.rc
		bdb/db/crdel_auto.c
		bdb/db/db_auto.c
		bdb/dist/config.hin
		bdb/dist/configure
		bdb/dist/tags
		bdb/dist/template/rec_btree
		@@ -94,6 +102,7 @@ bdb/txn/txn_auto.c
		client/insert_test
		client/mysql
		client/mysqladmin
		client/mysqlcheck
		client/mysqldump
		client/mysqlimport
		client/mysqlshow
		@@ -122,6 +131,8 @@ heap/hp_test2
		include/my_config.h
		include/my_global.h
		include/mysql_version.h
		innobase/ib_config.h
		innobase/ib_config.h.in
		isam/isamchk
		isam/isamlog
		isam/pack_isam
		@@ -137,11 +148,82 @@ libmysql_r/acconfig.h
		libmysql_r/conf_to_src
		libmysql_r/my_static.h
		libmysql_r/mysys_priv.h
		libmysqld/convert.cc
		libmysqld/derror.cc
		libmysqld/errmsg.c
		libmysqld/field.cc
		libmysqld/field_conv.cc
		libmysqld/filesort.cc
		libmysqld/get_password.c
		libmysqld/ha_berkeley.cc
		libmysqld/ha_heap.cc
		libmysqld/ha_isam.cc
		libmysqld/ha_isammrg.cc
		libmysqld/ha_myisam.cc
		libmysqld/ha_myisammrg.cc
		libmysqld/handler.cc
		libmysqld/hostname.cc
		libmysqld/init.cc
		libmysqld/item.cc
		libmysqld/item_buff.cc
		libmysqld/item_cmpfunc.cc
		libmysqld/item_create.cc
		libmysqld/item_func.cc
		libmysqld/item_strfunc.cc
		libmysqld/item_sum.cc
		libmysqld/item_timefunc.cc
		libmysqld/item_uniq.cc
		libmysqld/key.cc
		libmysqld/lock.cc
		libmysqld/log.cc
		libmysqld/log_event.cc
		libmysqld/md5.c
		libmysqld/mini_client.cc
		libmysqld/net_pkg.cc
		libmysqld/net_serv.cc
		libmysqld/opt_ft.cc
		libmysqld/opt_range.cc
		libmysqld/opt_sum.cc
		libmysqld/password.c
		libmysqld/procedure.cc
		libmysqld/records.cc
		libmysqld/slave.cc
		libmysqld/sql_acl.cc
		libmysqld/sql_analyse.cc
		libmysqld/sql_base.cc
		libmysqld/sql_cache.cc
		libmysqld/sql_class.cc
		libmysqld/sql_crypt.cc
		libmysqld/sql_db.cc
		libmysqld/sql_delete.cc
		libmysqld/sql_handler.cc
		libmysqld/sql_insert.cc
		libmysqld/sql_lex.cc
		libmysqld/sql_list.cc
		libmysqld/sql_load.cc
		libmysqld/sql_manager.cc
		libmysqld/sql_map.cc
		libmysqld/sql_parse.cc
		libmysqld/sql_rename.cc
		libmysqld/sql_repl.cc
		libmysqld/sql_select.cc
		libmysqld/sql_show.cc
		libmysqld/sql_string.cc
		libmysqld/sql_table.cc
		libmysqld/sql_test.cc
		libmysqld/sql_udf.cc
		libmysqld/sql_update.cc
		libmysqld/sql_yacc.cc
		libmysqld/table.cc
		libmysqld/thr_malloc.cc
		libmysqld/time.cc
		libmysqld/unireg.cc
		libtool
		linked_client_sources
		linked_include_sources
		linked_libmysql_r_sources
		linked_libmysql_sources
		linked_libmysqld_sources
		linked_server_sources
		myisam/ft_dump
		myisam/ft_eval
		@@ -159,6 +241,7 @@ mysql-test/mysql-test-run
		mysql-test/r/*.reject
		mysql-test/share/mysql
		mysql-test/var/*
		mysql.proj
		mysqld.S
		mysqld.sym
		mysys/test_charset
		@@ -188,6 +271,7 @@ scripts/mysqldumpslow
		scripts/mysqlhotcopy
		scripts/safe_mysqld
		sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
		sql-bench/bench-count-distinct
		sql-bench/bench-init.pl
		sql-bench/compare-results
		sql-bench/copy-db
		@@ -236,82 +320,3 @@ support-files/mysql.server
		support-files/mysql.spec
		tags
		tmp/*
		bdb/btree/btree_auto.c
		bdb/build_vxworks/db_int.h
		bdb/build_win32/db_int.h
		bdb/build_win32/include.tcl
		bdb/build_win32/libdb.rc
		bdb/db/crdel_auto.c
		bdb/db/db_auto.c
		bdb/dist/config.hin
		libmysqld/convert.cc
		libmysqld/derror.cc
		libmysqld/errmsg.c
		libmysqld/field.cc
		libmysqld/field_conv.cc
		libmysqld/filesort.cc
		libmysqld/get_password.c
		libmysqld/ha_berkeley.cc
		libmysqld/ha_heap.cc
		libmysqld/ha_isam.cc
		libmysqld/ha_isammrg.cc
		libmysqld/ha_myisam.cc
		libmysqld/ha_myisammrg.cc
		libmysqld/handler.cc
		libmysqld/hostname.cc
		libmysqld/init.cc
		libmysqld/item.cc
		libmysqld/item_buff.cc
		libmysqld/item_cmpfunc.cc
		libmysqld/item_create.cc
		libmysqld/item_func.cc
		libmysqld/item_strfunc.cc
		libmysqld/item_sum.cc
		libmysqld/item_timefunc.cc
		libmysqld/item_uniq.cc
		libmysqld/key.cc
		libmysqld/lock.cc
		libmysqld/log.cc
		libmysqld/log_event.cc
		libmysqld/md5.c
		libmysqld/mini_client.cc
		libmysqld/net_pkg.cc
		libmysqld/net_serv.cc
		libmysqld/opt_ft.cc
		libmysqld/opt_range.cc
		libmysqld/opt_sum.cc
		libmysqld/password.c
		libmysqld/procedure.cc
		libmysqld/records.cc
		libmysqld/slave.cc
		libmysqld/sql_acl.cc
		libmysqld/sql_analyse.cc
		libmysqld/sql_base.cc
		libmysqld/sql_cache.cc
		libmysqld/sql_class.cc
		libmysqld/sql_crypt.cc
		libmysqld/sql_db.cc
		libmysqld/sql_delete.cc
		libmysqld/sql_insert.cc
		libmysqld/sql_lex.cc
		libmysqld/sql_list.cc
		libmysqld/sql_load.cc
		libmysqld/sql_manager.cc
		libmysqld/sql_map.cc
		libmysqld/sql_parse.cc
		libmysqld/sql_rename.cc
		libmysqld/sql_repl.cc
		libmysqld/sql_select.cc
		libmysqld/sql_show.cc
		libmysqld/sql_string.cc
		libmysqld/sql_table.cc
		libmysqld/sql_test.cc
		libmysqld/sql_udf.cc
		libmysqld/sql_update.cc
		libmysqld/sql_yacc.cc
		libmysqld/table.cc
		libmysqld/thr_malloc.cc
		libmysqld/time.cc
		libmysqld/unireg.cc
		linked_libmysqld_sources
		sql-bench/bench-count-distinct

BUILD/SETUP.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,8 +43,8 @@ alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet
		pentium_cflags="-mpentiumpro"
		sparc_cflags=""

		fast_cflags="-O6 -fno-omit-frame-pointer"
		reckless_cflags="-O6 -fomit-frame-pointer"
		fast_cflags="-O3 -fno-omit-frame-pointer"
		reckless_cflags="-O3 -fomit-frame-pointer -ffixed-ebp"
		debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O2"

		base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"

BUILD/compile-ia64-O0

deleted100644 → 0

+0 −12

Original line number	Diff line number	Diff line
		make -k clean
		/bin/rm -f /.deps/.P config.cache

		aclocal; autoheader; aclocal; automake; autoconf

		CFLAGS="-O0 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O0 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
		make
		strip sql/mysqld

BUILD/compile-ia64-O0-sgicc

deleted100644 → 0

+0 −12

Original line number	Diff line number	Diff line
		make -k clean
		/bin/rm -f /.deps/.P config.cache

		aclocal; autoheader; aclocal; automake; autoconf

		CC=sgicc CFLAGS="-O0" CXX=sgicc CXXFLAGS="-O0" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
		make
		strip sql/mysqld

BUILD/compile-ia64-O2

deleted100644 → 0

+0 −12

Original line number	Diff line number	Diff line
		make -k clean
		/bin/rm -f /.deps/.P config.cache

		aclocal; autoheader; aclocal; automake; autoconf

		CFLAGS="-O2 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O2 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
		make
		strip sql/mysqld