Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2

into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge

4 files changed, 6 insertions, 6 deletions

diff --git a/sql/examples/ha_example.cc b/sql/examples/ha_example.cc
index 471ece77490..92e5469a832 100644
--- a/sql/examples/ha_example.cc
+++ b/sql/examples/ha_example.cc
@@ -523,10 +523,10 @@ int ha_example::rnd_pos(byte * buf, byte *pos)
     sql_update.cc
 
 */
-void ha_example::info(uint flag)
+int ha_example::info(uint flag)
 {
   DBUG_ENTER("ha_example::info");
-  DBUG_VOID_RETURN;
+  DBUG_RETURN(0);
 }
 
 
diff --git a/sql/examples/ha_example.h b/sql/examples/ha_example.h
index 37f38fe5210..f18063f6c32 100644
--- a/sql/examples/ha_example.h
+++ b/sql/examples/ha_example.h
@@ -136,7 +136,7 @@ public:
   int rnd_next(byte *buf);                                      //required
   int rnd_pos(byte * buf, byte *pos);                           //required
   void position(const byte *record);                            //required
-  void info(uint);                                              //required
+  int info(uint);                                              //required
 
   int extra(enum ha_extra_function operation);
   int reset(void);
diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc
index f727cefc6d0..7fb2de9ca30 100644
--- a/sql/examples/ha_tina.cc
+++ b/sql/examples/ha_tina.cc
@@ -792,13 +792,13 @@ int ha_tina::rnd_pos(byte * buf, byte *pos)
   Currently this table handler doesn't implement most of the fields
   really needed. SHOW also makes use of this data
 */
-void ha_tina::info(uint flag)
+int ha_tina::info(uint flag)
 {
   DBUG_ENTER("ha_tina::info");
   /* This is a lie, but you don't want the optimizer to see zero or 1 */
   if (!records_is_known && records < 2) 
     records= 2;
-  DBUG_VOID_RETURN;
+  DBUG_RETURN(0);
 }
 
 /*
diff --git a/sql/examples/ha_tina.h b/sql/examples/ha_tina.h
index 97659f99dd9..3bd6405b3f8 100644
--- a/sql/examples/ha_tina.h
+++ b/sql/examples/ha_tina.h
@@ -105,7 +105,7 @@ public:
   int rnd_pos(byte * buf, byte *pos);
   int rnd_end();
   void position(const byte *record);
-  void info(uint);
+  int info(uint);
   int extra(enum ha_extra_function operation);
   int reset(void);
   int external_lock(THD *thd, int lock_type);