diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-19 16:00:12 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-19 16:00:12 +0300 |
| commit | aa900a5ecee00b40e5add6c88805587a850b057a (patch) | |
| tree | 7e42515465680bf9479f44de0c710044aa122610 /sql/protocol.h | |
| parent | 755e72a0f55b593cf930ae9bd69998f82b70d5cf (diff) | |
| download | mariadb-git-aa900a5ecee00b40e5add6c88805587a850b057a.tar.gz | |
After merge fixes + bugs from last merge
mysql-test/mysql-test-run.sh:
Use --skip-bdb with valgrind (as bdb tables causes valgrind to hang)
Fix --ddd option
mysql-test/t/union.test:
After merge fix
sql/item.cc:
Fixed typo
sql/log_event.cc:
Move current_tablenr to open_tables()
sql/protocol.h:
Fixed wrong memory reference
sql/set_var.cc:
After merge fix
sql/slave.cc:
Reset thd->lex.current_select before execute
sql/sql_base.cc:
Move current_tablenr to open_tables()
sql/sql_class.cc:
Move current_tablenr to open_tables()
Add missing update_charset()
sql/sql_parse.cc:
Move current_tablenr to open_tables()
Simple cleanup
sql/table.cc:
Code cleanup
Diffstat (limited to 'sql/protocol.h')
| -rw-r--r-- | sql/protocol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/protocol.h b/sql/protocol.h index ffd61b3e848..05aee12d3d9 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -61,7 +61,7 @@ public: inline bool store(ulonglong from) { return store_longlong((longlong) from, 1); } inline bool store(String *str) - { return store(str->c_ptr(),str->length(),str->charset()); } + { return store((char*) str->ptr(), str->length(), str->charset()); } virtual bool prepare_for_send(List<Item> *item_list) { |