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
8505ff17
Commit
8505ff17
authored
Feb 24, 2006
by
osku
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix invalid brace positioning and spaces before tabs.
parent
f6796c01
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
17 additions
and
27 deletions
+17
-27
dict/dict0dict.c
dict/dict0dict.c
+1
-2
handler/ha_innodb.cc
handler/ha_innodb.cc
+5
-9
include/os0proc.h
include/os0proc.h
+1
-1
include/sync0sync.ic
include/sync0sync.ic
+1
-3
include/univ.i
include/univ.i
+1
-1
os/os0proc.c
os/os0proc.c
+3
-3
row/row0ins.c
row/row0ins.c
+2
-2
row/row0sel.c
row/row0sel.c
+3
-6
No files found.
dict/dict0dict.c
View file @
8505ff17
...
@@ -2993,8 +2993,7 @@ dict_create_foreign_constraints_low(
...
@@ -2993,8 +2993,7 @@ dict_create_foreign_constraints_low(
command, determine if there are any foreign keys, and
command, determine if there are any foreign keys, and
if so, immediately reject the command if the table is a
if so, immediately reject the command if the table is a
temporary one. For now, this kludge will work. */
temporary one. For now, this kludge will work. */
if
(
reject_fks
&&
(
UT_LIST_GET_LEN
(
table
->
foreign_list
)
>
0
))
if
(
reject_fks
&&
(
UT_LIST_GET_LEN
(
table
->
foreign_list
)
>
0
))
{
{
return
DB_CANNOT_ADD_CONSTRAINT
;
return
DB_CANNOT_ADD_CONSTRAINT
;
}
}
...
...
handler/ha_innodb.cc
View file @
8505ff17
...
@@ -626,8 +626,7 @@ innobase_mysql_print_thd(
...
@@ -626,8 +626,7 @@ innobase_mysql_print_thd(
/* Points to buf or dyn_str. */
/* Points to buf or dyn_str. */
char
*
str
=
buf
;
char
*
str
=
buf
;
if
(
max_query_len
==
0
)
if
(
max_query_len
==
0
)
{
{
/* ADDITIONAL SAFETY: the default is to print at
/* ADDITIONAL SAFETY: the default is to print at
most 300 chars to reduce the probability of a
most 300 chars to reduce the probability of a
seg fault if there is a race in
seg fault if there is a race in
...
@@ -639,8 +638,7 @@ innobase_mysql_print_thd(
...
@@ -639,8 +638,7 @@ innobase_mysql_print_thd(
len
=
min
(
thd
->
query_length
,
max_query_len
);
len
=
min
(
thd
->
query_length
,
max_query_len
);
if
(
len
>
(
sizeof
(
buf
)
-
1
))
if
(
len
>
(
sizeof
(
buf
)
-
1
))
{
{
dyn_str
=
my_malloc
(
len
+
1
,
MYF
(
0
));
dyn_str
=
my_malloc
(
len
+
1
,
MYF
(
0
));
str
=
dyn_str
;
str
=
dyn_str
;
}
}
...
@@ -651,8 +649,7 @@ innobase_mysql_print_thd(
...
@@ -651,8 +649,7 @@ innobase_mysql_print_thd(
putc
(
'\n'
,
f
);
putc
(
'\n'
,
f
);
fwrite
(
str
,
1
,
len
,
f
);
fwrite
(
str
,
1
,
len
,
f
);
if
(
dyn_str
)
if
(
dyn_str
)
{
{
my_free
(
dyn_str
,
MYF
(
0
));
my_free
(
dyn_str
,
MYF
(
0
));
}
}
}
}
...
@@ -6624,8 +6621,7 @@ innodb_show_status(
...
@@ -6624,8 +6621,7 @@ innodb_show_status(
/* allocate buffer for the string, and
/* allocate buffer for the string, and
read the contents of the temporary file */
read the contents of the temporary file */
if
(
!
(
str
=
my_malloc
(
usable_len
+
1
,
MYF
(
0
))))
if
(
!
(
str
=
my_malloc
(
usable_len
+
1
,
MYF
(
0
))))
{
{
mutex_exit_noninline
(
&
srv_monitor_file_mutex
);
mutex_exit_noninline
(
&
srv_monitor_file_mutex
);
DBUG_RETURN
(
TRUE
);
DBUG_RETURN
(
TRUE
);
}
}
...
...
include/os0proc.h
View file @
8505ff17
include/sync0sync.ic
View file @
8505ff17
...
@@ -255,8 +255,7 @@ mutex_enter_func(
...
@@ -255,8 +255,7 @@ mutex_enter_func(
mutex->count_using++;
mutex->count_using++;
#endif /* UNIV_HOTBACKUP */
#endif /* UNIV_HOTBACKUP */
if (!mutex_test_and_set(mutex))
if (!mutex_test_and_set(mutex)) {
{
#ifdef UNIV_SYNC_DEBUG
#ifdef UNIV_SYNC_DEBUG
mutex_set_debug_info(mutex, file_name, line);
mutex_set_debug_info(mutex, file_name, line);
#endif
#endif
...
@@ -264,5 +263,4 @@ mutex_enter_func(
...
@@ -264,5 +263,4 @@ mutex_enter_func(
}
}
mutex_spin_wait(mutex, file_name, line);
mutex_spin_wait(mutex, file_name, line);
}
}
include/univ.i
View file @
8505ff17
os/os0proc.c
View file @
8505ff17
row/row0ins.c
View file @
8505ff17
row/row0sel.c
View file @
8505ff17
...
@@ -2909,8 +2909,7 @@ row_sel_pop_cached_row_for_mysql(
...
@@ -2909,8 +2909,7 @@ row_sel_pop_cached_row_for_mysql(
ut_ad
(
prebuilt
->
n_fetch_cached
>
0
);
ut_ad
(
prebuilt
->
n_fetch_cached
>
0
);
ut_ad
(
prebuilt
->
mysql_prefix_len
<=
prebuilt
->
mysql_row_len
);
ut_ad
(
prebuilt
->
mysql_prefix_len
<=
prebuilt
->
mysql_row_len
);
if
(
UNIV_UNLIKELY
(
prebuilt
->
keep_other_fields_on_keyread
))
if
(
UNIV_UNLIKELY
(
prebuilt
->
keep_other_fields_on_keyread
))
{
{
/* Copy cache record field by field, don't touch fields that
/* Copy cache record field by field, don't touch fields that
are not covered by current key */
are not covered by current key */
cached_rec
=
cached_rec
=
...
@@ -2924,8 +2923,7 @@ row_sel_pop_cached_row_for_mysql(
...
@@ -2924,8 +2923,7 @@ row_sel_pop_cached_row_for_mysql(
templ
->
mysql_col_len
);
templ
->
mysql_col_len
);
/* Copy NULL bit of the current field from cached_rec
/* Copy NULL bit of the current field from cached_rec
to buf */
to buf */
if
(
templ
->
mysql_null_bit_mask
)
if
(
templ
->
mysql_null_bit_mask
)
{
{
buf
[
templ
->
mysql_null_byte_offset
]
^=
buf
[
templ
->
mysql_null_byte_offset
]
^=
(
buf
[
templ
->
mysql_null_byte_offset
]
^
(
buf
[
templ
->
mysql_null_byte_offset
]
^
cached_rec
[
templ
->
mysql_null_byte_offset
])
&
cached_rec
[
templ
->
mysql_null_byte_offset
])
&
...
@@ -2933,8 +2931,7 @@ row_sel_pop_cached_row_for_mysql(
...
@@ -2933,8 +2931,7 @@ row_sel_pop_cached_row_for_mysql(
}
}
}
}
}
}
else
else
{
{
ut_memcpy
(
buf
,
prebuilt
->
fetch_cache
[
prebuilt
->
fetch_cache_first
],
ut_memcpy
(
buf
,
prebuilt
->
fetch_cache
[
prebuilt
->
fetch_cache_first
],
prebuilt
->
mysql_prefix_len
);
prebuilt
->
mysql_prefix_len
);
}
}
...
...
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