diff options
author | unknown <monty@donna.mysql.com> | 2000-12-28 19:25:41 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-12-28 19:25:41 +0200 |
commit | 5c68c9042a6b01107c151fb15c2ca29a427f8ea0 (patch) | |
tree | e5a06533107ae2de5c6723f34705dd081f8c61bf /merge | |
parent | 8c17965ee646af71b17e5f26d60083eae4361c41 (diff) | |
download | mariadb-git-5c68c9042a6b01107c151fb15c2ca29a427f8ea0.tar.gz |
Cleanup of tests
Fixed bug with ALTER TABLE on HEAP tables
mysql-test/r/alter_table.result:
Turn off SCCS flag
mysql-test/r/analyse.result:
Turn off SCCS flag
mysql-test/r/auto_increment.result:
Turn off SCCS flag
mysql-test/r/bdb.result:
Turn off SCCS flag
mysql-test/r/bigint.result:
Turn off SCCS flag
mysql-test/r/binary.result:
Turn off SCCS flag
mysql-test/r/case.result:
Turn off SCCS flag
mysql-test/r/comments.result:
Turn off SCCS flag
mysql-test/r/compare.result:
Turn off SCCS flag
mysql-test/r/count_distinct.result:
Turn off SCCS flag
mysql-test/r/create.result:
Turn off SCCS flag
mysql-test/r/delayed.result:
Turn off SCCS flag
mysql-test/r/distinct.result:
Turn off SCCS flag
mysql-test/r/empty_table.result:
Turn off SCCS flag
mysql-test/r/explain.result:
Turn off SCCS flag
mysql-test/r/ft0000001.a.result:
Turn off SCCS flag
mysql-test/r/ft0000001.b.result:
Turn off SCCS flag
mysql-test/r/ft0000001.c.result:
Turn off SCCS flag
mysql-test/r/ft0000001.d.result:
Turn off SCCS flag
mysql-test/r/ft0000001.e.result:
Turn off SCCS flag
mysql-test/r/ft0000002.a.result:
Turn off SCCS flag
mysql-test/r/ft0000002.b.result:
Turn off SCCS flag
mysql-test/r/ft0000002.c.result:
Turn off SCCS flag
mysql-test/r/fulltext.result:
Turn off SCCS flag
mysql-test/r/func_crypt.result:
Turn off SCCS flag
mysql-test/r/func_date_add.result:
Turn off SCCS flag
mysql-test/r/func_equal.result:
Turn off SCCS flag
mysql-test/r/func_group.result:
Turn off SCCS flag
mysql-test/r/func_in.result:
Turn off SCCS flag
mysql-test/r/func_like.result:
Turn off SCCS flag
mysql-test/r/func_math.result:
Turn off SCCS flag
mysql-test/r/func_misc.result:
Turn off SCCS flag
mysql-test/r/func_op.result:
Turn off SCCS flag
mysql-test/r/func_regexp.result:
Turn off SCCS flag
mysql-test/r/func_set.result:
Turn off SCCS flag
mysql-test/r/func_str.result:
Turn off SCCS flag
mysql-test/r/func_system.result:
Turn off SCCS flag
mysql-test/r/func_test.result:
Turn off SCCS flag
mysql-test/r/func_time.result:
Turn off SCCS flag
mysql-test/r/group_by.result:
Turn off SCCS flag
mysql-test/r/heap.result:
Turn off SCCS flag
mysql-test/r/ins000001.result:
Turn off SCCS flag
mysql-test/r/insert.result:
Turn off SCCS flag
mysql-test/r/insert_select.result:
Turn off SCCS flag
mysql-test/r/join.result:
Turn off SCCS flag
mysql-test/r/join_outer.result:
Turn off SCCS flag
mysql-test/r/key.result:
Turn off SCCS flag
mysql-test/r/key_diff.result:
Turn off SCCS flag
mysql-test/r/key_primary.result:
Turn off SCCS flag
mysql-test/r/keywords.result:
Turn off SCCS flag
mysql-test/r/limit.result:
Turn off SCCS flag
mysql-test/r/merge.result:
Turn off SCCS flag
mysql-test/r/null.result:
Turn off SCCS flag
mysql-test/r/null_key.result:
Turn off SCCS flag
mysql-test/r/odbc.result:
Turn off SCCS flag
mysql-test/r/order_by.result:
Turn off SCCS flag
mysql-test/r/raid.result:
Turn off SCCS flag
mysql-test/r/range.result:
Turn off SCCS flag
mysql-test/r/rename.result:
Turn off SCCS flag
mysql-test/r/replace.result:
Turn off SCCS flag
mysql-test/r/rollback.result:
Turn off SCCS flag
mysql-test/r/rpl000001.a.result:
Turn off SCCS flag
mysql-test/r/rpl000001.b.result:
Turn off SCCS flag
mysql-test/r/rpl000002.result:
Turn off SCCS flag
mysql-test/r/rpl000003.result:
Turn off SCCS flag
mysql-test/r/rpl000004.a.result:
Turn off SCCS flag
mysql-test/r/rpl000004.b.result:
Turn off SCCS flag
mysql-test/r/rpl000005.result:
Turn off SCCS flag
mysql-test/r/rpl000006.result:
Turn off SCCS flag
mysql-test/r/rpl000007.result:
Turn off SCCS flag
mysql-test/r/rpl000008.result:
Turn off SCCS flag
mysql-test/r/rpl000009.result:
Turn off SCCS flag
mysql-test/r/rpl000010.result:
Turn off SCCS flag
mysql-test/r/rpl000011.result:
Turn off SCCS flag
mysql-test/r/rpl000012.result:
Turn off SCCS flag
mysql-test/r/rpl000012.status.result:
Turn off SCCS flag
mysql-test/r/rpl000013.result:
Turn off SCCS flag
mysql-test/r/rpl000013.status.result:
Turn off SCCS flag
mysql-test/r/rpl000014.result:
Turn off SCCS flag
mysql-test/r/rpl000015.result:
Turn off SCCS flag
mysql-test/r/rpl000016.result:
Turn off SCCS flag
mysql-test/r/sel000001.result:
Turn off SCCS flag
mysql-test/r/sel000002.result:
Turn off SCCS flag
mysql-test/r/sel000003.result:
Turn off SCCS flag
mysql-test/r/sel000031.result:
Turn off SCCS flag
mysql-test/r/sel000032.result:
Turn off SCCS flag
mysql-test/r/sel000033.result:
Turn off SCCS flag
mysql-test/r/sel000100.result:
Turn off SCCS flag
mysql-test/r/select_safe.result:
Turn off SCCS flag
mysql-test/r/show_check.result:
Turn off SCCS flag
mysql-test/r/shw000001.result:
Turn off SCCS flag
mysql-test/r/slave-running.result:
Turn off SCCS flag
mysql-test/r/slave-stopped.result:
Turn off SCCS flag
mysql-test/r/tablelock.result:
Turn off SCCS flag
mysql-test/r/temp_table.result:
Turn off SCCS flag
mysql-test/r/truncate.result:
Turn off SCCS flag
mysql-test/r/type_blob.result:
Turn off SCCS flag
mysql-test/r/type_date.result:
Turn off SCCS flag
mysql-test/r/type_datetime.result:
Turn off SCCS flag
mysql-test/r/type_enum.result:
Turn off SCCS flag
mysql-test/r/type_float.result:
Turn off SCCS flag
mysql-test/r/type_ranges.result:
Turn off SCCS flag
mysql-test/r/type_time.result:
Turn off SCCS flag
mysql-test/r/type_timestamp.result:
Turn off SCCS flag
mysql-test/r/type_uint.result:
Turn off SCCS flag
mysql-test/r/type_year.result:
Turn off SCCS flag
mysql-test/r/update.result:
Turn off SCCS flag
mysql-test/r/varbinary.result:
Turn off SCCS flag
mysql-test/r/variables.result:
Turn off SCCS flag
Docs/manual.texi:
Changelog
client/my_readline.h:
Added read length to readline()
client/mysql.cc:
cleanup
client/mysqladmin.c:
cleanup
client/mysqldump.c:
Added handling of hexadecimal constants
client/mysqlimport.c:
Version change
client/mysqltest.c:
Don't append the .reject extension, instead replace the old extension
client/readline.cc:
Added read length to readline()
heap/hp_open.c:
extra debug
merge/rrnd.c:
Fix bug in merge tables
mysql-test/install_test_db.sh:
Portability fixes
mysql-test/mysql-test-run.sh:
Portability fixes
Added --ddd and --debug options
scripts/mysqld_multi.sh:
Add pathname to mysqladmin
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql/mysqld.cc:
Some fixes for gemini
sql/sql_table.cc:
Fixed bug with ALTER TABLE on HEAP tables
Diffstat (limited to 'merge')
-rw-r--r-- | merge/rrnd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge/rrnd.c b/merge/rrnd.c index 0abd72a3edd..e53982aca21 100644 --- a/merge/rrnd.c +++ b/merge/rrnd.c @@ -82,7 +82,7 @@ int mrg_rrnd(MRG_INFO *info,byte *buf,mrg_off_t filepos) } } info->current_table=find_table(info->open_tables, - info->end_table,filepos); + info->end_table-1,filepos); isam_info=info->current_table->table; isam_info->update&= HA_STATE_CHANGED; return ((*isam_info->s->read_rnd)(isam_info,(byte*) buf, |