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
b1f7c125
Commit
b1f7c125
authored
Jun 17, 2002
by
monty@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge with 3.23.52
parents
4d703060
0762b00d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
38 additions
and
5 deletions
+38
-5
Build-tools/Do-linux-build
Build-tools/Do-linux-build
+2
-0
Build-tools/mysql-copyright-2
Build-tools/mysql-copyright-2
+7
-2
Docs/manual.texi
Docs/manual.texi
+1
-1
mysql-test/r/rpl_alter.result
mysql-test/r/rpl_alter.result
+4
-0
mysql-test/t/rpl_alter.test
mysql-test/t/rpl_alter.test
+21
-0
sql/mysqld.cc
sql/mysqld.cc
+2
-2
sql/sql_base.cc
sql/sql_base.cc
+1
-0
No files found.
Build-tools/Do-linux-build
View file @
b1f7c125
...
@@ -16,6 +16,7 @@ BUILD/compile-pentium-max $OTHER_LIBC \
...
@@ -16,6 +16,7 @@ BUILD/compile-pentium-max $OTHER_LIBC \
--prefix
=
/usr/local/mysql
--with-extra-charset
=
complex
\
--prefix
=
/usr/local/mysql
--with-extra-charset
=
complex
\
--enable-thread-safe-client
--enable-local-infile
\
--enable-thread-safe-client
--enable-local-infile
\
--with-server-suffix
=
-max
--with-server-suffix
=
-max
nm
-n
sql/mysqld |
gzip
-9
-v
2>&1
>
sql/mysqld.sym.gz
scripts/make_binary_distribution
scripts/make_binary_distribution
make dist
make dist
Build-tools/Do-rpm
--local
Build-tools/Do-rpm
--local
...
@@ -23,4 +24,5 @@ BUILD/compile-pentium --with-other-libc=$OTHER_LIBC_DIR \
...
@@ -23,4 +24,5 @@ BUILD/compile-pentium --with-other-libc=$OTHER_LIBC_DIR \
--with-comment
=
"Official MySQL Binary"
\
--with-comment
=
"Official MySQL Binary"
\
--prefix
=
/usr/local/mysql
--with-extra-charset
=
complex
\
--prefix
=
/usr/local/mysql
--with-extra-charset
=
complex
\
--enable-thread-safe-client
--enable-local-infile
--enable-thread-safe-client
--enable-local-infile
nm
-n
sql/mysqld |
gzip
-9
-v
2>&1
>
sql/mysqld.sym.gz
scripts/make_binary_distribution
scripts/make_binary_distribution
Build-tools/mysql-copyright-2
View file @
b1f7c125
...
@@ -89,13 +89,18 @@ sub add_copyright
...
@@ -89,13 +89,18 @@ sub add_copyright
elsif
(
$ARGV
=~
/\.c$/
||
elsif
(
$ARGV
=~
/\.c$/
||
$ARGV
=~
/\.cc$/
||
$ARGV
=~
/\.cc$/
||
$ARGV
=~
/\.h$/
||
$ARGV
=~
/\.h$/
||
$ARGV
=~
/\.yy$/
||
$ARGV
=~
/\.yy$/
)
$ARGV
=~
/-x86\.s$/
)
{
{
$start_copyright
=
"
/*
";
$start_copyright
=
"
/*
";
$line_copyright
=
"
";
$line_copyright
=
"
";
$end_copyright
=
"
*/
";
$end_copyright
=
"
*/
";
}
}
elsif
(
$ARGV
=~
/-x86\.s$/
)
{
$start_copyright
=
"
#
";
$line_copyright
=
"
#
";
$end_copyright
=
"";
}
elsif
(
$ARGV
=~
/\.s$/
)
elsif
(
$ARGV
=~
/\.s$/
)
{
{
$start_copyright
=
"
!
";
$start_copyright
=
"
!
";
...
...
Docs/manual.texi
View file @
b1f7c125
...
@@ -31453,7 +31453,7 @@ mysql> SELECT 'David!' LIKE 'David_';
...
@@ -31453,7 +31453,7 @@ mysql> SELECT 'David!' LIKE 'David_';
-> 1
-> 1
mysql> SELECT 'David!' LIKE '%D%v%';
mysql> SELECT 'David!' LIKE '%D%v%';
-> 1
-> 1
mysql> select TRUNCATE(-1
,
999,1);
mysql> select TRUNCATE(-1
.
999,1);
-> -1.9
-> -1.9
@end example
@end example
mysql-test/r/rpl_alter.result
0 → 100644
View file @
b1f7c125
n m
1 2
n
45
mysql-test/t/rpl_alter.test
0 → 100644
View file @
b1f7c125
source
include
/
master
-
slave
.
inc
;
connection
master
;
use
test
;
drop
database
if
exists
d1
;
create
database
d1
;
create
table
d1
.
t1
(
n
int
);
alter
table
d1
.
t1
add
m
int
;
insert
into
d1
.
t1
values
(
1
,
2
);
create
table
d1
.
t2
(
n
int
);
insert
into
d1
.
t2
values
(
45
);
rename
table
d1
.
t2
to
d1
.
t3
,
d1
.
t1
to
d1
.
t2
;
save_master_pos
;
connection
slave
;
sync_with_master
;
select
*
from
d1
.
t2
;
select
*
from
d1
.
t3
;
connection
master
;
drop
database
d1
;
save_master_pos
;
connection
slave
;
sync_with_master
;
sql/mysqld.cc
View file @
b1f7c125
...
@@ -1679,8 +1679,8 @@ pthread_handler_decl(handle_shutdown,arg)
...
@@ -1679,8 +1679,8 @@ pthread_handler_decl(handle_shutdown,arg)
abort_loop
=
1
;
abort_loop
=
1
;
// unblock select()
// unblock select()
so_cancel
(
ip_sock
);
so_cancel
(
ip_sock
);
so_cancel
(
unix_sock
);
so_cancel
(
unix_sock
);
return
0
;
return
0
;
}
}
...
...
sql/sql_base.cc
View file @
b1f7c125
...
@@ -554,6 +554,7 @@ void close_temporary_tables(THD *thd)
...
@@ -554,6 +554,7 @@ void close_temporary_tables(THD *thd)
*--
end
=
0
;
// Remove last ','
*--
end
=
0
;
// Remove last ','
thd
->
query_length
=
(
uint
)(
end
-
query
);
thd
->
query_length
=
(
uint
)(
end
-
query
);
Query_log_event
qinfo
(
thd
,
query
);
Query_log_event
qinfo
(
thd
,
query
);
qinfo
.
error_code
=
0
;
mysql_bin_log
.
write
(
&
qinfo
);
mysql_bin_log
.
write
(
&
qinfo
);
thd
->
query_length
=
save_query_len
;
thd
->
query_length
=
save_query_len
;
}
}
...
...
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