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
8fe764fb
Commit
8fe764fb
authored
Apr 11, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.1-new
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
parents
e9ef9ef6
e805afde
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
192 additions
and
32 deletions
+192
-32
Makefile.am
Makefile.am
+11
-28
client/mysql.cc
client/mysql.cc
+2
-3
include/mysql.h
include/mysql.h
+1
-0
libmysql/Makefile.shared
libmysql/Makefile.shared
+1
-0
libmysql/libmysql.def
libmysql/libmysql.def
+1
-0
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+12
-0
mysql-test/r/ndb_alter_table2.result
mysql-test/r/ndb_alter_table2.result
+42
-0
mysql-test/t/ndb_alter_table2.test
mysql-test/t/ndb_alter_table2.test
+82
-0
mysys/Makefile.am
mysys/Makefile.am
+1
-0
mysys/default.c
mysys/default.c
+9
-1
sql-common/client.c
sql-common/client.c
+21
-0
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+9
-0
No files found.
Makefile.am
View file @
8fe764fb
...
...
@@ -119,54 +119,37 @@ tags:
# making sure each user use different ports.
test
:
cd
mysql-test
;
\
./mysql-test-run
--mysqld
=
--binlog-format
=
statement
&&
\
./mysql-test-run
--ps-protocol
--mysqld
=
--binlog-format
=
row
test-full
:
cd
mysql-test
;
\
./mysql-test-run
--mysqld
=
--binlog-format
=
statement
&&
\
./mysql-test-run
--ps-protocol
--mysqld
=
--binlog-format
=
statement
&&
\
./mysql-test-run
--mysqld
=
--binlog-format
=
row
&&
\
./mysql-test-run
--ps-protocol
--mysqld
=
--binlog-format
=
row
test-force
:
cd
mysql-test
;
\
./mysql-test-run
--force
--mysqld
=
--binlog-format
=
statement
&&
\
./mysql-test-run
--ps-protocol
--force
--mysqld
=
--binlog-format
=
row
test-force-full
:
cd
mysql-test
;
\
./mysql-test-run
--force
--mysqld
=
--binlog-format
=
statement
&&
\
./mysql-test-run
--force
--ps-protocol
--mysqld
=
--binlog-format
=
statement
&&
\
./mysql-test-run
--force
--mysqld
=
--binlog-format
=
row
&&
\
./mysql-test-run
--force
--ps-protocol
--mysqld
=
--binlog-format
=
row
# We are testing a new Perl version of the test script
test-pl
:
cd
mysql-test
;
\
./mysql-test-run.pl
--mysqld
=
--binlog-format
=
statement
&&
\
./mysql-test-run.pl
--ps-protocol
--mysqld
=
--binlog-format
=
row
test-full
-pl
:
test-full
:
cd
mysql-test
;
\
./mysql-test-run.pl
--mysqld
=
--binlog-format
=
statement
&&
\
./mysql-test-run.pl
--ps-protocol
--mysqld
=
--binlog-format
=
statement
&&
\
./mysql-test-run.pl
--mysqld
=
--binlog-format
=
row
&&
\
./mysql-test-run.pl
--ps-protocol
--mysqld
=
--binlog-format
=
row
test-force
-pl
:
test-force
:
cd
mysql-test
;
\
./mysql-test-run.pl
--force
--mysqld
=
--binlog-format
=
statement
&&
\
./mysql-test-run.pl
--ps-protocol
--force
--mysqld
=
--binlog-format
=
row
test-force-full
-pl
:
test-force-full
:
cd
mysql-test
;
\
./mysql-test-run.pl
--force
--mysqld
=
--binlog-format
=
statement
&&
\
./mysql-test-run.pl
--force
--ps-protocol
--mysqld
=
--binlog-format
=
statement
&&
\
./mysql-test-run.pl
--force
--mysqld
=
--binlog-format
=
row
&&
\
./mysql-test-run.pl
--force
--ps-protocol
--mysqld
=
--binlog-format
=
row
# Keep these for a while
test-pl
:
test
test-full-pl
:
test-full
test-force-pl
:
test-force
test-force-full-pl
:
test-force-full
# Don't update the files from bitkeeper
%
::
SCCS/s.%
client/mysql.cc
View file @
8fe764fb
...
...
@@ -3212,10 +3212,9 @@ com_status(String *buffer __attribute__((unused)),
mysql_free_result
(
result
);
}
#ifdef HAVE_OPENSSL
if
(
mysql
.
net
.
vio
&&
mysql
.
net
.
vio
->
ssl_arg
&&
SSL_get_cipher
((
SSL
*
)
mysql
.
net
.
vio
->
ssl_arg
))
if
((
status
=
mysql_get_ssl_cipher
(
&
mysql
)))
tee_fprintf
(
stdout
,
"SSL:
\t\t\t
Cipher in use is %s
\n
"
,
SSL_get_cipher
((
SSL
*
)
mysql
.
net
.
vio
->
ssl_arg
)
);
status
);
else
#endif
/* HAVE_OPENSSL */
tee_puts
(
"SSL:
\t\t\t
Not in use"
,
stdout
);
...
...
include/mysql.h
View file @
8fe764fb
...
...
@@ -409,6 +409,7 @@ MYSQL * STDCALL mysql_init(MYSQL *mysql);
my_bool
STDCALL
mysql_ssl_set
(
MYSQL
*
mysql
,
const
char
*
key
,
const
char
*
cert
,
const
char
*
ca
,
const
char
*
capath
,
const
char
*
cipher
);
const
char
*
STDCALL
mysql_get_ssl_cipher
(
MYSQL
*
mysql
);
my_bool
STDCALL
mysql_change_user
(
MYSQL
*
mysql
,
const
char
*
user
,
const
char
*
passwd
,
const
char
*
db
);
MYSQL
*
STDCALL
mysql_real_connect
(
MYSQL
*
mysql
,
const
char
*
host
,
...
...
libmysql/Makefile.shared
View file @
8fe764fb
...
...
@@ -85,6 +85,7 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-DDATADIR
=
"
\"
$(MYSQLDATAdir)
\"
"
\
-DDEFAULT_HOME_ENV
=
MYSQL_HOME
\
-DDEFAULT_GROUP_SUFFIX_ENV
=
MYSQL_GROUP_SUFFIX
\
-DDEFAULT_SYSCONFDIR
=
"
\"
$(sysconfdir)
\"
"
\
-DSHAREDIR
=
"
\"
$(MYSQLSHAREdir)
\"
"
$(target_defs)
if
HAVE_YASSL
...
...
libmysql/libmysql.def
View file @
8fe764fb
...
...
@@ -65,6 +65,7 @@ EXPORTS
mysql_get_proto_info
mysql_get_server_info
mysql_get_client_version
mysql_get_ssl_cipher
mysql_info
mysql_init
mysql_insert_id
...
...
mysql-test/mysql-test-run.sh
View file @
8fe764fb
...
...
@@ -7,6 +7,18 @@
# List of failed cases (--force) backported from 4.1 by Joerg
# :-)
echo
"##################################################"
;
echo
"This script is deprecated and will soon be removed"
;
echo
"Use mysql-test-run.pl instead"
;
echo
"Now sleeping 20 seconds..."
;
echo
"##################################################"
;
sleep
20
;
echo
"continuing"
;
echo
;
#++
# Access Definitions
#--
...
...
mysql-test/r/ndb_alter_table2.result
0 → 100644
View file @
8fe764fb
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (
a INT NOT NULL PRIMARY KEY,
b INT NOT NULL
) ENGINE=ndbcluster;
BEGIN;
INSERT INTO t1 VALUES (9410,9412);
BEGIN;
INSERT INTO t1 VALUES (9411,9412);
BEGIN;
INSERT INTO t1 VALUES (9412,9412);
BEGIN;
INSERT INTO t1 VALUES (9413,9412);
BEGIN;
INSERT INTO t1 VALUES (9414,9412);
BEGIN;
INSERT INTO t1 VALUES (9415,9412);
ROLLBACK;
ROLLBACK;
ROLLBACK;
ROLLBACK;
ROLLBACK;
ROLLBACK;
drop table t1;
CREATE TABLE t1 (
a INT NOT NULL PRIMARY KEY,
b INT NOT NULL,
c INT NOT NULL
) ENGINE=ndbcluster;
select * from t1;
a b c
select * from t1;
a b c
select * from t1;
a b c
select * from t1;
a b c
select * from t1;
a b c
select * from t1;
a b c
drop table t1;
mysql-test/t/ndb_alter_table2.test
0 → 100644
View file @
8fe764fb
--
source
include
/
have_ndb
.
inc
--
source
include
/
have_multi_ndb
.
inc
--
source
include
/
not_embedded
.
inc
--
disable_warnings
DROP
TABLE
IF
EXISTS
t1
;
--
enable_warnings
connect
(
con1
,
localhost
,
root
,,
test
);
connect
(
con2
,
localhost
,
root
,,
test
);
connect
(
con3
,
localhost
,
root
,,
test
);
connect
(
con4
,
localhost
,
root
,,
test
);
connect
(
con5
,
localhost
,
root
,,
test
);
connect
(
con6
,
localhost
,
root
,,
test
);
CREATE
TABLE
t1
(
a
INT
NOT
NULL
PRIMARY
KEY
,
b
INT
NOT
NULL
)
ENGINE
=
ndbcluster
;
connection
con1
;
BEGIN
;
INSERT
INTO
t1
VALUES
(
9410
,
9412
);
connection
con2
;
BEGIN
;
--
send
INSERT
INTO
t1
VALUES
(
9411
,
9412
);
connection
con3
;
BEGIN
;
--
send
INSERT
INTO
t1
VALUES
(
9412
,
9412
);
connection
con4
;
BEGIN
;
--
send
INSERT
INTO
t1
VALUES
(
9413
,
9412
);
connection
con5
;
BEGIN
;
--
send
INSERT
INTO
t1
VALUES
(
9414
,
9412
);
connection
con6
;
BEGIN
;
--
send
INSERT
INTO
t1
VALUES
(
9415
,
9412
);
connection
con1
;
sleep
1
;
ROLLBACK
;
connection
con2
;
reap
;
ROLLBACK
;
connection
con3
;
reap
;
ROLLBACK
;
connection
con4
;
reap
;
ROLLBACK
;
connection
con5
;
reap
;
ROLLBACK
;
connection
con6
;
reap
;
ROLLBACK
;
connection
server2
;
drop
table
t1
;
CREATE
TABLE
t1
(
a
INT
NOT
NULL
PRIMARY
KEY
,
b
INT
NOT
NULL
,
c
INT
NOT
NULL
)
ENGINE
=
ndbcluster
;
connection
server1
;
select
*
from
t1
;
select
*
from
t1
;
select
*
from
t1
;
select
*
from
t1
;
select
*
from
t1
;
select
*
from
t1
;
drop
table
t1
;
mysys/Makefile.am
View file @
8fe764fb
...
...
@@ -70,6 +70,7 @@ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
-DSHAREDIR
=
"
\"
$(MYSQLSHAREdir)
\"
"
\
-DDEFAULT_HOME_ENV
=
MYSQL_HOME
\
-DDEFAULT_GROUP_SUFFIX_ENV
=
MYSQL_GROUP_SUFFIX
\
-DDEFAULT_SYSCONFDIR
=
"
\"
$(sysconfdir)
\"
"
\
@DEFS@
libmysys_a_DEPENDENCIES
=
@THREAD_LOBJECTS@
...
...
mysys/default.c
View file @
8fe764fb
...
...
@@ -48,7 +48,7 @@ char *defaults_extra_file=0;
/* Which directories are searched for options (and in which order) */
#define MAX_DEFAULT_DIRS
6
#define MAX_DEFAULT_DIRS
7
const
char
*
default_directories
[
MAX_DEFAULT_DIRS
+
1
];
#ifdef __WIN__
...
...
@@ -959,11 +959,13 @@ static uint my_get_system_windows_directory(char *buffer, uint size)
4. getenv(DEFAULT_HOME_ENV)
5. Directory above where the executable is located
6. ""
7. --sysconfdir=<path>
On Novell NetWare, this is:
1. sys:/etc/
2. getenv(DEFAULT_HOME_ENV)
3. ""
4. --sysconfdir=<path>
On OS/2, this is:
1. getenv(ETC)
...
...
@@ -971,12 +973,14 @@ static uint my_get_system_windows_directory(char *buffer, uint size)
3. getenv(DEFAULT_HOME_ENV)
4. ""
5. "~/"
6. --sysconfdir=<path>
Everywhere else, this is:
1. /etc/
2. getenv(DEFAULT_HOME_ENV)
3. ""
4. "~/"
5. --sysconfdir=<path>
*/
...
...
@@ -1040,6 +1044,10 @@ static void init_default_directories()
}
*
ptr
++=
(
char
*
)
&
config_dir
;
}
#endif
#ifdef DEFAULT_SYSCONFDIR
if
(
DEFAULT_SYSCONFDIR
!=
""
)
*
ptr
++=
DEFAULT_SYSCONFDIR
;
#endif
*
ptr
=
0
;
/* end marker */
}
sql-common/client.c
View file @
8fe764fb
...
...
@@ -1535,6 +1535,27 @@ mysql_ssl_free(MYSQL *mysql __attribute__((unused)))
mysql
->
connector_fd
=
0
;
DBUG_VOID_RETURN
;
}
/*
Return the SSL cipher (if any) used for current
connection to the server.
SYNOPSYS
mysql_get_ssl_cipher()
mysql pointer to the mysql connection
*/
const
char
*
STDCALL
mysql_get_ssl_cipher
(
MYSQL
*
mysql
)
{
DBUG_ENTER
(
"mysql_get_ssl_cipher"
);
if
(
mysql
->
net
.
vio
&&
mysql
->
net
.
vio
->
ssl_arg
)
DBUG_RETURN
(
SSL_get_cipher_name
((
SSL
*
)
mysql
->
net
.
vio
->
ssl_arg
));
DBUG_RETURN
(
NULL
);
}
#endif
/* HAVE_OPENSSL */
...
...
sql/ha_ndbcluster.cc
View file @
8fe764fb
...
...
@@ -556,8 +556,16 @@ int ha_ndbcluster::ndb_err(NdbTransaction *trans)
ERR_PRINT
(
err
);
switch
(
err
.
classification
)
{
case
NdbError
:
:
SchemaError
:
{
invalidate_dictionary_cache
(
TRUE
);
/* Close other open handlers not used by any thread */
TABLE_LIST
table_list
;
bzero
((
char
*
)
&
table_list
,
sizeof
(
table_list
));
table_list
.
db
=
m_dbname
;
table_list
.
alias
=
table_list
.
table_name
=
m_tabname
;
close_cached_tables
(
current_thd
,
0
,
&
table_list
);
if
(
err
.
code
==
284
)
{
/*
...
...
@@ -576,6 +584,7 @@ int ha_ndbcluster::ndb_err(NdbTransaction *trans)
DBUG_PRINT
(
"info"
,
(
"Table exists but must have changed"
));
}
break
;
}
default:
break
;
}
...
...
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