--- mysql.c.in.orig	2006-05-31 14:33:38.000000000 +0200
+++ mysql.c.in	2006-05-31 14:24:51.000000000 +0200
@@ -1010,19 +1010,15 @@
     return ary;
 }
 
-/*	fetch_hash2 (internal)	*/
-static VALUE fetch_hash2(VALUE obj, VALUE with_table)
+/*      fetch field names     */
+static VALUE fetch_field_names(VALUE obj, VALUE with_table)
 {
     MYSQL_RES* res = GetMysqlRes(obj);
     unsigned int n = mysql_num_fields(res);
-    MYSQL_ROW row = mysql_fetch_row(res);
-    unsigned long* lengths = mysql_fetch_lengths(res);
     MYSQL_FIELD* fields = mysql_fetch_fields(res);
     unsigned int i;
-    VALUE hash;
-    if (row == NULL)
-	return Qnil;
-    hash = rb_hash_new();
+    VALUE ary;
+    ary = rb_ary_new2(n);
     for (i=0; i<n; i++) {
 	VALUE col;
 	if (with_table == Qnil || with_table == Qfalse)
@@ -1032,6 +1028,25 @@
 	    RSTRING(col)->ptr[strlen(fields[i].table)] = '.';
 	    strcpy(RSTRING(col)->ptr+strlen(fields[i].table)+1, fields[i].name);
 	}
+	rb_ary_store(ary, i, col);
+    }
+    return ary;
+}
+
+/*	fetch_hash2 (internal)	*/
+static VALUE fetch_hash2(VALUE obj, VALUE field_names)
+{
+    MYSQL_RES* res = GetMysqlRes(obj);
+    MYSQL_ROW row = mysql_fetch_row(res);
+    unsigned long* lengths = mysql_fetch_lengths(res);
+    unsigned int n = RARRAY(field_names)->len;
+    unsigned int i;
+    VALUE hash;
+    if (row == NULL)
+	return Qnil;
+    hash = rb_hash_new();
+    for (i=0; i<n; i++) {
+	VALUE col = rb_ary_entry(field_names, i);
 	rb_hash_aset(hash, col, row[i]? rb_tainted_str_new(row[i], lengths[i]): Qnil);
     }
     return hash;
@@ -1045,7 +1060,7 @@
     rb_scan_args(argc, argv, "01", &with_table);
     if (with_table == Qnil)
 	with_table = Qfalse;
-    return fetch_hash2(obj, with_table);
+    return fetch_hash2(obj, fetch_field_names(obj, with_table));
 }
 
 /*	field_seek(offset)	*/
@@ -1122,15 +1137,37 @@
 {
     VALUE with_table;
     VALUE hash;
+    VALUE field_names;
     check_free(obj);
     rb_scan_args(argc, argv, "01", &with_table);
     if (with_table == Qnil)
 	with_table = Qfalse;
-    while ((hash = fetch_hash2(obj, with_table)) != Qnil)
+    field_names = fetch_field_names(obj, with_table);
+    while ((hash = fetch_hash2(obj, field_names)) != Qnil)
 	rb_yield(hash);
     return obj;
 }
 
+/*      all_hashes(with_table=false)      */
+static VALUE all_hashes(int argc, VALUE* argv, VALUE obj)
+{
+    VALUE with_table;
+    VALUE field_names;
+    VALUE res;
+    unsigned int n,i;
+    check_free(obj);
+    rb_scan_args(argc, argv, "01", &with_table);
+    if (with_table == Qnil)
+	with_table = Qfalse;
+    field_names = fetch_field_names(obj, with_table);
+    n = mysql_num_rows(GetMysqlRes(obj));
+    res = rb_ary_new2(n);
+    for (i=0; i<n; i++) { 
+	rb_ary_store(res, i, fetch_hash2(obj, field_names));
+    }
+    return res;
+}
+
 /*-------------------------------
  * Mysql::Field object method
  */
@@ -2039,6 +2076,7 @@
     rb_define_method(cMysqlRes, "row_tell", row_tell, 0);
     rb_define_method(cMysqlRes, "each", each, 0);
     rb_define_method(cMysqlRes, "each_hash", each_hash, -1);
+    rb_define_method(cMysqlRes, "all_hashes", all_hashes, -1);
 
     /* MysqlField object method */
     rb_define_method(cMysqlField, "name", field_name, 0);