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
3c6fb303
Commit
3c6fb303
authored
20 years ago
by
marko@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
parents
7a845e43
cda336b9
No related merge requests found
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
98 additions
and
8 deletions
+98
-8
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
client/mysql.cc
client/mysql.cc
+1
-0
client/mysqladmin.c
client/mysqladmin.c
+18
-3
mysql-test/r/ctype_latin1_de.result
mysql-test/r/ctype_latin1_de.result
+15
-0
mysql-test/t/ctype_latin1_de.test
mysql-test/t/ctype_latin1_de.test
+14
-0
sql/repl_failsafe.cc
sql/repl_failsafe.cc
+0
-2
sql/repl_failsafe.h
sql/repl_failsafe.h
+16
-0
sql/slave.h
sql/slave.h
+16
-0
sql/sql_repl.cc
sql/sql_repl.cc
+0
-2
sql/sql_repl.h
sql/sql_repl.h
+16
-0
strings/ctype-latin1_de.c
strings/ctype-latin1_de.c
+1
-1
No files found.
BitKeeper/etc/logging_ok
View file @
3c6fb303
...
...
@@ -20,6 +20,7 @@ bar@mysql.com
bell@laptop.sanja.is.com.ua
bell@sanja.is.com.ua
bk@admin.bk
brian@brian-akers-computer.local
carsten@tsort.bitbybit.dk
davida@isil.mysql.com
dlenev@brandersnatch.localdomain
...
...
This diff is collapsed.
Click to expand it.
client/mysql.cc
View file @
3c6fb303
...
...
@@ -689,6 +689,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
while
(
*
argument
)
*
argument
++=
'x'
;
// Destroy argument
if
(
*
start
)
start
[
1
]
=
0
;
tty_password
=
0
;
}
else
tty_password
=
1
;
...
...
This diff is collapsed.
Click to expand it.
client/mysqladmin.c
View file @
3c6fb303
...
...
@@ -246,7 +246,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
int
main
(
int
argc
,
char
*
argv
[])
{
int
error
,
ho_error
;
int
error
=
0
,
ho_error
;
MYSQL
mysql
;
char
**
commands
,
**
save_argv
;
...
...
@@ -285,10 +285,25 @@ int main(int argc,char *argv[])
opt_ssl_capath
,
opt_ssl_cipher
);
#endif
if
(
sql_connect
(
&
mysql
,
option_wait
))
error
=
1
;
{
unsigned
int
err
=
mysql_errno
(
&
mysql
);
if
(
err
>=
CR_MIN_ERROR
&&
err
<=
CR_MAX_ERROR
)
error
=
1
;
else
{
/* Return 0 if all commands are PING */
for
(;
argc
>
0
;
argv
++
,
argc
--
)
{
if
(
find_type
(
argv
[
0
],
&
command_typelib
,
2
)
!=
ADMIN_PING
)
{
error
=
1
;
break
;
}
}
}
}
else
{
error
=
0
;
while
(
!
interrupted
&&
(
!
opt_count_iterations
||
nr_iterations
))
{
new_line
=
0
;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/ctype_latin1_de.result
View file @
3c6fb303
...
...
@@ -267,3 +267,18 @@ select * from t1 where word like CAST(0xDF as CHAR);
word word2
drop table t1;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (
autor varchar(80) NOT NULL default '',
PRIMARY KEY (autor)
);
INSERT INTO t1 VALUES ('Powell, B.'),('Powell, Bud.'),('Powell, L. H.'),('Power, H.'),
('Poynter, M. A. L. Lane'),('Poynting, J. H. und J. J. Thomson.'),('Pozzi, S(amuel-Jean).'),
('Pozzi, Samuel-Jean.'),('Pozzo, A.'),('Pozzoli, Serge.');
SELECT * FROM t1 WHERE autor LIKE 'Poz%' ORDER BY autor;
autor
Pozzi, S(amuel-Jean).
Pozzi, Samuel-Jean.
Pozzo, A.
Pozzoli, Serge.
DROP TABLE t1;
This diff is collapsed.
Click to expand it.
mysql-test/t/ctype_latin1_de.test
View file @
3c6fb303
...
...
@@ -72,3 +72,17 @@ select * from t1 where word like 'AE';
select
*
from
t1
where
word
like
0xDF
;
select
*
from
t1
where
word
like
CAST
(
0xDF
as
CHAR
);
drop
table
t1
;
#
# Bug #5447 Select does not find records
#
DROP
TABLE
IF
EXISTS
t1
;
CREATE
TABLE
t1
(
autor
varchar
(
80
)
NOT
NULL
default
''
,
PRIMARY
KEY
(
autor
)
);
INSERT
INTO
t1
VALUES
(
'Powell, B.'
),(
'Powell, Bud.'
),(
'Powell, L. H.'
),(
'Power, H.'
),
(
'Poynter, M. A. L. Lane'
),(
'Poynting, J. H. und J. J. Thomson.'
),(
'Pozzi, S(amuel-Jean).'
),
(
'Pozzi, Samuel-Jean.'
),(
'Pozzo, A.'
),(
'Pozzoli, Serge.'
);
SELECT
*
FROM
t1
WHERE
autor
LIKE
'Poz%'
ORDER
BY
autor
;
DROP
TABLE
t1
;
This diff is collapsed.
Click to expand it.
sql/repl_failsafe.cc
View file @
3c6fb303
...
...
@@ -14,8 +14,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
// Sasha Pachev <sasha@mysql.com> is currently in charge of this file
#include "mysql_priv.h"
#include "repl_failsafe.h"
#include "sql_repl.h"
...
...
This diff is collapsed.
Click to expand it.
sql/repl_failsafe.h
View file @
3c6fb303
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB & Sasha
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifndef REPL_FAILSAFE_H
#define REPL_FAILSAFE_H
...
...
This diff is collapsed.
Click to expand it.
sql/slave.h
View file @
3c6fb303
/* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifndef SLAVE_H
#define SLAVE_H
...
...
This diff is collapsed.
Click to expand it.
sql/sql_repl.cc
View file @
3c6fb303
...
...
@@ -14,8 +14,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
// Sasha Pachev <sasha@mysql.com> is currently in charge of this file
#include "mysql_priv.h"
#include "sql_repl.h"
#include "sql_acl.h"
...
...
This diff is collapsed.
Click to expand it.
sql/sql_repl.h
View file @
3c6fb303
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB & Sasha
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include "slave.h"
typedef
struct
st_slave_info
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-latin1_de.c
View file @
3c6fb303
...
...
@@ -248,7 +248,7 @@ int my_strxfrm_latin1_de(uchar * dest, const uchar * src, int len)
*/
#define min_sort_char ((char) 0)
#define max_sort_char ((char)
255
)
#define max_sort_char ((char)
0xF7
)
#define wild_one '_'
#define wild_many '%'
...
...
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