diff options
| author | unknown <monty@tik.mysql.fi> | 2001-06-11 15:01:28 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2001-06-11 15:01:28 +0300 |
| commit | 765940cb3abccdbfe9e43f2c1116d1e96eb27ae9 (patch) | |
| tree | 22274a6ce372c9763e3a9527f8e8dc0cb5548381 /mysys/my_pread.c | |
| parent | 14289d42edec950a6cc9f3db1e242cf8595e207d (diff) | |
| download | mariadb-git-765940cb3abccdbfe9e43f2c1116d1e96eb27ae9.tar.gz | |
Changed compare in MyISAM to use my_pread()
Fixed that @VAR shows all decimals
Fixed problem with FLUSH TABLES and LOCK TABLE
CREATE ... SELECT now creates keys later
Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key
Docs/manual.texi:
Added MySQL/PostgreSQL comparison
isam/_dynrec.c:
Fixed wrong compare (not used in MySQL)
myisam/mi_dynrec.c:
Fixed wrong compare (not used in MySQL).
Changed compare to use my_pread()
myisam/mi_packrec.c:
cleanup
mysql-test/r/alter_table.result:
Added test for ALTER TABLE
mysql-test/r/variables.result:
Added test for variables with REAL values.
mysql-test/t/alter_table.test:
Added test for ALTER TABLE
mysql-test/t/variables.test:
Added test for variables with REAL values.
mysys/my_pread.c:
Cleanup
sql-bench/Makefile.am:
removed extra \
sql-bench/README:
Fixed typo.
sql/item_func.cc:
Fixed that @VAR shows all decimals
sql/share/swedish/errmsg.OLD:
update
sql/sql_base.cc:
Fixed problem with FLUSH TABLES and LOCK TABLE
sql/sql_insert.cc:
CREATE ... SELECT now creates keys later
sql/sql_table.cc:
Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key.
BitKeeper/etc/ignore:
Added sql-bench/graph-compare-results to the ignore list
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'mysys/my_pread.c')
| -rw-r--r-- | mysys/my_pread.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_pread.c b/mysys/my_pread.c index 4e0de71bcf5..5c7d0be5854 100644 --- a/mysys/my_pread.c +++ b/mysys/my_pread.c @@ -66,11 +66,11 @@ uint my_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset, my_filename(Filedes),my_errno); } if ((int) readbytes == -1 || (MyFlags & (MY_FNABP | MY_NABP))) - DBUG_RETURN(MY_FILE_ERROR); /* Return with error */ + DBUG_RETURN(MY_FILE_ERROR); /* Return with error */ } if (MyFlags & (MY_NABP | MY_FNABP)) - DBUG_RETURN(0); /* Ok vid l{sning */ - DBUG_RETURN(readbytes); /* purecov: inspected */ + DBUG_RETURN(0); /* Read went ok; Return 0 */ + DBUG_RETURN(readbytes); /* purecov: inspected */ } } /* my_pread */ |