summaryrefslogtreecommitdiff
path: root/isam
diff options
context:
space:
mode:
authorunknown <monty@tik.mysql.fi>2001-03-21 01:02:22 +0200
committerunknown <monty@tik.mysql.fi>2001-03-21 01:02:22 +0200
commit6257ee7613836c397bda6c3533ca4a114d60e045 (patch)
tree8a311781a9b85fe972ca9c89a0dc75654d3b3250 /isam
parentd1782bea92ebf698cdcf898007f3b015ba502493 (diff)
downloadmariadb-git-6257ee7613836c397bda6c3533ca4a114d60e045.tar.gz
Added isolation levels
Added SELECT .. FOR UPDATE and SELECT .. IN SHARE MODE Docs/manual.texi: Updated information about SET TRANSACTION ISOLATION LEVEL configure.in: Upgraded version number isam/_dbug.c: Fixed wrong fprintf isam/isamchk.c: Added new error message myisam/mi_check.c: Added new error message mysql-test/mysql-test-run.sh: Don't wait too long for server start mysys/mf_keycache.c: Cleaned up some error messages scripts/mysqlhotcopy.sh: Applied patch for --resetmaster --resetslave sql-bench/bench-init.pl.sh: Fix for windows sql/handler.cc: Added isolation levels and gemini spinlocks sql/handler.h: Added isolation levels sql/item_strfunc.cc: Cleanup of CONCAT_WS() sql/lex.h: Added isolation levels sql/mysql_priv.h: Added isolation levels sql/mysqld.cc: Added isolation levels sql/sql_class.cc: Added isolation levels Moved variable initialization to different code segments sql/sql_class.h: Added isolation levels sql/sql_lex.h: Added isolation levels sql/sql_parse.cc: Added isolation levels sql/sql_update.cc: cleanup BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'isam')
-rw-r--r--isam/_dbug.c2
-rw-r--r--isam/isamchk.c10
2 files changed, 10 insertions, 2 deletions
diff --git a/isam/_dbug.c b/isam/_dbug.c
index 644d0e420d6..fd0a0b46562 100644
--- a/isam/_dbug.c
+++ b/isam/_dbug.c
@@ -85,7 +85,7 @@ void _nisam_print_key(FILE *stream, register N_KEYSEG *keyseg, const uchar *key)
key=end;
break;
case HA_KEYTYPE_INT24:
- VOID(fprintf(stream,"%d",sint3korr(key)));
+ VOID(fprintf(stream,"%ld",sint3korr(key)));
key=end;
break;
case HA_KEYTYPE_UINT24:
diff --git a/isam/isamchk.c b/isam/isamchk.c
index ce96655a7a5..bb9b7bfa16b 100644
--- a/isam/isamchk.c
+++ b/isam/isamchk.c
@@ -284,7 +284,7 @@ static struct option long_options[] =
static void print_version(void)
{
- printf("%s Ver 5.15 for %s at %s\n",my_progname,SYSTEM_TYPE,
+ printf("%s Ver 5.16 for %s at %s\n",my_progname,SYSTEM_TYPE,
MACHINE_TYPE);
}
@@ -1793,6 +1793,9 @@ my_string name;
if (share->base.options & HA_OPTION_COMPRESS_RECORD)
printf(" Huff tree Bits");
VOID(putchar('\n'));
+ if (verbose > 2 && share->base.pack_bits)
+ printf("- %-7d%-35s\n",share->base.pack_bits,"bit field");
+
start=1;
for (field=0 ; field < share->base.fields ; field++)
{
@@ -2806,6 +2809,11 @@ static int sort_get_next_record()
}
DBUG_RETURN(0);
}
+ if (!searching)
+ {
+ print_info("Found wrong packed record at %lu",
+ (ulong) sort_info.start_recpos);
+ }
try_next:
pos=sort_info.start_recpos+1;
searching=1;