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
3bb2660d
Commit
3bb2660d
authored
Sep 17, 2002
by
monty@mashka.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge with 3.23.53
parents
c7b6854f
ff993695
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
11 deletions
+37
-11
Docs/manual.texi
Docs/manual.texi
+7
-1
innobase/include/srv0srv.h
innobase/include/srv0srv.h
+1
-1
innobase/os/os0file.c
innobase/os/os0file.c
+15
-6
innobase/row/row0mysql.c
innobase/row/row0mysql.c
+13
-2
innobase/srv/srv0srv.c
innobase/srv/srv0srv.c
+1
-1
No files found.
Docs/manual.texi
View file @
3bb2660d
...
@@ -51223,8 +51223,14 @@ not yet 100% confident in this code.
...
@@ -51223,8 +51223,14 @@ not yet 100% confident in this code.
@appendixsubsec Changes in release 3.23.53
@appendixsubsec Changes in release 3.23.53
@itemize @bullet
@itemize @bullet
@item
@item
Fixed bug in @code{ALTER TABLE} and @code{RENAME TABLE} when running with
@code{-O lower_case_table_names=1} (typically on windows) when giving the
table name in uppercase.
@item
Fixed unlikely core dump with @code{SELECT ... ORDER BY ... LIMIT}.
@item
Changed @code{AND/OR} to report that they can return NULL. This fixes a
Changed @code{AND/OR} to report that they can return NULL. This fixes a
bug in @code{GROUP BY} on @code{AND/OR} expression that return
bug in @code{GROUP BY} on @code{AND/OR} expression
s
that return
@code{NULL}.
@code{NULL}.
@item
@item
Fixed a bug that @code{OPTIMIZE} of locked and modified MyISAM table,
Fixed a bug that @code{OPTIMIZE} of locked and modified MyISAM table,
innobase/include/srv0srv.h
View file @
3bb2660d
...
@@ -53,7 +53,7 @@ extern ulint srv_n_log_files;
...
@@ -53,7 +53,7 @@ extern ulint srv_n_log_files;
extern
ulint
srv_log_file_size
;
extern
ulint
srv_log_file_size
;
extern
ibool
srv_log_archive_on
;
extern
ibool
srv_log_archive_on
;
extern
ulint
srv_log_buffer_size
;
extern
ulint
srv_log_buffer_size
;
extern
ibool
srv_flush_log_at_trx_commit
;
extern
ulint
srv_flush_log_at_trx_commit
;
extern
byte
srv_latin1_ordering
[
256
];
/* The sort order table of the latin1
extern
byte
srv_latin1_ordering
[
256
];
/* The sort order table of the latin1
character set */
character set */
...
...
innobase/os/os0file.c
View file @
3bb2660d
...
@@ -15,8 +15,6 @@ Created 10/21/1995 Heikki Tuuri
...
@@ -15,8 +15,6 @@ Created 10/21/1995 Heikki Tuuri
#undef HAVE_FDATASYNC
#undef HAVE_FDATASYNC
#undef UNIV_NON_BUFFERED_IO
#ifdef POSIX_ASYNC_IO
#ifdef POSIX_ASYNC_IO
/* We assume in this case that the OS has standard Posix aio (at least SunOS
/* We assume in this case that the OS has standard Posix aio (at least SunOS
2.6, HP-UX 11i and AIX 4.3 have) */
2.6, HP-UX 11i and AIX 4.3 have) */
...
@@ -500,14 +498,25 @@ try_again:
...
@@ -500,14 +498,25 @@ try_again:
}
}
#endif
#endif
#ifdef UNIV_NON_BUFFERED_IO
#ifdef UNIV_NON_BUFFERED_IO
attributes
=
attributes
|
FILE_FLAG_NO_BUFFERING
;
if
(
type
==
OS_LOG_FILE
&&
srv_flush_log_at_trx_commit
==
2
)
{
/* Do not use unbuffered i/o to log files because
value 2 denotes that we do not flush the log at every
commit, but only once per second */
}
else
{
attributes
=
attributes
|
FILE_FLAG_NO_BUFFERING
;
}
#endif
#endif
}
else
if
(
purpose
==
OS_FILE_NORMAL
)
{
}
else
if
(
purpose
==
OS_FILE_NORMAL
)
{
attributes
=
0
attributes
=
0
;
#ifdef UNIV_NON_BUFFERED_IO
#ifdef UNIV_NON_BUFFERED_IO
|
FILE_FLAG_NO_BUFFERING
if
(
type
==
OS_LOG_FILE
&&
srv_flush_log_at_trx_commit
==
2
)
{
/* Do not use unbuffered i/o to log files because
value 2 denotes that we do not flush the log at every
commit, but only once per second */
}
else
{
attributes
=
attributes
|
FILE_FLAG_NO_BUFFERING
;
}
#endif
#endif
;
}
else
{
}
else
{
attributes
=
0
;
attributes
=
0
;
ut_error
;
ut_error
;
...
...
innobase/row/row0mysql.c
View file @
3bb2660d
...
@@ -1186,7 +1186,12 @@ row_create_table_for_mysql(
...
@@ -1186,7 +1186,12 @@ row_create_table_for_mysql(
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
ut_ad
(
mutex_own
(
&
(
dict_sys
->
mutex
)));
ut_ad
(
mutex_own
(
&
(
dict_sys
->
mutex
)));
if
(
srv_created_new_raw
||
srv_force_recovery
)
{
/* We allow a create table also if innodb_force_recovery is used. This
enables the user to stop a runaway rollback or a crash caused by
a temporary table #sql... He can use the trick explained in the
manual to rename the temporary table to rsql..., and then drop it. */
if
(
srv_created_new_raw
)
{
fprintf
(
stderr
,
fprintf
(
stderr
,
"InnoDB: A new raw disk partition was initialized or
\n
"
"InnoDB: A new raw disk partition was initialized or
\n
"
"InnoDB: innodb_force_recovery is on: we do not allow
\n
"
"InnoDB: innodb_force_recovery is on: we do not allow
\n
"
...
@@ -1707,7 +1712,13 @@ row_drop_table_for_mysql(
...
@@ -1707,7 +1712,13 @@ row_drop_table_for_mysql(
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
ut_ad
(
trx
->
mysql_thread_id
==
os_thread_get_curr_id
());
ut_a
(
name
!=
NULL
);
ut_a
(
name
!=
NULL
);
if
(
srv_created_new_raw
||
srv_force_recovery
)
{
/* Note that we allow dropping of a table even if innodb_force_recovery
is used. If a rollback or purge would crash because of a corrupt
table, the user can try dropping it to avoid the crash. This is also
a nice way to stop a runaway rollback caused by a failing big
table import in a single transaction. */
if
(
srv_created_new_raw
)
{
fprintf
(
stderr
,
fprintf
(
stderr
,
"InnoDB: A new raw disk partition was initialized or
\n
"
"InnoDB: A new raw disk partition was initialized or
\n
"
"InnoDB: innodb_force_recovery is on: we do not allow
\n
"
"InnoDB: innodb_force_recovery is on: we do not allow
\n
"
...
...
innobase/srv/srv0srv.c
View file @
3bb2660d
...
@@ -96,7 +96,7 @@ ulint srv_n_log_files = ULINT_MAX;
...
@@ -96,7 +96,7 @@ ulint srv_n_log_files = ULINT_MAX;
ulint
srv_log_file_size
=
ULINT_MAX
;
/* size in database pages */
ulint
srv_log_file_size
=
ULINT_MAX
;
/* size in database pages */
ibool
srv_log_archive_on
=
TRUE
;
ibool
srv_log_archive_on
=
TRUE
;
ulint
srv_log_buffer_size
=
ULINT_MAX
;
/* size in database pages */
ulint
srv_log_buffer_size
=
ULINT_MAX
;
/* size in database pages */
ibool
srv_flush_log_at_trx_commit
=
TRUE
;
ulint
srv_flush_log_at_trx_commit
=
1
;
byte
srv_latin1_ordering
[
256
]
/* The sort order table of the latin1
byte
srv_latin1_ordering
[
256
]
/* The sort order table of the latin1
character set. The following table is
character set. The following table is
...
...
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