summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <iggy@amd64.(none)>2008-03-28 16:01:05 -0400
committerunknown <iggy@amd64.(none)>2008-03-28 16:01:05 -0400
commit219c7a2a4712ea829d24378eb34288b3563231d6 (patch)
tree7bc62903e7cf887e446a8dd7c0e348d785518e72 /myisam
parentafb4ac4545e07de958ca8721e1b7891ee4c0b955 (diff)
parenta9089cf460c7d7be3d8b843c948f0c707822878e (diff)
downloadmariadb-git-219c7a2a4712ea829d24378eb34288b3563231d6.tar.gz
Merge amd64.(none):/src/mysql-5.0-bugteam
into amd64.(none):/src/bug26243/my50-bug26243 libmysql/libmysql.c: Auto merged myisam/mi_open.c: Auto merged sql/ha_federated.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/slave.cc: Auto merged sql/sql_select.cc: Auto merged tests/mysql_client_test.c: Auto merged
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_open.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index d4d8458a669..c014b45cec5 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -196,7 +196,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
if (len != MI_BASE_INFO_SIZE)
{
DBUG_PRINT("warning",("saved_base_info_length: %d base_info_length: %d",
- len,MI_BASE_INFO_SIZE))
+ len,MI_BASE_INFO_SIZE));
}
disk_pos= (char*)
my_n_base_info_read((uchar*) disk_cache + base_pos, &share->base);