diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-07-29 09:35:25 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-07-29 09:35:25 +0300 |
| commit | d9602ac7c7968b5c4bde9c1e63896fb450bab6ad (patch) | |
| tree | e3ed5bd5c3e00eb2edf594fe95850d3dd0bc1ad4 /sql/log.cc | |
| parent | 0e6a67da3470cef4c53b9588be719cceecf0f10a (diff) | |
| download | mariadb-git-d9602ac7c7968b5c4bde9c1e63896fb450bab6ad.tar.gz | |
Merge of ha_innobase.cc from 4.0; This fixes that MySQL doesn't allocate too big buffers when sorting innobase rows
Changed name of variables
NO_FOREIGN_KEY_CHECKS -> FOREIGN_KEY_CHECKS
RELAXED_UNIQUE_CHECKS -> UNIQUE_CHECKS
to avoid confusion with 'not...' variables.
Write name of adminstrator command to slow log.
Added mysqldumpslow to RPM
Docs/manual.texi:
Changelog
sql/gen_lex_hash.cc:
Updated values
sql/ha_innobase.cc:
Remove return value of sprintf
Merged back optimizations done in 4.0
Fixed ref_length; Caused MySQL to use big buffers when using InnoDB
sql/lex.h:
Changed name of variables
NO_FOREIGN_KEY_CHECKS -> FOREIGN_KEY_CHECKS
RELAXED_UNIQUE_CHECKS -> UNIQUE_CHECKS
sql/log.cc:
Write name of adminstrator command to slow log
sql/sql_yacc.yy:
Changed name of variables
NO_FOREIGN_KEY_CHECKS -> FOREIGN_KEY_CHECKS
RELAXED_UNIQUE_CHECKS -> UNIQUE_CHECKS
support-files/mysql.spec.sh:
Added mysqldumpslow to RPM
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 ee5818fc594..b90659fdf55 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -948,16 +948,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) || |