diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-17 15:06:06 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-17 15:06:06 +0200 |
| commit | 8cb27d2ff15fcf1b064c966ef037b4be5f3c2fee (patch) | |
| tree | 89c2cddedab130da0fd07ba77db571a22d84b51e /sql/ha_innodb.cc | |
| parent | b0b315dce3d961e5b29830dfafdff6bc4e58aaa0 (diff) | |
| parent | 61ca875e7b14b5d91db1e6f07e4d13d3ba119a7a (diff) | |
| download | mariadb-git-8cb27d2ff15fcf1b064c966ef037b4be5f3c2fee.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index eaa088647c3..ce26ee705dd 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -4147,7 +4147,7 @@ innodb_show_status( } protocol->prepare_for_resend(); - protocol->store(buf, strlen(buf)); + protocol->store(buf, strlen(buf), system_charset_info); ut_free(buf); if (protocol->write()) |