bk commit into 5.1 tree (tomas:1.2552)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-21 16:30:41+02:00, tomas@stripped +2 -0
  manual merge

  sql/field.h@stripped, 2007-08-21 16:30:38+02:00, tomas@stripped +0 -4
    manual merge

  sql/sql_show.cc@stripped, 2007-08-21 16:30:38+02:00, tomas@stripped +1 -1
    manual merge

diff -Nrup a/sql/field.h b/sql/field.h
--- a/sql/field.h	2007-08-21 15:54:57 +02:00
+++ b/sql/field.h	2007-08-21 16:30:38 +02:00
@@ -1199,7 +1199,6 @@ public:
   uchar *pack(uchar *to, const uchar *from, uint max_length=~(uint) 0);
   virtual const uchar *unpack(uchar* to, const uchar *from, uint param_data);
   const uchar *unpack(uchar* to, const uchar *from);
-  virtual const uchar *unpack(uchar* to, const uchar *from, uint param_data);
   int pack_cmp(const uchar *a,const uchar *b,uint key_length,
                my_bool insert_or_update);
   int pack_cmp(const uchar *b,uint key_length,my_bool insert_or_update);
@@ -1277,7 +1276,6 @@ public:
                                  uint max_length);
   virtual const uchar *unpack(uchar* to, const uchar *from, uint param_data);
   const uchar *unpack(uchar* to, const uchar *from);
-  virtual const uchar *unpack(uchar* to, const uchar *from, uint param_data);
   const uchar *unpack_key(uchar* to, const uchar *from, uint max_length);
   int pack_cmp(const uchar *a, const uchar *b, uint key_length,
                my_bool insert_or_update);
@@ -1450,7 +1448,6 @@ public:
                                  uint max_length);
   virtual const uchar *unpack(uchar *to, const uchar *from, uint param_data);
   const uchar *unpack(uchar *to, const uchar *from);
-  virtual const uchar *unpack(uchar *to, const uchar *from, uint param_data);
   const uchar *unpack_key(uchar* to, const uchar *from, uint max_length);
   int pack_cmp(const uchar *a, const uchar *b, uint key_length,
                my_bool insert_or_update);
@@ -1629,7 +1626,6 @@ public:
   uchar *pack(uchar *to, const uchar *from, uint max_length=~(uint) 0);
   virtual const uchar *unpack(uchar *to, const uchar *from, uint param_data);
   const uchar *unpack(uchar* to, const uchar *from);
-  virtual const uchar *unpack(uchar *to, const uchar *from, uint param_data);
   virtual void set_default();
 
   Field *new_key_field(MEM_ROOT *root, struct st_table *new_table,
diff -Nrup a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc	2007-08-21 15:54:58 +02:00
+++ b/sql/sql_show.cc	2007-08-21 16:30:38 +02:00
@@ -3029,7 +3029,7 @@ static int fill_schema_table_from_frm(TH
           open_table_from_share(thd, &share, table_name->str, 0,
                                 (READ_KEYINFO | COMPUTE_TYPES |
                                  EXTRA_RECORD | OPEN_FRM_FILE_ONLY),
-                                thd->open_options, &tbl, FALSE))
+                                thd->open_options, &tbl, OTM_OPEN))
       {
         share.tmp_table= INTERNAL_TMP_TABLE;
         free_table_share(&share);