bzr commit into mysql-next-mr branch (kevin.lewis:3164) WL#4034

[kevin.lewis]

#At file:///Users/kevinlewis/Work/Mysql/Merge/mysql-next-mr-wl4034/ based on revid:kevin.lewis@stripped

 3164 kevin.lewis@stripped	2010-07-12
      WL#4034 - More changes to storage/infoschema/Makefile.am and
      some cleanup

    modified:
      storage/infoschema/Makefile.am
      storage/infoschema/table_character_sets.cc
      storage/infoschema/table_collations.cc
=== modified file 'storage/infoschema/Makefile.am'
--- a/storage/infoschema/Makefile.am	2010-07-12 18:52:42 +0000
+++ b/storage/infoschema/Makefile.am	2010-07-12 20:31:48 +0000
@@ -22,12 +22,13 @@ MYSQLLIBdir=            $(pkglibdir)
 pkgplugindir =		$(pkglibdir)/plugin
 AM_CPPFLAGS =           -I$(top_srcdir)/include \
 			-I$(top_srcdir)/regex \
-			-I$(top_srcdir)/sql 
+			-I$(top_srcdir)/sql \
+                        -I$(srcdir)
 WRAPLIBS=
 
 LDADD =
 
-DEFS =                  @DEFS@
+DEFS =                  -DMYSQL_SERVER @DEFS@
 
 noinst_HEADERS = \
 	ha_infoschema.h \
@@ -53,8 +54,6 @@ noinst_HEADERS = \
 	table_tables.h \
 	table_triggers.h
 
-EXTRA_LIBRARIES =	libinfoschema.a
-noinst_LIBRARIES =	@plugin_infoschema_static_target@
 libinfoschema_a_SOURCES= \
 	ha_infoschema.cc \
 	infoschema_base.cc \
@@ -79,4 +78,6 @@ libinfoschema_a_SOURCES= \
 	table_tables.cc \
 	table_triggers.cc
 
-EXTRA_DIST =		CMakeLists.txt plug.in
+EXTRA_LIBRARIES = libinfoschema.a
+noinst_LIBRARIES = @plugin_infoschema_static_target@
+EXTRA_DIST = plug.in CMakeLists.txt

=== modified file 'storage/infoschema/table_character_sets.cc'
--- a/storage/infoschema/table_character_sets.cc	2010-06-09 18:42:52 +0000
+++ b/storage/infoschema/table_character_sets.cc	2010-07-12 20:31:48 +0000
@@ -138,5 +138,3 @@ int table_character_sets::rnd_pos(const 
 
   DBUG_RETURN(HA_ERR_RECORD_DELETED);
 }
-
-

=== modified file 'storage/infoschema/table_collations.cc'
--- a/storage/infoschema/table_collations.cc	2010-06-09 18:42:52 +0000
+++ b/storage/infoschema/table_collations.cc	2010-07-12 20:31:48 +0000
@@ -71,6 +71,7 @@ int table_collations::rnd_init(bool scan
 int table_collations::rnd_next(TABLE *table, THD *thd)
 {
   DBUG_ENTER("table_collations::rnd_next");
+
   const char *wild= thd->lex->wild ? thd->lex->wild->ptr() : NullS;
   CHARSET_INFO *scs= system_charset_info;
 
@@ -165,11 +166,6 @@ int table_collations::rnd_pos(const ucha
     dbug_tmp_restore_column_map(table->write_set, old);
     DBUG_RETURN(0);
   }
+
   DBUG_RETURN(HA_ERR_RECORD_DELETED);
 }
-
-
-
-
-
-


Attachment: [text/bzr-bundle] bzr/[e-mail]