diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-11-04 14:09:03 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-11-04 14:09:03 +0200 |
| commit | 3b0d8e166391b956d595be5b570485471f4f5e40 (patch) | |
| tree | 07ce6a4f792ac489b079759afb3cc65847ca0cb0 /sql/protocol.cc | |
| parent | 54ef6c31bd5e6c76129bb4a93235f700f1fc22da (diff) | |
| download | mariadb-git-3b0d8e166391b956d595be5b570485471f4f5e40.tar.gz | |
Removed some warnings reported by valgrind
After merge fixes.
Now code compiles, but there is still some valgrind warnings that needs to be fixed
myisam/mi_rnext_same.c:
handle case where rtree_find_next() returns an error
(assume this means that there was no more keys)
myisam/rt_index.c:
Code cleanup
mysql-test/r/func_crypt.result:
Update results
mysql-test/r/func_group.result:
Update results
mysql-test/r/null_key.result:
Update results
mysql-test/r/order_by.result:
Update results
mysql-test/r/query_cache.result:
Update results
mysql-test/r/range.result:
Update results
mysql-test/r/rpl_trunc_binlog.result:
Update results
mysql-test/t/fulltext.test:
Fix error numbers
mysql-test/t/func_crypt.test:
Fixed test for 4.1
mysql-test/t/range.test:
Moved tests to be in sync with 4.0
mysys/test_charset.c:
Removed acccess to non existing functions
sql-common/client.c:
Merge fix
sql/item_strfunc.cc:
Simple code cleanup
Don't call ->c_ptr() when you don't need a 0 terminated string
(Causes warnings from valgrind)
sql/log_event.cc:
After merge fixes
sql/protocol.cc:
Change default catalog name to 'def'
sql/spatial.cc:
Code cleanup
sql/sql_class.cc:
After merge fixes
sql/time.cc:
Ensure that time object is cleared on error
sql/unireg.cc:
Removed warning reported by valgrind
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index d7a745d371d..8ba3cdec8e0 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -496,7 +496,7 @@ bool Protocol::send_fields(List<Item> *list, uint flag) if (thd->client_capabilities & CLIENT_PROTOCOL_41) { - if (prot.store("std", 3, cs, thd_charset) || + if (prot.store("def", 3, cs, thd_charset) || prot.store(field.db_name, (uint) strlen(field.db_name), cs, thd_charset) || prot.store(field.table_name, (uint) strlen(field.table_name), |