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
0ccb106a
Commit
0ccb106a
authored
Feb 14, 2002
by
monty@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
parents
d0fc67f4
62c9f03f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
sql/ha_innobase.cc
sql/ha_innobase.cc
+11
-2
No files found.
BitKeeper/etc/logging_ok
View file @
0ccb106a
...
@@ -11,3 +11,4 @@ mwagner@cash.mwagner.org
...
@@ -11,3 +11,4 @@ mwagner@cash.mwagner.org
paul@central.snake.net
paul@central.snake.net
sasha@mysql.sashanet.com
sasha@mysql.sashanet.com
serg@serg.mysql.com
serg@serg.mysql.com
heikki@hundin.mysql.fi
sql/ha_innobase.cc
View file @
0ccb106a
...
@@ -85,7 +85,7 @@ long innobase_mirrored_log_groups, innobase_log_files_in_group,
...
@@ -85,7 +85,7 @@ long innobase_mirrored_log_groups, innobase_log_files_in_group,
char
*
innobase_data_home_dir
,
*
innobase_data_file_path
;
char
*
innobase_data_home_dir
,
*
innobase_data_file_path
;
char
*
innobase_log_group_home_dir
,
*
innobase_log_arch_dir
;
char
*
innobase_log_group_home_dir
,
*
innobase_log_arch_dir
;
char
*
innobase_unix_file_flush_method
;
char
*
innobase_unix_file_flush_method
;
my_
bool
innobase_flush_log_at_trx_commit
,
innobase_log_archive
,
bool
innobase_flush_log_at_trx_commit
,
innobase_log_archive
,
innobase_use_native_aio
,
innobase_fast_shutdown
;
innobase_use_native_aio
,
innobase_fast_shutdown
;
/* innobase_data_file_path=ibdata:15,idata2:1,... */
/* innobase_data_file_path=ibdata:15,idata2:1,... */
...
@@ -2804,6 +2804,16 @@ innobase_drop_database(
...
@@ -2804,6 +2804,16 @@ innobase_drop_database(
namebuf
[
len
]
=
'/'
;
namebuf
[
len
]
=
'/'
;
namebuf
[
len
+
1
]
=
'\0'
;
namebuf
[
len
+
1
]
=
'\0'
;
#ifdef __WIN__
/* Put to lower case */
ptr
=
namebuf
;
while
(
*
ptr
!=
'\0'
)
{
*
ptr
=
tolower
(
*
ptr
);
ptr
++
;
}
#endif
trx
=
trx_allocate_for_mysql
();
trx
=
trx_allocate_for_mysql
();
error
=
row_drop_database_for_mysql
(
namebuf
,
trx
);
error
=
row_drop_database_for_mysql
(
namebuf
,
trx
);
...
@@ -2954,7 +2964,6 @@ ha_innobase::records_in_range(
...
@@ -2954,7 +2964,6 @@ ha_innobase::records_in_range(
my_free
((
char
*
)
key_val_buff2
,
MYF
(
0
));
my_free
((
char
*
)
key_val_buff2
,
MYF
(
0
));
DBUG_RETURN
((
ha_rows
)
n_rows
);
DBUG_RETURN
((
ha_rows
)
n_rows
);
}
}
...
...
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