diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-07-02 13:15:33 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-07-02 13:15:33 +0300 |
| commit | 9db357e2bfebf9207a507c4a2244499899a960a2 (patch) | |
| tree | ec4503d3142abaf8379c46752cb5a3adcd7c9471 /sql/protocol.h | |
| parent | f1183fc160b504af3c976d7e1e95e19128b6ecbe (diff) | |
| download | mariadb-git-9db357e2bfebf9207a507c4a2244499899a960a2.tar.gz | |
Added MY_CS_NONASCII marker for character sets that are not compatible with latin1 for characters 0x00-0x7f
This allows us to skip and speed up some very common character converts that MySQL is doing when sending data to the client
and this gives us a nice speed increase for most queries that uses only characters in the range 0x00-0x7f.
This code is based on Alexander Barkov's code that he has done in MySQL 6.0
include/m_ctype.h:
Added MY_CS_NONASCII marker
libmysqld/lib_sql.cc:
Added function net_store_data(...) that takes to and from CHARSET_INFO * as arguments
mysys/charset.c:
Mark character sets with MY_CS_NONASCII
scripts/mysql_install_db.sh:
Fixed messages to refer to MariaDB instead of MySQL
sql/protocol.cc:
Added function net_store_data(...) that takes to and from CHARSET_INFO * as arguments
sql/protocol.h:
Added function net_store_data(...) that takes to and from CHARSET_INFO * as arguments
sql/sql_string.cc:
Quicker copy of strings with no characters above 0x7f
strings/conf_to_src.c:
Added printing of MY_CS_NONASCII
strings/ctype-extra.c:
Mark incompatible character sets with MY_CS_NONASCII
Removed duplicated character set geostd
strings/ctype-sjis.c:
Mark incompatible character sets with MY_CS_NONASCII
strings/ctype-uca.c:
Mark incompatible character sets with MY_CS_NONASCII
strings/ctype-ucs2.c:
Mark incompatible character sets with MY_CS_NONASCII
strings/ctype-utf8.c:
Mark incompatible character sets with MY_CS_NONASCII
strings/ctype.c:
Added function to check if character set is compatible with latin1 in ranges 0x00-0x7f
Diffstat (limited to 'sql/protocol.h')
| -rw-r--r-- | sql/protocol.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/protocol.h b/sql/protocol.h index a4770e9b6e3..339ae1be346 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -42,6 +42,8 @@ protected: MYSQL_FIELD *next_mysql_field; MEM_ROOT *alloc; #endif + bool net_store_data(const uchar *from, size_t length, + CHARSET_INFO *fromcs, CHARSET_INFO *tocs); bool store_string_aux(const char *from, size_t length, CHARSET_INFO *fromcs, CHARSET_INFO *tocs); public: |