diff options
| author | unknown <serg@serg.mylan> | 2004-03-26 13:21:48 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-03-26 13:21:48 +0100 |
| commit | 1712fcedf0fddf89ed88a36f5dbbb65beb18dbba (patch) | |
| tree | 2c35524ac85ef938f7cc8b770cc11aaf936b4ad7 | |
| parent | c1e76fc06051f7f061f40d44e2b846ab04fdabfd (diff) | |
| download | mariadb-git-1712fcedf0fddf89ed88a36f5dbbb65beb18dbba.tar.gz | |
bad merge (?) fixed
| -rw-r--r-- | libmysql/libmysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 9ad51518d83..0043cdf3542 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -801,7 +801,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename) NET *net= &mysql->net; int readcount; void *li_ptr; /* pass state to local_infile functions */ - char *buf;; /* buffer to be filled by local_infile_read */ + char *buf; /* buffer to be filled by local_infile_read */ struct st_mysql_options *options= &mysql->options; DBUG_ENTER("handle_local_infile"); |