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
399a1b84
Commit
399a1b84
authored
May 18, 2006
by
lars@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
After merge fixes
parent
87bb4f95
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
25 deletions
+18
-25
mysql-test/r/rpl_stm_until.result
mysql-test/r/rpl_stm_until.result
+9
-9
mysql-test/r/rpl_temporary.result
mysql-test/r/rpl_temporary.result
+0
-1
mysql-test/t/rpl_temporary.test
mysql-test/t/rpl_temporary.test
+1
-1
sql/mysql_priv.h
sql/mysql_priv.h
+0
-11
sql/sql_base.cc
sql/sql_base.cc
+8
-3
No files found.
mysql-test/r/rpl_stm_until.result
View file @
399a1b84
...
@@ -26,7 +26,7 @@ Master_User root
...
@@ -26,7 +26,7 @@ Master_User root
Master_Port MASTER_MYPORT
Master_Port MASTER_MYPORT
Connect_Retry 1
Connect_Retry 1
Master_Log_File master-bin.000001
Master_Log_File master-bin.000001
Read_Master_Log_Pos 7
76
Read_Master_Log_Pos 7
80
Relay_Log_File slave-relay-bin.000004
Relay_Log_File slave-relay-bin.000004
Relay_Log_Pos #
Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001
Relay_Master_Log_File master-bin.000001
...
@@ -41,11 +41,11 @@ Replicate_Wild_Ignore_Table
...
@@ -41,11 +41,11 @@ Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Errno 0
Last_Error
Last_Error
Skip_Counter 0
Skip_Counter 0
Exec_Master_Log_Pos 3
19
Exec_Master_Log_Pos 3
23
Relay_Log_Space #
Relay_Log_Space #
Until_Condition Master
Until_Condition Master
Until_Log_File master-bin.000001
Until_Log_File master-bin.000001
Until_Log_Pos 3
19
Until_Log_Pos 3
23
Master_SSL_Allowed No
Master_SSL_Allowed No
Master_SSL_CA_File
Master_SSL_CA_File
Master_SSL_CA_Path
Master_SSL_CA_Path
...
@@ -67,7 +67,7 @@ Master_User root
...
@@ -67,7 +67,7 @@ Master_User root
Master_Port MASTER_MYPORT
Master_Port MASTER_MYPORT
Connect_Retry 1
Connect_Retry 1
Master_Log_File master-bin.000001
Master_Log_File master-bin.000001
Read_Master_Log_Pos 7
76
Read_Master_Log_Pos 7
80
Relay_Log_File slave-relay-bin.000004
Relay_Log_File slave-relay-bin.000004
Relay_Log_Pos #
Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001
Relay_Master_Log_File master-bin.000001
...
@@ -82,7 +82,7 @@ Replicate_Wild_Ignore_Table
...
@@ -82,7 +82,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Errno 0
Last_Error
Last_Error
Skip_Counter 0
Skip_Counter 0
Exec_Master_Log_Pos 3
19
Exec_Master_Log_Pos 3
23
Relay_Log_Space #
Relay_Log_Space #
Until_Condition Master
Until_Condition Master
Until_Log_File master-no-such-bin.000001
Until_Log_File master-no-such-bin.000001
...
@@ -106,7 +106,7 @@ Master_User root
...
@@ -106,7 +106,7 @@ Master_User root
Master_Port MASTER_MYPORT
Master_Port MASTER_MYPORT
Connect_Retry 1
Connect_Retry 1
Master_Log_File master-bin.000001
Master_Log_File master-bin.000001
Read_Master_Log_Pos 7
76
Read_Master_Log_Pos 7
80
Relay_Log_File slave-relay-bin.000004
Relay_Log_File slave-relay-bin.000004
Relay_Log_Pos #
Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001
Relay_Master_Log_File master-bin.000001
...
@@ -121,7 +121,7 @@ Replicate_Wild_Ignore_Table
...
@@ -121,7 +121,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Errno 0
Last_Error
Last_Error
Skip_Counter 0
Skip_Counter 0
Exec_Master_Log_Pos 6
08
Exec_Master_Log_Pos 6
12
Relay_Log_Space #
Relay_Log_Space #
Until_Condition Relay
Until_Condition Relay
Until_Log_File slave-relay-bin.000004
Until_Log_File slave-relay-bin.000004
...
@@ -143,7 +143,7 @@ Master_User root
...
@@ -143,7 +143,7 @@ Master_User root
Master_Port MASTER_MYPORT
Master_Port MASTER_MYPORT
Connect_Retry 1
Connect_Retry 1
Master_Log_File master-bin.000001
Master_Log_File master-bin.000001
Read_Master_Log_Pos 7
76
Read_Master_Log_Pos 7
80
Relay_Log_File slave-relay-bin.000004
Relay_Log_File slave-relay-bin.000004
Relay_Log_Pos #
Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001
Relay_Master_Log_File master-bin.000001
...
@@ -158,7 +158,7 @@ Replicate_Wild_Ignore_Table
...
@@ -158,7 +158,7 @@ Replicate_Wild_Ignore_Table
Last_Errno 0
Last_Errno 0
Last_Error
Last_Error
Skip_Counter 0
Skip_Counter 0
Exec_Master_Log_Pos 7
76
Exec_Master_Log_Pos 7
80
Relay_Log_Space #
Relay_Log_Space #
Until_Condition Master
Until_Condition Master
Until_Log_File master-bin.000001
Until_Log_File master-bin.000001
...
...
mysql-test/r/rpl_temporary.result
View file @
399a1b84
...
@@ -93,7 +93,6 @@ create temporary table t101 (id int);
...
@@ -93,7 +93,6 @@ create temporary table t101 (id int);
create temporary table t102 (id int);
create temporary table t102 (id int);
set @@session.pseudo_thread_id=200;
set @@session.pseudo_thread_id=200;
create temporary table t201 (id int);
create temporary table t201 (id int);
create temporary table `t``201` (id int);
create temporary table `#sql_not_user_table202` (id int);
create temporary table `#sql_not_user_table202` (id int);
set @@session.pseudo_thread_id=300;
set @@session.pseudo_thread_id=300;
create temporary table t301 (id int);
create temporary table t301 (id int);
...
...
mysql-test/t/rpl_temporary.test
View file @
399a1b84
...
@@ -170,7 +170,7 @@ create temporary table t101 (id int);
...
@@ -170,7 +170,7 @@ create temporary table t101 (id int);
create
temporary
table
t102
(
id
int
);
create
temporary
table
t102
(
id
int
);
set
@@
session
.
pseudo_thread_id
=
200
;
set
@@
session
.
pseudo_thread_id
=
200
;
create
temporary
table
t201
(
id
int
);
create
temporary
table
t201
(
id
int
);
create
temporary
table
`t``201`
(
id
int
);
#
create temporary table `t``201` (id int);
# emulate internal temp table not to come to binlog
# emulate internal temp table not to come to binlog
create
temporary
table
`#sql_not_user_table202`
(
id
int
);
create
temporary
table
`#sql_not_user_table202`
(
id
int
);
set
@@
session
.
pseudo_thread_id
=
300
;
set
@@
session
.
pseudo_thread_id
=
300
;
...
...
sql/mysql_priv.h
View file @
399a1b84
...
@@ -1936,17 +1936,6 @@ inline int hexchar_to_int(char c)
...
@@ -1936,17 +1936,6 @@ inline int hexchar_to_int(char c)
return
-
1
;
return
-
1
;
}
}
/*
is_user_table()
return true if the table was created explicitly
*/
inline
bool
is_user_table
(
TABLE
*
table
)
{
const
char
*
name
=
table
->
s
->
table_name
;
return
strncmp
(
name
,
tmp_file_prefix
,
tmp_file_prefix_length
);
}
/*
/*
Some functions that are different in the embedded library and the normal
Some functions that are different in the embedded library and the normal
server
server
...
...
sql/sql_base.cc
View file @
399a1b84
...
@@ -1183,7 +1183,13 @@ static inline uint tmpkeyval(THD *thd, TABLE *table)
...
@@ -1183,7 +1183,13 @@ static inline uint tmpkeyval(THD *thd, TABLE *table)
void
close_temporary_tables
(
THD
*
thd
)
void
close_temporary_tables
(
THD
*
thd
)
{
{
TABLE
*
table
;
TABLE
*
next
,
*
prev_table
/* prev link is not maintained in TABLE's double-linked list */
,
*
table
;
char
*
query
=
(
gptr
)
0
,
*
end
;
uint
query_buf_size
,
max_names_len
;
bool
found_user_tables
;
if
(
!
thd
->
temporary_tables
)
if
(
!
thd
->
temporary_tables
)
return
;
return
;
...
@@ -1311,7 +1317,6 @@ void close_temporary_tables(THD *thd)
...
@@ -1311,7 +1317,6 @@ void close_temporary_tables(THD *thd)
thd
->
temporary_tables
=
0
;
thd
->
temporary_tables
=
0
;
}
}
/*
/*
Find table in list.
Find table in list.
...
...
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