From: kevin.lewis
Date: July 12 2010 8:31pm
Subject: bzr commit into mysql-next-mr branch (kevin.lewis:3164) WL#4034
List-Archive: http://lists.mysql.com/commits/113402
Message-Id: <20100712203158.219CB3D340D@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1458355292=="

--===============1458355292==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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);
 }
-
-
-
-
-
-


--===============1458355292==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/kevin.lewis@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kevin.lewis@stripped
# target_branch: file:///Users/kevinlewis/Work/Mysql/Merge/mysql-next-\
#   mr-wl4034/
# testament_sha1: 35c7bedca812beae23836e97ec05ceed524e891f
# timestamp: 2010-07-12 15:31:57 -0500
# source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\
#   mr/
# base_revision_id: kevin.lewis@stripped\
#   whbbkyzp12z25opu
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZfUBR0AAul/gAAxBABcY//3
fyY95L////BQBTi82wGk7m7RtjBBJSKejE0yj2iYkyehBoyabRHqNAAAGqaRptE2po0aaaDJoAaG
gDJownqMgSKAkZT0yTRqeSMamTEBhMgG1DQaDmjJiYAJiMCNMCDEYJkwCMEkhANNAJPQnlNU8UH5
UeoHqBoyNAyGzNmPCGfHgrm8sIrbXTZtNUOrcCmS66RdqmlrYiqySMrlFXTj2V7t4DZO7JpXcsE2
202Gf6Jb8qsxlshHGcM1M8SdITZKkYxcnd0rq6sb9nft+aNvjqs0rwagw42L5bplK6cUjKlRMq7r
0Yt5glbaZdA2RjrUq4k0iN8QUiJz6OvXBYefkgbf37arLWWPgGQMgPfagH8FNNCtyd1Yu2oBbsKT
RcgUwi3FAn/wOEUkEEmUGJRQRInPTjJorRU4C8yJErEForWrnyp1ZrqBbOzgKjlysceegJhJ1+/L
RLL8LAg9yEmmfRGDxFF1xQgrLCo9ZvQluy1JK2ZYENK3Dcgdm7iRQKwR2mnErbtOXMi8YsvwHjkE
j/k99k+s8bphcUFYw5Vdw1rmseWXiNK6UDTsmIPNB2YiaWCyy5XVjE00S+01sIaCOg6WDsZymNtD
evPJA9BRoZU64FE9Ai1OKR5JLANrj+0HBxaNw6oHCLItMMgurETTKBbC/XEUsTSLSHDzzENiQORd
JW50UQfoMgyQWFWIQJ8n2QVbYFZzxxRPQXlRmmTNaDLux3qOFwlEaCUnuyIUmTOKhlKJYwJyiikh
sgbCwRB2xaPiVkxrxc87kzBW0YW5wINnlEwuNO41hpatdFIYwqLjBVOsI54lReFM47qcBGXPVq94
ZLMzoBXREKkEOrmExUq+sN0OfDIxt51ypqI9XwXZWz0oB9YWFo20zpPrOPb+uiv2JjKgoVCY6hYF
nridarKxbtLmzjwJRUmICGPcKcMbig5r3CzBMJ1Y3ExgsW2xPC3a9e1/Yhj4Gc1GnVAXeKfrjE+R
yAi/tsdlYKhRG5oTqK5TPFK4o0FyFMjWaYssQe/WdprIxLyh2UvUjRVYCqg8Tg6QVpNnYQuXf67G
JKVJ0O8OZmV/CO1W3ZdBYQZAQgrEBnBUXTQNheQ0eQ5FhKLiTSctGl4jcqGGQKiDtpEVZcgC9jKJ
34HRzrmnEY3O3Dl5qKrHt5M79ZIKRVHk/MsGLzTLFsLA5lvFoYOLRaB8UyJZZsvC7PjYOgrkBULN
AX1JUeBFabD9cyY4pxtBHPniH5/BcQ2L0KzPA5ICfFrLtohpT8k7jezCHrAYc6tgK9BJUQ4XHIr2
dJm9SDUJwibnyICusUmhZ7Y+f8x0P0ivWJggLheny+RQuOyDvN0WixMwZOMhZr4m4XxFF4ScvFK1
AMqRMnckBzu4cViqvEmCABWg3QbyFnp0VFKbhgYs+EArbImGCZyAZyvIBHFVICjOsUpQxmpbiTaJ
wV/ByIOMzbNKQbjLBc7U7HzLvQEUum5aoqAsMi34aN9poiGuWsnblnWiwNGBl3l60DVEBNNK6pCK
CzTuBGvFRYwvlIHJb6d6AdsxTtsTNTIKomqo5Ngi/h6Oatt7hjcK5/7PWEK4yUhW7E3LK5YcKuFs
t0PivIKeGVKQXJ1D0X+OncrTsg8OxTWysSRWcl4vQDs3ASWwjfsvpWAj0QcIhVuv/F3JFOFCQl9Q
FHQ=


--===============1458355292==--