summaryrefslogtreecommitdiff
path: root/mysys/my_append.c
diff options
context:
space:
mode:
authormonty@mysql.com/nosik.monty.fi <>2007-07-30 11:33:50 +0300
committermonty@mysql.com/nosik.monty.fi <>2007-07-30 11:33:50 +0300
commitb16289a5e05397211fd47e05ce08fe12f93ec38a (patch)
treeb1f9aa6b9e6bcbc36eded4aeb066d360e7541e72 /mysys/my_append.c
parenta33c863ffd1e0de7bf72a590a90ee5c50180a677 (diff)
downloadmariadb-git-b16289a5e05397211fd47e05ce08fe12f93ec38a.tar.gz
Slow query log to file now displays queries with microsecond precission
--long-query-time is now given in seconds with microseconds as decimals --min_examined_row_limit added for slow query log long_query_time user variable is now double with 6 decimals Added functions to get time in microseconds Added faster time() functions for system that has gethrtime() (Solaris) We now do less time() calls. Added field->in_read_set() and field->in_write_set() for easier field manipulation by handlers set_var.cc and my_getopt() can now handle DOUBLE variables. All time() calls changed to my_time() my_time() now does retry's if time() call fails. Added debug function for stopping in mysql_admin_table() when tables are locked Some trivial function and struct variable renames to avoid merge errors. Fixed compiler warnings Initialization of some time variables on windows moved to my_init()
Diffstat (limited to 'mysys/my_append.c')
-rw-r--r--mysys/my_append.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/mysys/my_append.c b/mysys/my_append.c
index ddd3c91e832..35881a959d5 100644
--- a/mysys/my_append.c
+++ b/mysys/my_append.c
@@ -27,21 +27,22 @@ struct utimbuf {
};
#endif
- /* Append a file to another */
-
-int my_append(const char *from, const char *to, myf MyFlags)
+/*
+ Append a file to another
+ NOTES
+ Don't set MY_FNABP or MY_NABP bits on when calling this function
+*/
- /* Dont set MY_FNABP or MY_NABP bits on
- when calling this funktion */
+int my_append(const char *from, const char *to, myf MyFlags)
{
uint Count;
File from_file,to_file;
- char buff[IO_SIZE];
+ uchar buff[IO_SIZE];
DBUG_ENTER("my_append");
DBUG_PRINT("my",("from %s to %s MyFlags %d", from, to, MyFlags));
- from_file=to_file= -1;
+ from_file= to_file= -1;
if ((from_file=my_open(from,O_RDONLY,MyFlags)) >= 0)
{