diff options
| author | monty@hundin.mysql.fi <> | 2002-08-08 15:24:47 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-08 15:24:47 +0300 |
| commit | 087261482a9bbdaa3bc0e26052a719ebdb73644b (patch) | |
| tree | e7f4a2013ed3d66e640f6574e62cb7e534a5d77f /sql/log.cc | |
| parent | 8be1cdeb89ca59be790d58dc0d43993cdc4f4191 (diff) | |
| parent | 3f48e0369b2e49026e9ddd4fddcee68ebe17db1e (diff) | |
| download | mariadb-git-087261482a9bbdaa3bc0e26052a719ebdb73644b.tar.gz | |
merge with 3.23.52
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/log.cc b/sql/log.cc index 19f2db8403b..b6a07d9021f 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1320,16 +1320,16 @@ bool MYSQL_LOG::write(THD *thd,const char *query, uint query_length, if (end != buff) { *end++=';'; - *end++='\n'; - *end=0; + *end='\n'; if (my_b_write(&log_file, (byte*) "SET ",4) || - my_b_write(&log_file, (byte*) buff+1,(uint) (end-buff)-1)) + my_b_write(&log_file, (byte*) buff+1,(uint) (end-buff))) tmp_errno=errno; } if (!query) { - query="#adminstrator command"; - query_length=21; + end=strxmov(buff, "# administrator command: ", + command_name[thd->command], NullS); + query_length=(ulong) (end-buff); } if (my_b_write(&log_file, (byte*) query,query_length) || my_b_write(&log_file, (byte*) ";\n",2) || |