mysql-5.5.18 merge

1 files changed, 6 insertions, 3 deletions

diff --git a/include/heap.h b/include/heap.h
index b23ec47db67..6ce95c88521 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2000, 2011, Oracle and/or its affiliates. All rights 
-   reserved
+/*
+   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
 /* This file should be included when using heap_database_functions */
 /* Author: Michael Widenius */
@@ -50,6 +51,7 @@ typedef struct st_heapinfo		/* Struct from heap_info */
   uint reclength;			/* Length of one record */
   int errkey;
   ulonglong auto_increment;
+  time_t create_time;
 } HEAPINFO;
 
 
@@ -148,6 +150,7 @@ typedef struct st_heap_share
   uint open_count;
   uchar *del_link;			/* Link to next block with del. rec */
   char * name;			/* Name of "memory-file" */
+  time_t create_time;
   THR_LOCK lock;
   mysql_mutex_t intern_lock;            /* Locking for use with _locking */
   my_bool delete_on_close;