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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d3889cac
Commit
d3889cac
authored
Dec 10, 2007
by
tnurnberg@white.intern.koehntopp.de
Browse files
Options
Browse Files
Download
Plain Diff
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/31177/51-31177
parents
8091abbf
2959cc58
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
5 deletions
+14
-5
mysql-test/r/change_user.result
mysql-test/r/change_user.result
+2
-2
mysys/my_getopt.c
mysys/my_getopt.c
+0
-2
sql/set_var.cc
sql/set_var.cc
+1
-1
tests/mysql_client_test.c
tests/mysql_client_test.c
+11
-0
No files found.
mysql-test/r/change_user.result
View file @
d3889cac
...
@@ -4,14 +4,14 @@ SELECT @@session.sql_big_selects;
...
@@ -4,14 +4,14 @@ SELECT @@session.sql_big_selects;
1
1
SELECT @@global.max_join_size;
SELECT @@global.max_join_size;
@@global.max_join_size
@@global.max_join_size
-1
18446744073709551615
change_user
change_user
SELECT @@session.sql_big_selects;
SELECT @@session.sql_big_selects;
@@session.sql_big_selects
@@session.sql_big_selects
1
1
SELECT @@global.max_join_size;
SELECT @@global.max_join_size;
@@global.max_join_size
@@global.max_join_size
-1
18446744073709551615
SET @@global.max_join_size = 10000;
SET @@global.max_join_size = 10000;
SET @@session.max_join_size = default;
SET @@session.max_join_size = default;
change_user
change_user
...
...
mysys/my_getopt.c
View file @
d3889cac
...
@@ -892,8 +892,6 @@ ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,
...
@@ -892,8 +892,6 @@ ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,
num
=
((
ulonglong
)
ULONG_MAX
);
num
=
((
ulonglong
)
ULONG_MAX
);
adjusted
=
TRUE
;
adjusted
=
TRUE
;
}
}
#else
num
=
min
(
num
,
LONG_MAX
);
#endif
#endif
break
;
break
;
default:
default:
...
...
sql/set_var.cc
View file @
d3889cac
...
@@ -1551,7 +1551,7 @@ Item *sys_var::item(THD *thd, enum_var_type var_type, LEX_STRING *base)
...
@@ -1551,7 +1551,7 @@ Item *sys_var::item(THD *thd, enum_var_type var_type, LEX_STRING *base)
pthread_mutex_lock
(
&
LOCK_global_system_variables
);
pthread_mutex_lock
(
&
LOCK_global_system_variables
);
value
=
*
(
ha_rows
*
)
value_ptr
(
thd
,
var_type
,
base
);
value
=
*
(
ha_rows
*
)
value_ptr
(
thd
,
var_type
,
base
);
pthread_mutex_unlock
(
&
LOCK_global_system_variables
);
pthread_mutex_unlock
(
&
LOCK_global_system_variables
);
return
new
Item_int
((
longlong
)
value
);
return
new
Item_int
((
u
longlong
)
value
);
}
}
case
SHOW_MY_BOOL
:
case
SHOW_MY_BOOL
:
{
{
...
...
tests/mysql_client_test.c
View file @
d3889cac
...
@@ -17001,6 +17001,12 @@ static void test_bug20023()
...
@@ -17001,6 +17001,12 @@ static void test_bug20023()
Check that SQL_BIG_SELECTS will be the original one.
Check that SQL_BIG_SELECTS will be the original one.
***********************************************************************/
***********************************************************************/
#if NOT_USED
/*
max_join_size is a ulong or better.
my_snprintf() only goes up to ul.
*/
/* Restore MAX_JOIN_SIZE. */
/* Restore MAX_JOIN_SIZE. */
my_snprintf
(
query_buffer
,
my_snprintf
(
query_buffer
,
...
@@ -17009,6 +17015,11 @@ static void test_bug20023()
...
@@ -17009,6 +17015,11 @@ static void test_bug20023()
(
int
)
max_join_size_orig
);
(
int
)
max_join_size_orig
);
DIE_IF
(
mysql_query
(
&
con
,
query_buffer
));
DIE_IF
(
mysql_query
(
&
con
,
query_buffer
));
#else
DIE_IF
(
mysql_query
(
&
con
,
"SET @@global.max_join_size = -1"
));
#endif
DIE_IF
(
mysql_query
(
&
con
,
"SET @@session.max_join_size = default"
));
DIE_IF
(
mysql_query
(
&
con
,
"SET @@session.max_join_size = default"
));
/* Issue COM_CHANGE_USER. */
/* Issue COM_CHANGE_USER. */
...
...
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