Fixes for innobase

Added test for ALTER TABLE ORDER BY

6 files changed, 8 insertions, 3 deletions

diff --git a/innobase/Makefile.am b/innobase/Makefile.am
index 0b65ac09f2b..99c5cc40429 100644
--- a/innobase/Makefile.am
+++ b/innobase/Makefile.am
@@ -24,3 +24,5 @@ SUBDIRS =		os ut btr buf com data dict dyn eval fil fsp fut \
 			ha ibuf lock log mach mem mtr odbc page pars que \
 			read rem row srv sync thr trx usr
 
+# Don't update the files from bitkeeper
+%::SCCS/s.%
diff --git a/innobase/btr/Makefile.am b/innobase/btr/Makefile.am
index d62316f0544..6e3dd4fb007 100644
--- a/innobase/btr/Makefile.am
+++ b/innobase/btr/Makefile.am
@@ -22,4 +22,3 @@ libs_LIBRARIES =	libbtr.a
 libbtr_a_SOURCES =	btr0btr.c btr0cur.c btr0pcur.c btr0sea.c
 
 EXTRA_PROGRAMS =	
-
diff --git a/innobase/data/Makefile.am b/innobase/data/Makefile.am
index ce2e262d78b..0e502708e85 100644
--- a/innobase/data/Makefile.am
+++ b/innobase/data/Makefile.am
@@ -22,4 +22,3 @@ libs_LIBRARIES =	libdata.a
 libdata_a_SOURCES =	data0data.c data0type.c
 
 EXTRA_PROGRAMS =	
-
diff --git a/innobase/eval/Makefile.am b/innobase/eval/Makefile.am
index 748980b6192..5dd0eab4c9b 100644
--- a/innobase/eval/Makefile.am
+++ b/innobase/eval/Makefile.am
@@ -22,4 +22,3 @@ libs_LIBRARIES =	libeval.a
 libeval_a_SOURCES =	eval0eval.c eval0proc.c
 
 EXTRA_PROGRAMS =	
-
diff --git a/innobase/include/Makefile.i b/innobase/include/Makefile.i
index 2bc51147347..8c7e9910f26 100644
--- a/innobase/include/Makefile.i
+++ b/innobase/include/Makefile.i
@@ -3,3 +3,6 @@
 libsdir = ../libs
 
 INCLUDES =		-I../../include -I../include
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
diff --git a/innobase/os/Makefile.am b/innobase/os/Makefile.am
index b517cac1cc8..b06670bc703 100644
--- a/innobase/os/Makefile.am
+++ b/innobase/os/Makefile.am
@@ -22,3 +22,6 @@ libs_LIBRARIES =	libos.a
 libos_a_SOURCES =	os0proc.c os0shm.c os0sync.c os0thread.c os0file.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%