Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
e3a619f0
Commit
e3a619f0
authored
Mar 30, 2004
by
bell@sanja.is.com.ua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
null processing for character_set_results (BUG#3296)
parent
54d5f4ae
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
2 deletions
+17
-2
mysql-test/r/query_cache.result
mysql-test/r/query_cache.result
+5
-0
mysql-test/t/query_cache.test
mysql-test/t/query_cache.test
+6
-0
sql/sql_cache.cc
sql/sql_cache.cc
+6
-2
No files found.
mysql-test/r/query_cache.result
View file @
e3a619f0
...
@@ -846,4 +846,9 @@ SELECT * FROM test.t1;
...
@@ -846,4 +846,9 @@ SELECT * FROM test.t1;
a
a
USE test;
USE test;
DROP TABLE t1;
DROP TABLE t1;
set character_set_results=null;
select @@character_set_results;
@@character_set_results
NULL
set character_set_results=default;
SET GLOBAL query_cache_size=0;
SET GLOBAL query_cache_size=0;
mysql-test/t/query_cache.test
View file @
e3a619f0
...
@@ -620,5 +620,11 @@ SELECT * FROM test.t1;
...
@@ -620,5 +620,11 @@ SELECT * FROM test.t1;
USE
test
;
USE
test
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
#
# charset with NULL
#
set
character_set_results
=
null
;
select
@@
character_set_results
;
set
character_set_results
=
default
;
SET
GLOBAL
query_cache_size
=
0
;
SET
GLOBAL
query_cache_size
=
0
;
sql/sql_cache.cc
View file @
e3a619f0
...
@@ -780,7 +780,9 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
...
@@ -780,7 +780,9 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
flags
.
character_set_client_num
=
flags
.
character_set_client_num
=
thd
->
variables
.
character_set_client
->
number
;
thd
->
variables
.
character_set_client
->
number
;
flags
.
character_set_results_num
=
flags
.
character_set_results_num
=
thd
->
variables
.
character_set_results
->
number
;
(
thd
->
variables
.
character_set_results
?
thd
->
variables
.
character_set_results
->
number
:
UINT_MAX
);
flags
.
collation_connection_num
=
flags
.
collation_connection_num
=
thd
->
variables
.
collation_connection
->
number
;
thd
->
variables
.
collation_connection
->
number
;
flags
.
limit
=
thd
->
variables
.
select_limit
;
flags
.
limit
=
thd
->
variables
.
select_limit
;
...
@@ -965,7 +967,9 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
...
@@ -965,7 +967,9 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
1
:
0
);
1
:
0
);
flags
.
character_set_client_num
=
thd
->
variables
.
character_set_client
->
number
;
flags
.
character_set_client_num
=
thd
->
variables
.
character_set_client
->
number
;
flags
.
character_set_results_num
=
flags
.
character_set_results_num
=
thd
->
variables
.
character_set_results
->
number
;
(
thd
->
variables
.
character_set_results
?
thd
->
variables
.
character_set_results
->
number
:
UINT_MAX
);
flags
.
collation_connection_num
=
thd
->
variables
.
collation_connection
->
number
;
flags
.
collation_connection_num
=
thd
->
variables
.
collation_connection
->
number
;
flags
.
limit
=
thd
->
variables
.
select_limit
;
flags
.
limit
=
thd
->
variables
.
select_limit
;
memcpy
((
void
*
)(
sql
+
(
tot_length
-
QUERY_CACHE_FLAGS_SIZE
)),
memcpy
((
void
*
)(
sql
+
(
tot_length
-
QUERY_CACHE_FLAGS_SIZE
)),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment