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
84d072dc
Commit
84d072dc
authored
19 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
parents
6196a746
854ad0ab
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
23 deletions
+26
-23
mysql-test/my_manage.c
mysql-test/my_manage.c
+10
-13
mysql-test/r/drop_temp_table.result
mysql-test/r/drop_temp_table.result
+1
-0
mysql-test/t/drop_temp_table.test
mysql-test/t/drop_temp_table.test
+4
-0
sql/log.cc
sql/log.cc
+4
-4
sql/log_event.h
sql/log_event.h
+2
-3
sql/sql_delete.cc
sql/sql_delete.cc
+5
-3
No files found.
mysql-test/my_manage.c
View file @
84d072dc
...
@@ -231,9 +231,6 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)),
...
@@ -231,9 +231,6 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)),
{
{
arg_list_t
al
;
arg_list_t
al
;
int
err
=
0
;
int
err
=
0
;
#ifndef __WIN__
int
i
;
#endif
char
trash
[
FN_REFLEN
];
char
trash
[
FN_REFLEN
];
/* mysqladmin file */
/* mysqladmin file */
...
@@ -247,16 +244,11 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)),
...
@@ -247,16 +244,11 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)),
add_arg
(
&
al
,
"--user=%s"
,
user
);
add_arg
(
&
al
,
"--user=%s"
,
user
);
add_arg
(
&
al
,
"--password=%s"
,
password
);
add_arg
(
&
al
,
"--password=%s"
,
password
);
add_arg
(
&
al
,
"--silent"
);
add_arg
(
&
al
,
"--silent"
);
add_arg
(
&
al
,
"--host=localhost"
);
/* #ifdef NOT_USED */
#ifndef __NETWARE__
#ifndef __NETWARE__
add_arg
(
&
al
,
"-O"
);
add_arg
(
&
al
,
"--connect_timeout=10"
);
add_arg
(
&
al
,
"connect_timeout=10"
);
add_arg
(
&
al
,
"-w"
);
add_arg
(
&
al
,
"-w"
);
#endif
add_arg
(
&
al
,
"--host=localhost"
);
#ifndef __NETWARE__
add_arg
(
&
al
,
"--protocol=tcp"
);
add_arg
(
&
al
,
"--protocol=tcp"
);
#endif
#endif
add_arg
(
&
al
,
"ping"
);
add_arg
(
&
al
,
"ping"
);
...
@@ -266,9 +258,14 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)),
...
@@ -266,9 +258,14 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)),
-- we will try the ping multiple times
-- we will try the ping multiple times
*/
*/
#ifndef __WIN__
#ifndef __WIN__
for
(
i
=
0
;
(
i
<
TRY_MAX
)
{
&&
(
err
=
spawn
(
mysqladmin_file
,
&
al
,
TRUE
,
NULL
,
int
i
;
trash
,
NULL
,
NULL
));
i
++
)
sleep
(
1
);
for
(
i
=
0
;
(
i
<
TRY_MAX
)
&&
(
err
=
spawn
(
mysqladmin_file
,
&
al
,
TRUE
,
NULL
,
trash
,
NULL
,
NULL
));
i
++
)
sleep
(
1
);
}
#else
#else
err
=
spawn
(
mysqladmin_file
,
&
al
,
TRUE
,
NULL
,
trash
,
NULL
,
NULL
);
err
=
spawn
(
mysqladmin_file
,
&
al
,
TRUE
,
NULL
,
trash
,
NULL
,
NULL
);
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/drop_temp_table.result
View file @
84d072dc
drop database if exists `drop-temp+table-test`;
reset master;
reset master;
create database `drop-temp+table-test`;
create database `drop-temp+table-test`;
use `drop-temp+table-test`;
use `drop-temp+table-test`;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/drop_temp_table.test
View file @
84d072dc
# Embedded server doesn't support binlog
# Embedded server doesn't support binlog
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
disable_warnings
drop
database
if
exists
`drop-temp+table-test`
;
--
enable_warnings
connect
(
con1
,
localhost
,
root
,,);
connect
(
con1
,
localhost
,
root
,,);
connect
(
con2
,
localhost
,
root
,,);
connect
(
con2
,
localhost
,
root
,,);
connection
con1
;
connection
con1
;
...
...
This diff is collapsed.
Click to expand it.
sql/log.cc
View file @
84d072dc
...
@@ -358,7 +358,7 @@ MYSQL_LOG::MYSQL_LOG()
...
@@ -358,7 +358,7 @@ MYSQL_LOG::MYSQL_LOG()
:
bytes_written
(
0
),
last_time
(
0
),
query_start
(
0
),
name
(
0
),
:
bytes_written
(
0
),
last_time
(
0
),
query_start
(
0
),
name
(
0
),
file_id
(
1
),
open_count
(
1
),
log_type
(
LOG_CLOSED
),
write_error
(
0
),
inited
(
0
),
file_id
(
1
),
open_count
(
1
),
log_type
(
LOG_CLOSED
),
write_error
(
0
),
inited
(
0
),
need_start_event
(
1
),
prepared_xids
(
0
),
description_event_for_exec
(
0
),
need_start_event
(
1
),
prepared_xids
(
0
),
description_event_for_exec
(
0
),
description_event_for_queue
(
0
),
readers_count
(
0
),
reset_pending
(
false
)
description_event_for_queue
(
0
),
readers_count
(
0
),
reset_pending
(
FALSE
)
{
{
/*
/*
We don't want to initialize LOCK_Log here as such initialization depends on
We don't want to initialize LOCK_Log here as such initialization depends on
...
@@ -965,7 +965,7 @@ bool MYSQL_LOG::reset_logs(THD* thd)
...
@@ -965,7 +965,7 @@ bool MYSQL_LOG::reset_logs(THD* thd)
goto
err
;
goto
err
;
}
}
reset_pending
=
true
;
reset_pending
=
TRUE
;
/*
/*
send update signal just in case so that all reader threads waiting
send update signal just in case so that all reader threads waiting
for log update will leave wait condition
for log update will leave wait condition
...
@@ -975,7 +975,7 @@ bool MYSQL_LOG::reset_logs(THD* thd)
...
@@ -975,7 +975,7 @@ bool MYSQL_LOG::reset_logs(THD* thd)
if there are active readers wait until all of them will
if there are active readers wait until all of them will
release opened files
release opened files
*/
*/
if
(
readers_count
)
while
(
readers_count
)
pthread_cond_wait
(
&
reset_cond
,
&
LOCK_log
);
pthread_cond_wait
(
&
reset_cond
,
&
LOCK_log
);
for
(;;)
for
(;;)
...
@@ -996,7 +996,7 @@ bool MYSQL_LOG::reset_logs(THD* thd)
...
@@ -996,7 +996,7 @@ bool MYSQL_LOG::reset_logs(THD* thd)
my_free
((
gptr
)
save_name
,
MYF
(
0
));
my_free
((
gptr
)
save_name
,
MYF
(
0
));
err:
err:
reset_pending
=
false
;
reset_pending
=
FALSE
;
(
void
)
pthread_mutex_unlock
(
&
LOCK_thread_count
);
(
void
)
pthread_mutex_unlock
(
&
LOCK_thread_count
);
pthread_mutex_unlock
(
&
LOCK_readers
);
pthread_mutex_unlock
(
&
LOCK_readers
);
...
...
This diff is collapsed.
Click to expand it.
sql/log_event.h
View file @
84d072dc
...
@@ -430,11 +430,10 @@ enum Log_event_type
...
@@ -430,11 +430,10 @@ enum Log_event_type
/*
/*
Add new events here - right above this comment!
Add new events here - right above this comment!
And change the ENUM_END_EVENT_MARKER below.
Existing events (except ENUM_END_EVENT) should never change their numbers
Existing events should never change their numbers
*/
*/
ENUM_END_EVENT
=
19
/* end marker */
ENUM_END_EVENT
/* end marker */
};
};
/*
/*
...
...
This diff is collapsed.
Click to expand it.
sql/sql_delete.cc
View file @
84d072dc
...
@@ -158,7 +158,8 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
...
@@ -158,7 +158,8 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
table
->
sort
.
io_cache
=
(
IO_CACHE
*
)
my_malloc
(
sizeof
(
IO_CACHE
),
table
->
sort
.
io_cache
=
(
IO_CACHE
*
)
my_malloc
(
sizeof
(
IO_CACHE
),
MYF
(
MY_FAE
|
MY_ZEROFILL
));
MYF
(
MY_FAE
|
MY_ZEROFILL
));
if
(
!
(
sortorder
=
make_unireg_sortorder
((
ORDER
*
)
order
->
first
,
&
length
))
||
if
(
!
(
sortorder
=
make_unireg_sortorder
((
ORDER
*
)
order
->
first
,
&
length
))
||
(
table
->
sort
.
found_records
=
filesort
(
thd
,
table
,
sortorder
,
length
,
(
table
->
sort
.
found_records
=
filesort
(
thd
,
table
,
sortorder
,
length
,
select
,
HA_POS_ERROR
,
select
,
HA_POS_ERROR
,
&
examined_rows
))
&
examined_rows
))
...
@@ -166,6 +167,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
...
@@ -166,6 +167,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
{
{
delete
select
;
delete
select
;
free_underlaid_joins
(
thd
,
&
thd
->
lex
->
select_lex
);
free_underlaid_joins
(
thd
,
&
thd
->
lex
->
select_lex
);
DBUG_RETURN
(
TRUE
);
}
}
/*
/*
Filesort has already found and selected the rows we want to delete,
Filesort has already found and selected the rows we want to delete,
...
...
This diff is collapsed.
Click to expand it.
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