Commit 8f75d091 authored by tsmith@maint1.mysql.com's avatar tsmith@maint1.mysql.com

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint

into  maint1.mysql.com:/data/localhome/tsmith/bk/51
parents aeced431 2ed61076
...@@ -1208,7 +1208,7 @@ static void print_xml_tag(FILE * xml_file, const char* sbeg, const char* send, ...@@ -1208,7 +1208,7 @@ static void print_xml_tag(FILE * xml_file, const char* sbeg, const char* send,
const char* first_attribute_name, ...) const char* first_attribute_name, ...)
{ {
va_list arg_list; va_list arg_list;
char *attribute_name, *attribute_value; const char *attribute_name, *attribute_value;
fputs(sbeg, xml_file); fputs(sbeg, xml_file);
fputc('<', xml_file); fputc('<', xml_file);
...@@ -1458,7 +1458,7 @@ static uint dump_events_for_db(char *db) ...@@ -1458,7 +1458,7 @@ static uint dump_events_for_db(char *db)
static void print_blob_as_hex(FILE *output_file, const char *str, ulong len) static void print_blob_as_hex(FILE *output_file, const char *str, ulong len)
{ {
/* sakaik got the idea to to provide blob's in hex notation. */ /* sakaik got the idea to to provide blob's in hex notation. */
char *ptr= str, *end= ptr + len; const char *ptr= str, *end= ptr + len;
for (; ptr < end ; ptr++) for (; ptr < end ; ptr++)
fprintf(output_file, "%02X", *((uchar *)ptr)); fprintf(output_file, "%02X", *((uchar *)ptr));
check_io(output_file); check_io(output_file);
......
...@@ -398,13 +398,13 @@ TYPELIB command_typelib= {array_elements(command_names),"", ...@@ -398,13 +398,13 @@ TYPELIB command_typelib= {array_elements(command_names),"",
DYNAMIC_STRING ds_res, ds_progress, ds_warning_messages; DYNAMIC_STRING ds_res, ds_progress, ds_warning_messages;
void die(const char *fmt, ...) void die(const char *fmt, ...)
/* ATTRIBUTE_FORMAT(printf, 1, 2) */; ATTRIBUTE_FORMAT(printf, 1, 2);
void abort_not_supported_test(const char *fmt, ...) void abort_not_supported_test(const char *fmt, ...)
/* ATTRIBUTE_FORMAT(printf, 1, 2) */; ATTRIBUTE_FORMAT(printf, 1, 2);
void verbose_msg(const char *fmt, ...) void verbose_msg(const char *fmt, ...)
/* ATTRIBUTE_FORMAT(printf, 1, 2) */; ATTRIBUTE_FORMAT(printf, 1, 2);
void warning_msg(const char *fmt, ...) void warning_msg(const char *fmt, ...)
/* ATTRIBUTE_FORMAT(printf, 1, 2) */; ATTRIBUTE_FORMAT(printf, 1, 2);
VAR* var_from_env(const char *, const char *); VAR* var_from_env(const char *, const char *);
VAR* var_init(VAR* v, const char *name, int name_len, const char *val, VAR* var_init(VAR* v, const char *name, int name_len, const char *val,
......
...@@ -1058,6 +1058,18 @@ EOF ...@@ -1058,6 +1058,18 @@ EOF
extra/Makefile.in) extra/Makefile.in)
cat > $filesed << EOF cat > $filesed << EOF
s,\(extra/comp_err\)\$(EXEEXT),\1.linux, s,\(extra/comp_err\)\$(EXEEXT),\1.linux,
EOF
;;
libmysql/Makefile.in)
cat > $filesed << EOF
s,libyassl.la,.libs/libyassl.a,
s,libtaocrypt.la,.libs/libtaocrypt.a,
EOF
;;
libmysql_r/Makefile.in)
cat > $filesed << EOF
s,libyassl.la,.libs/libyassl.a,
s,libtaocrypt.la,.libs/libtaocrypt.a,
EOF EOF
;; ;;
client/Makefile.in) client/Makefile.in)
......
...@@ -27,9 +27,12 @@ ...@@ -27,9 +27,12 @@
#endif /* _WIN32 */ #endif /* _WIN32 */
#if !defined(_SOCKLEN_T) && (defined(_WIN32) || defined(__NETWARE__)) #if !defined(_SOCKLEN_T) && defined(_WIN32)
typedef int socklen_t; typedef int socklen_t;
#endif #endif
#if !defined(_SOCKLEN_T) && defined(__NETWARE__)
typedef size_t socklen_t;
#endif
// Check type of third arg to accept // Check type of third arg to accept
......
...@@ -293,12 +293,6 @@ typedef struct st_mysql ...@@ -293,12 +293,6 @@ typedef struct st_mysql
/* needed for embedded server - no net buffer to store the 'info' */ /* needed for embedded server - no net buffer to store the 'info' */
char *info_buffer; char *info_buffer;
#endif #endif
/*
In embedded server it points to the statement that is processed
in the current query. We store some results directly in statement
fields then.
*/
struct st_mysql_stmt *current_stmt;
} MYSQL; } MYSQL;
typedef struct st_mysql_res { typedef struct st_mysql_res {
......
...@@ -100,7 +100,6 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command, ...@@ -100,7 +100,6 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
mysql->affected_rows= ~(my_ulonglong) 0; mysql->affected_rows= ~(my_ulonglong) 0;
mysql->field_count= 0; mysql->field_count= 0;
net->last_errno= 0; net->last_errno= 0;
mysql->current_stmt= stmt;
thd->store_globals(); // Fix if more than one connect thd->store_globals(); // Fix if more than one connect
/* /*
......
# Connect to both master and slave
connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
vertical_results;
echo == MASTER ===========================================================;
connection master;
show master status;
show slave status;
echo == SLAVE ===========================================================;
connection slave;
show master status;
show slave status;
This diff is collapsed.
drop table if exists t1; drop table if exists t1, t2, t3, t4, t5, t6;
Warnings:
Note 1051 Unknown table 't1'
drop table if exists t2;
Warnings:
Note 1051 Unknown table 't2'
drop table if exists t3;
Warnings:
Note 1051 Unknown table 't3'
drop table if exists t4;
Warnings:
Note 1051 Unknown table 't4'
drop table if exists t5;
Warnings:
Note 1051 Unknown table 't5'
drop table if exists t6;
Warnings:
Note 1051 Unknown table 't6'
create table t1 (id int(8), name varchar(32)); create table t1 (id int(8), name varchar(32));
create table t2 (id int(8), name varchar(32)) ENGINE="MyISAM"; create table t2 (id int(8), name varchar(32)) ENGINE="MyISAM";
create table t3 (id int(8), name varchar(32)) ENGINE="MEMORY"; create table t3 (id int(8), name varchar(32)) ENGINE="MEMORY";
......
...@@ -74,8 +74,6 @@ get_lock("bug12480",2) ...@@ -74,8 +74,6 @@ get_lock("bug12480",2)
1 1
create table t1 (a datetime,b datetime, c datetime); create table t1 (a datetime,b datetime, c datetime);
drop function if exists bug12480; drop function if exists bug12480;
Warnings:
Note 1305 FUNCTION bug12480 does not exist
create function bug12480() returns datetime create function bug12480() returns datetime
begin begin
set @a=get_lock("bug12480",2); set @a=get_lock("bug12480",2);
......
...@@ -978,8 +978,6 @@ t1 CREATE TABLE `t1` ( ...@@ -978,8 +978,6 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; drop table t1;
drop procedure if exists wg2; drop procedure if exists wg2;
Warnings:
Note 1305 PROCEDURE wg2 does not exist
create procedure wg2() create procedure wg2()
begin begin
declare v int default 1; declare v int default 1;
......
...@@ -3,14 +3,9 @@ ...@@ -3,14 +3,9 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_archive.inc --source include/have_archive.inc
--disable-warnings --disable_warnings
drop table if exists t1; drop table if exists t1, t2, t3, t4, t5, t6;
drop table if exists t2; --enable_warnings
drop table if exists t3;
drop table if exists t4;
drop table if exists t5;
drop table if exists t6;
--enable-warnings
create table t1 (id int(8), name varchar(32)); create table t1 (id int(8), name varchar(32));
create table t2 (id int(8), name varchar(32)) ENGINE="MyISAM"; create table t2 (id int(8), name varchar(32)) ENGINE="MyISAM";
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
# Date: 2006-02-10 # Date: 2006-02-10
# Change: Augmented test to use with cluster # Change: Augmented test to use with cluster
##################################### #####################################
--source include/have_ndb.inc
--source include/master-slave.inc --source include/master-slave.inc
--source include/have_binlog_format_mixed_or_row.inc --source include/have_binlog_format_mixed_or_row.inc
......
...@@ -70,7 +70,7 @@ select get_lock("bug12480",2); ...@@ -70,7 +70,7 @@ select get_lock("bug12480",2);
connection default; connection default;
create table t1 (a datetime,b datetime, c datetime); create table t1 (a datetime,b datetime, c datetime);
--ignore_warnings --disable_warnings
drop function if exists bug12480; drop function if exists bug12480;
--enable_warnings --enable_warnings
......
...@@ -1000,9 +1000,9 @@ drop table t1; ...@@ -1000,9 +1000,9 @@ drop table t1;
# #
# Bug 12938 (arithmetic loop's zero) # Bug 12938 (arithmetic loop's zero)
# #
--disable-warnings --disable_warnings
drop procedure if exists wg2; drop procedure if exists wg2;
--enable-warnings --enable_warnings
delimiter //; delimiter //;
create procedure wg2() create procedure wg2()
begin begin
......
...@@ -18,8 +18,13 @@ rm -rf Makefile.in.bk ...@@ -18,8 +18,13 @@ rm -rf Makefile.in.bk
# Setup Metrowerks environment # Setup Metrowerks environment
. $path/mwenv . $path/mwenv
# Run autotools(use BUILD/autorun.sh) # Temporary hack to allow building from source dist
. BUILD/autorun.sh if [ ! "$USER"=pushbuild ]
then
# Run autotools(use BUILD/autorun.sh)
echo "Running autotools again(BUILD/autorun.sh)"
. BUILD/autorun.sh
fi
# configure # configure
./configure $base_configs $extra_configs ./configure $base_configs $extra_configs
......
...@@ -27,8 +27,8 @@ WINE_BUILD_DIR="$base/$WINE_BUILD_DIR" ...@@ -27,8 +27,8 @@ WINE_BUILD_DIR="$base/$WINE_BUILD_DIR"
echo "WINE_BUILD_DIR: $WINE_BUILD_DIR" echo "WINE_BUILD_DIR: $WINE_BUILD_DIR"
# Look for libc, MySQL 5.1.x uses libc-2006 by default # Look for libc, MySQL 5.1.x uses libc-2006 by default
libcdir="$MYDEV/libc-2006" libc_dir="$MYDEV/libc-2006"
if test ! -d $libcdir if [ ! -d `winepath $libc_dir` ]
then then
# The libcdir didn't exist, set default # The libcdir didn't exist, set default
libc_dir="$MYDEV/libc" libc_dir="$MYDEV/libc"
...@@ -65,5 +65,11 @@ then ...@@ -65,5 +65,11 @@ then
export TERM=linux export TERM=linux
fi fi
# Temporary hack to allow building from source dist
if [ "$USER"=pushbuild ]
then
export ARFLAGS=$AR_FLAGS
fi
# Print all env. variables # Print all env. variables
export export
...@@ -3,6 +3,13 @@ ...@@ -3,6 +3,13 @@
# stop on errors # stop on errors
set -e set -e
# If libtool passes "x" as the first argument to this script
# it's an indication that libtool is trying to unpack .la's
# so they can be added to a new library
# This step does not work on Netware and we avoid it by
# replacing the .la library with the path to the .a library
# in Makefile.in
args=" $*" args=" $*"
# NOTE: Option 'pipefail' is not standard sh # NOTE: Option 'pipefail' is not standard sh
......
...@@ -121,8 +121,9 @@ static void client_disconnect(); ...@@ -121,8 +121,9 @@ static void client_disconnect();
void die(const char *file, int line, const char *expr) void die(const char *file, int line, const char *expr)
{ {
fflush(stdout);
fprintf(stderr, "%s:%d: check failed: '%s'\n", file, line, expr); fprintf(stderr, "%s:%d: check failed: '%s'\n", file, line, expr);
fflush(NULL); fflush(stderr);
abort(); abort();
} }
...@@ -7496,10 +7497,22 @@ static void test_explain_bug() ...@@ -7496,10 +7497,22 @@ static void test_explain_bug()
MYSQL_TYPE_STRING : MYSQL_TYPE_VAR_STRING, MYSQL_TYPE_STRING : MYSQL_TYPE_VAR_STRING,
0, 0, "", 3, 0); 0, 0, "", 3, 0);
if ( mysql_get_server_version(mysql) >= 50027 )
{
/* The patch for bug#23037 changes column type of DEAULT to blob */
verify_prepare_field(result, 4, "Default", "COLUMN_DEFAULT", verify_prepare_field(result, 4, "Default", "COLUMN_DEFAULT",
MYSQL_TYPE_BLOB, 0, 0, "", 0, 0);
}
else
{
verify_prepare_field(result, 4, "Default", "COLUMN_DEFAULT",
mysql_get_server_version(mysql) >= 50027 ?
MYSQL_TYPE_BLOB :
mysql_get_server_version(mysql) <= 50000 ? mysql_get_server_version(mysql) <= 50000 ?
MYSQL_TYPE_STRING : MYSQL_TYPE_VAR_STRING, MYSQL_TYPE_STRING : MYSQL_TYPE_VAR_STRING,
0, 0, "", 64, 0); 0, 0, "",
mysql_get_server_version(mysql) >= 50027 ? 0 :64, 0);
}
verify_prepare_field(result, 5, "Extra", "EXTRA", verify_prepare_field(result, 5, "Extra", "EXTRA",
mysql_get_server_version(mysql) <= 50000 ? mysql_get_server_version(mysql) <= 50000 ?
......
...@@ -26,6 +26,10 @@ ...@@ -26,6 +26,10 @@
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
#ifdef __NETWARE__ #ifdef __NETWARE__
/* yaSSL already uses BSD sockets */
#ifndef HAVE_YASSL
/* /*
The default OpenSSL implementation on NetWare uses WinSock. The default OpenSSL implementation on NetWare uses WinSock.
This code allows us to use the BSD sockets. This code allows us to use the BSD sockets.
...@@ -47,6 +51,7 @@ static int SSL_set_fd_bsd(SSL *s, int fd) ...@@ -47,6 +51,7 @@ static int SSL_set_fd_bsd(SSL *s, int fd)
#define SSL_set_fd(A, B) SSL_set_fd_bsd((A), (B)) #define SSL_set_fd(A, B) SSL_set_fd_bsd((A), (B))
#endif /* HAVE_YASSL */
#endif /* __NETWARE__ */ #endif /* __NETWARE__ */
......
...@@ -180,11 +180,15 @@ void netware_ssl_cleanup() ...@@ -180,11 +180,15 @@ void netware_ssl_cleanup()
/* free memory from SSL_library_init() */ /* free memory from SSL_library_init() */
EVP_cleanup(); EVP_cleanup();
/* OpenSSL NetWare port specific functions */
#ifndef HAVE_YASSL
/* free global X509 method */ /* free global X509 method */
X509_STORE_method_cleanup(); X509_STORE_method_cleanup();
/* free the thread_hash error table */ /* free the thread_hash error table */
ERR_free_state_table(); ERR_free_state_table();
#endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment