From: kevin.lewis
Date: July 12 2010 3:53pm
Subject: bzr push into mysql-next-mr branch (kevin.lewis:3158 to 3159) WL#4034
List-Archive: http://lists.mysql.com/commits/113371
Message-Id: <20100712155323.DF0333C4512@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0951343845=="

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

 3159 kevin.lewis@stripped	2010-07-12
      WL#4034 - Add a a constructor to explicitly set m_object_state.

    modified:
      sql/table_share_builder.cc
      sql/table_share_builder.h
 3158 kevin.lewis@stripped	2010-07-09
      WL#4034 - Move the table_space_builder code from infoschema_base to 
      its own file and add to the sql project so that other storage engines can 
      use this code as part of using the new discovery method.  
      Renamed that new discovery from handlerton::discover_volatile to 
      ::discover_without_frm() to reflect a more exact differentiation from
      ::discover()
      sql_show.cc and sql_db.cc - code cleanup for clarity and ease of debugging.

    added:
      sql/table_share_builder.cc
      sql/table_share_builder.h
    modified:
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/handler.cc
      sql/handler.h
      sql/sql_db.cc
      sql/sql_show.cc
      storage/infoschema/ha_infoschema.cc
      storage/infoschema/infoschema_base.cc
      storage/infoschema/infoschema_base.h
=== modified file 'sql/table_share_builder.cc'
--- a/sql/table_share_builder.cc	2010-07-09 19:03:58 +0000
+++ b/sql/table_share_builder.cc	2010-07-12 15:48:26 +0000
@@ -35,6 +35,12 @@
 #include "sql_base.h"
 #include "table_share_builder.h"
 
+table_share_builder::table_share_builder()
+{
+  m_object_state= UNINITIALIZED;
+}
+
+
 int table_share_builder::initialize(const char *db_name,
                                     const char *table_name,
                                     const char *table_comment,

=== modified file 'sql/table_share_builder.h'
--- a/sql/table_share_builder.h	2010-07-09 19:03:58 +0000
+++ b/sql/table_share_builder.h	2010-07-12 15:48:26 +0000
@@ -52,8 +52,7 @@ enum table_share_builder_states
 class table_share_builder
 {
 public:
-  table_share_builder()
-  {}
+  table_share_builder();
   ~table_share_builder()
   {}
 


--===============0951343845==
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: b31ea045cb066116326a47b04c26dc8a9d4863d1
# timestamp: 2010-07-12 10:53:23 -0500
# source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\
#   mr/
# base_revision_id: kevin.lewis@stripped\
#   eomhe3i2bgduruhl
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcFh7R8AAgFfgEAQWGP//3Yl
BpC////6UAQ54pQvYaAqqOaYmABMAEwAAmAAJhzTEwAJgAmAAEwABMEkgJqm9J6gp+mpqemjKekB
6h6mmQGQ2oNNVD1ANBoAZBoabUPUDQaNDASSI0NAAQaTI0BT9UNBpmTCnqaMHO+2vFvt+tDNplzf
dN0cM8aiGLnRxxjCb53wKUznxOkZmZj8d54wm/I8y2dlg6Mnv17vpyMe4+/nG23SeTIi9wPustMv
PAw6i+fAHsI+lJX39o705M1XeHqhepiBQjjs4jS5bdxdyGCOx3BJNSJYDTyGhII3ta5AbijJAP/F
RWdEYyPJkBnFxKgkCihalBwLSeLzcWQx1xQHHpMdnJz+jMBKeFs1qHAiGReNZgQzuuqxDVkXlR7g
NUbspy+bOjYuRYgO6MwFmu7aU6gQho5DdRejPWaKhfeUE3taZcGFvIlxUXgS2l1IxMhSQEyUdJij
0GouGAjma5x89riqWWz7So41R+QJzQuLAKdKx4qV1EK7Kqfk5FFLQlmGTgPkdfZYBgjB6lNCxEQw
gbAITVVttmA3OMWpM3K15Ssy+dX2hVWNbU4vKQxoQEW6Ew6gjgsK3hZUYnB1gGEUMXASPHsTvHg4
wxc+nItO0gi+sEGSsNLqFCZgbzRLoNsq4wLqtNK7M9RHANQqRSCneq0GeWJkWbBOAYUFEPQhYRIs
6hXBBJiDvj29j+/j3+KSnY6KC/EclyLvrISIGCc4hILXsIHX+Z0H17RKWlyP6sIPidKkFCVpAbxr
49Og88DyylMpU1iP1LUG35Qc18MV9DcUHiBUBeXvsPvJ/GJDfqYMwlMJYcbCjzKX1mHH9yi0hYXW
/QeGcQ36EkEUgU7acgMGdM3JurzREA3sdw2zgjlhBT7KlPYd5twkcO8EFBQhkHMricjWTic5Zmw9
BuDHXZi3Zi4vX+Jg80SoM9HUcOER9glQi4S77qUTeWdVxmc9e03G0ld3k0FHFZHyeBgamLjrJ0dw
pCJicbTektEUeKNptLQcYsRRvN9nV+iNR00VSgvE8y5CXFFvruwfkjwA9BKdGzZKZbDYbziZk5OV
o+x5JhxuR6KkLbEWPDsSKRJjyBi1A7kJc+zTqjw6IXQ/JyO5UEudo5G3sHcCEFMaungwk1gyiTKR
D5O0DryhHAUmBlW2U1k9QlNDTR73QJ8xJkULRypp3F+LDA9Samk+cpDkB4EVA2RxJ2QTDPSDqiAU
2ZVLVNVOJnhfKULIxAeuKThKGeUL6sb2pSJ0MTh48yB7xIE6Lmwkfo9w4NSWvtpZlhnVC60w3/I5
EsOy8wutVGYGk4I4mqAvSg6+BdFHMiRWxIIAdpEB4lriOSfkxIdeV6htP/F3JFOFCQwWHtHw


--===============0951343845==--