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
9c89ce7b
Commit
9c89ce7b
authored
Jan 29, 2003
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compilation error on windows
sql/sql_table.cc: Added comments
parent
0458a921
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
13 deletions
+50
-13
sql/mysqld.cc
sql/mysqld.cc
+7
-8
sql/sql_table.cc
sql/sql_table.cc
+43
-5
No files found.
sql/mysqld.cc
View file @
9c89ce7b
...
@@ -1382,8 +1382,10 @@ static void init_signals(void)
...
@@ -1382,8 +1382,10 @@ static void init_signals(void)
}
}
static
void
start_signal_handler
(
void
)
static
void
start_signal_handler
(
void
)
{
{}
}
static
void
check_data_home
(
const
char
*
path
)
{}
#elif defined(__NETWARE__)
#elif defined(__NETWARE__)
...
@@ -1500,12 +1502,10 @@ static void init_signals(void)
...
@@ -1500,12 +1502,10 @@ static void init_signals(void)
}
}
static
void
start_signal_handler
(
void
)
static
void
start_signal_handler
(
void
)
{
{}
}
static
void
check_data_home
(
const
char
*
path
)
static
void
check_data_home
(
const
char
*
path
)
{
{}
}
#else
/* if ! __WIN__ && ! __EMX__ */
#else
/* if ! __WIN__ && ! __EMX__ */
...
@@ -1830,8 +1830,7 @@ extern "C" void *signal_hand(void *arg __attribute__((unused)))
...
@@ -1830,8 +1830,7 @@ extern "C" void *signal_hand(void *arg __attribute__((unused)))
}
}
static
void
check_data_home
(
const
char
*
path
)
static
void
check_data_home
(
const
char
*
path
)
{
{}
}
#endif
/* __WIN__*/
#endif
/* __WIN__*/
...
...
sql/sql_table.cc
View file @
9c89ce7b
...
@@ -40,11 +40,28 @@ static int copy_data_between_tables(TABLE *from,TABLE *to,
...
@@ -40,11 +40,28 @@ static int copy_data_between_tables(TABLE *from,TABLE *to,
ORDER
*
order
,
ORDER
*
order
,
ha_rows
*
copied
,
ha_rows
*
deleted
);
ha_rows
*
copied
,
ha_rows
*
deleted
);
/*****************************************************************************
/*
** Remove all possbile tables and give a compact errormessage for all
delete (drop) tables.
** wrong tables.
** This will wait for all users to free the table before dropping it
SYNOPSIS
*****************************************************************************/
mysql_rm_table()
thd Thread handle
tables List of tables to delete
if_exists If 1, don't give error if one table doesn't exists
NOTES
Will delete all tables that can be deleted and give a compact error
messages for tables that could not be deleted.
If a table is in use, we will wait for all users to free the table
before dropping it
Wait if global_read_lock (FLUSH TABLES WITH READ LOCK) is set.
RETURN
0 ok. In this case ok packet is sent to user
-1 Error (Error message given but not sent to user)
*/
int
mysql_rm_table
(
THD
*
thd
,
TABLE_LIST
*
tables
,
my_bool
if_exists
)
int
mysql_rm_table
(
THD
*
thd
,
TABLE_LIST
*
tables
,
my_bool
if_exists
)
{
{
...
@@ -89,6 +106,26 @@ int mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists)
...
@@ -89,6 +106,26 @@ int mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists)
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
}
/*
delete (drop) tables.
SYNOPSIS
mysql_rm_table_part2_with_lock()
thd Thread handle
tables List of tables to delete
if_exists If 1, don't give error if one table doesn't exists
dont_log_query Don't write query to log files
NOTES
Works like documented in mysql_rm_table(), but don't check
global_read_lock and don't send_ok packet to server.
RETURN
0 ok
1 error
*/
int
mysql_rm_table_part2_with_lock
(
THD
*
thd
,
int
mysql_rm_table_part2_with_lock
(
THD
*
thd
,
TABLE_LIST
*
tables
,
bool
if_exists
,
TABLE_LIST
*
tables
,
bool
if_exists
,
bool
dont_log_query
)
bool
dont_log_query
)
...
@@ -110,6 +147,7 @@ int mysql_rm_table_part2_with_lock(THD *thd,
...
@@ -110,6 +147,7 @@ int mysql_rm_table_part2_with_lock(THD *thd,
return
error
;
return
error
;
}
}
/*
/*
TODO:
TODO:
When logging to the binary log, we should log
When logging to the binary log, we should log
...
...
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