Commit 4570ae7b authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
parents 708e741b d55cc6b8
...@@ -2339,12 +2339,16 @@ then ...@@ -2339,12 +2339,16 @@ then
man_dirs="man" man_dirs="man"
man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'` man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`
man1_files=`echo $man1_files` man1_files=`echo $man1_files`
man8_files=`ls -1 $srcdir/man/*.8 | sed -e 's;^.*man/;;'`
man8_files=`echo $man8_files`
else else
man_dirs="" man_dirs=""
man1_files="" man1_files=""
man8_files=""
fi fi
AC_SUBST(man_dirs) AC_SUBST(man_dirs)
AC_SUBST(man1_files) AC_SUBST(man1_files)
AC_SUBST(man8_files)
# Shall we build the bench code? # Shall we build the bench code?
AC_ARG_WITH(bench, AC_ARG_WITH(bench,
......
...@@ -103,7 +103,7 @@ enum Constants ...@@ -103,7 +103,7 @@ enum Constants
MAX_ALGO_SIZE = 9, MAX_ALGO_SIZE = 9,
MAX_DIGEST_SZ = 25, // SHA + enum(Bit or Octet) + length(4) MAX_DIGEST_SZ = 25, // SHA + enum(Bit or Octet) + length(4)
DSA_SIG_SZ = 40, DSA_SIG_SZ = 40,
NAME_MAX = 512 // max total of all included names ASN_NAME_MAX = 512 // max total of all included names
}; };
...@@ -216,7 +216,7 @@ enum { SHA_SIZE = 20 }; ...@@ -216,7 +216,7 @@ enum { SHA_SIZE = 20 };
// A Signing Authority // A Signing Authority
class Signer { class Signer {
PublicKey key_; PublicKey key_;
char name_[NAME_MAX]; char name_[ASN_NAME_MAX];
byte hash_[SHA_SIZE]; byte hash_[SHA_SIZE];
public: public:
Signer(const byte* k, word32 kSz, const char* n, const byte* h); Signer(const byte* k, word32 kSz, const char* n, const byte* h);
...@@ -270,8 +270,8 @@ private: ...@@ -270,8 +270,8 @@ private:
byte subjectHash_[SHA_SIZE]; // hash of all Names byte subjectHash_[SHA_SIZE]; // hash of all Names
byte issuerHash_[SHA_SIZE]; // hash of all Names byte issuerHash_[SHA_SIZE]; // hash of all Names
byte* signature_; byte* signature_;
char issuer_[NAME_MAX]; // Names char issuer_[ASN_NAME_MAX]; // Names
char subject_[NAME_MAX]; // Names char subject_[ASN_NAME_MAX]; // Names
char beforeDate_[MAX_DATE_SZ]; // valid before date char beforeDate_[MAX_DATE_SZ]; // valid before date
char afterDate_[MAX_DATE_SZ]; // valid after date char afterDate_[MAX_DATE_SZ]; // valid after date
bool verify_; // Default to yes, but could be off bool verify_; // Default to yes, but could be off
......
...@@ -665,7 +665,7 @@ void CertDecoder::GetName(NameType nt) ...@@ -665,7 +665,7 @@ void CertDecoder::GetName(NameType nt)
SHA sha; SHA sha;
word32 length = GetSequence(); // length of all distinguished names word32 length = GetSequence(); // length of all distinguished names
assert (length < NAME_MAX); assert (length < ASN_NAME_MAX);
length += source_.get_index(); length += source_.get_index();
char* ptr = (nt == ISSUER) ? issuer_ : subject_; char* ptr = (nt == ISSUER) ? issuer_ : subject_;
......
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
## Process this file with automake to create Makefile.in ## Process this file with automake to create Makefile.in
man1_MANS = @man1_files@ man1_MANS = @man1_files@
EXTRA_DIST = $(man1_MANS) man8_MANS = @man8_files@
EXTRA_DIST = $(man1_MANS) $(man8_MANS)
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
...@@ -758,6 +758,13 @@ select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')), ...@@ -758,6 +758,13 @@ select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')),
monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m')); monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));
monthname(str_to_date(null, '%m')) monthname(str_to_date(null, '%m')) monthname(str_to_date(1, '%m')) monthname(str_to_date(0, '%m')) monthname(str_to_date(null, '%m')) monthname(str_to_date(null, '%m')) monthname(str_to_date(1, '%m')) monthname(str_to_date(0, '%m'))
NULL NULL January NULL NULL NULL January NULL
set time_zone='-6:00';
create table t1(a timestamp);
insert into t1 values (19691231190001);
select * from t1;
a
1969-12-31 19:00:01
drop table t1;
create table t1(f1 date, f2 time, f3 datetime); create table t1(f1 date, f2 time, f3 datetime);
insert into t1 values ("2006-01-01", "12:01:01", "2006-01-01 12:01:01"); insert into t1 values ("2006-01-01", "12:01:01", "2006-01-01 12:01:01");
insert into t1 values ("2006-01-02", "12:01:02", "2006-01-02 12:01:02"); insert into t1 values ("2006-01-02", "12:01:02", "2006-01-02 12:01:02");
......
...@@ -375,6 +375,16 @@ select last_day('2005-01-00'); ...@@ -375,6 +375,16 @@ select last_day('2005-01-00');
select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')), select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')),
monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m')); monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));
#
# Bug #16327: problem with timestamp < 1970
#
set time_zone='-6:00';
create table t1(a timestamp);
insert into t1 values (19691231190001);
select * from t1;
drop table t1;
# #
# Bug#16377 result of DATE/TIME functions were compared as strings which # Bug#16377 result of DATE/TIME functions were compared as strings which
# can lead to a wrong result. # can lead to a wrong result.
......
...@@ -49,14 +49,14 @@ select "--- Local --" as ""; ...@@ -49,14 +49,14 @@ select "--- Local --" as "";
select "--- Broken LOAD DATA --" as ""; select "--- Broken LOAD DATA --" as "";
--enable_query_log --enable_query_log
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000002 --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000002 2> /dev/null
# this should show almost nothing # this should show almost nothing
--disable_query_log --disable_query_log
select "--- --database --" as ""; select "--- --database --" as "";
--enable_query_log --enable_query_log
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --database=nottest $MYSQLTEST_VARDIR/log/master-bin.000001 --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --database=nottest $MYSQLTEST_VARDIR/log/master-bin.000001 2> /dev/null
# this test for position option # this test for position option
--disable_query_log --disable_query_log
...@@ -81,14 +81,14 @@ select "--- Remote --" as ""; ...@@ -81,14 +81,14 @@ select "--- Remote --" as "";
select "--- Broken LOAD DATA --" as ""; select "--- Broken LOAD DATA --" as "";
--enable_query_log --enable_query_log
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 2> /dev/null
# And this too ! (altough it is documented) # And this too ! (altough it is documented)
--disable_query_log --disable_query_log
select "--- --database --" as ""; select "--- --database --" as "";
--enable_query_log --enable_query_log
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.000001 --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.000001 2> /dev/null
# Strangely but this works # Strangely but this works
--disable_query_log --disable_query_log
......
--source include/have_udf.inc --source include/have_udf.inc
# #
# To run this tests the "sql/udf_example.cc" need to be compiled into # To run this tests the "sql/udf_example.c" need to be compiled into
# udf_example.so and LD_LIBRARY_PATH should be setup to point out where # udf_example.so and LD_LIBRARY_PATH should be setup to point out where
# the library are. # the library are.
# #
......
...@@ -159,7 +159,7 @@ uint bitmap_set_next(MY_BITMAP *map) ...@@ -159,7 +159,7 @@ uint bitmap_set_next(MY_BITMAP *map)
{ {
uchar *bitmap=map->bitmap; uchar *bitmap=map->bitmap;
uint bit_found = MY_BIT_NONE; uint bit_found = MY_BIT_NONE;
uint bitmap_size=map->bitmap_size*8; uint bitmap_size=map->bitmap_size;
uint i; uint i;
DBUG_ASSERT(map->bitmap); DBUG_ASSERT(map->bitmap);
...@@ -445,7 +445,7 @@ uint bitmap_get_first(const MY_BITMAP *map) ...@@ -445,7 +445,7 @@ uint bitmap_get_first(const MY_BITMAP *map)
{ {
uchar *bitmap=map->bitmap; uchar *bitmap=map->bitmap;
uint bit_found = MY_BIT_NONE; uint bit_found = MY_BIT_NONE;
uint bitmap_size=map->bitmap_size*8; uint bitmap_size=map->bitmap_size;
uint i; uint i;
DBUG_ASSERT(map->bitmap); DBUG_ASSERT(map->bitmap);
......
...@@ -96,7 +96,7 @@ mkdir $BASE $BASE/bin $BASE/docs \ ...@@ -96,7 +96,7 @@ mkdir $BASE $BASE/bin $BASE/docs \
if [ $BASE_SYSTEM != "netware" ] ; then if [ $BASE_SYSTEM != "netware" ] ; then
mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \ mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \
$BASE/man/man1 $BASE/data $BASE/data/mysql $BASE/data/test $BASE/man/man1 $BASE/man/man8 $BASE/data $BASE/data/mysql $BASE/data/test
chmod o-rwx $BASE/data $BASE/data/* chmod o-rwx $BASE/data $BASE/data/*
fi fi
...@@ -219,6 +219,7 @@ if [ $BASE_SYSTEM != "netware" ] ; then ...@@ -219,6 +219,7 @@ if [ $BASE_SYSTEM != "netware" ] ; then
fi fi
if [ -d man ] ; then if [ -d man ] ; then
$CP man/*.1 $BASE/man/man1 $CP man/*.1 $BASE/man/man1
$CP man/*.8 $BASE/man/man8
fi fi
fi fi
...@@ -309,7 +310,6 @@ else ...@@ -309,7 +310,6 @@ else
fi fi
# Make safe_mysqld a symlink to mysqld_safe for backwards portability # Make safe_mysqld a symlink to mysqld_safe for backwards portability
# To be removed in MySQL 4.1
if [ $BASE_SYSTEM != "netware" ] ; then if [ $BASE_SYSTEM != "netware" ] ; then
(cd $BASE/bin ; ln -s mysqld_safe safe_mysqld ) (cd $BASE/bin ; ln -s mysqld_safe safe_mysqld )
fi fi
......
...@@ -116,7 +116,7 @@ DEFS = -DMYSQL_SERVER \ ...@@ -116,7 +116,7 @@ DEFS = -DMYSQL_SERVER \
@DEFS@ @DEFS@
BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h
EXTRA_DIST = udf_example.cc $(BUILT_SOURCES) EXTRA_DIST = $(BUILT_SOURCES)
DISTCLEANFILES = lex_hash.h DISTCLEANFILES = lex_hash.h
AM_YFLAGS = -d AM_YFLAGS = -d
...@@ -155,7 +155,7 @@ lex_hash.h: gen_lex_hash$(EXEEXT) ...@@ -155,7 +155,7 @@ lex_hash.h: gen_lex_hash$(EXEEXT)
# For testing of udf_example.so # For testing of udf_example.so
noinst_LTLIBRARIES= udf_example.la noinst_LTLIBRARIES= udf_example.la
udf_example_la_SOURCES= udf_example.cc udf_example_la_SOURCES= udf_example.c
udf_example_la_LDFLAGS= -module -rpath $(pkglibdir) udf_example_la_LDFLAGS= -module -rpath $(pkglibdir)
......
...@@ -4606,7 +4606,7 @@ String *Field_timestamp::val_str(String *val_buffer, String *val_ptr) ...@@ -4606,7 +4606,7 @@ String *Field_timestamp::val_str(String *val_buffer, String *val_ptr)
thd->time_zone_used= 1; thd->time_zone_used= 1;
temp= time_tmp.year % 100; temp= time_tmp.year % 100;
if (temp < YY_PART_YEAR) if (temp < YY_PART_YEAR - 1)
{ {
*to++= '2'; *to++= '2';
*to++= '0'; *to++= '0';
......
...@@ -4131,14 +4131,14 @@ greedy_search(JOIN *join, ...@@ -4131,14 +4131,14 @@ greedy_search(JOIN *join,
double read_time= 0.0; double read_time= 0.0;
uint idx= join->const_tables; // index into 'join->best_ref' uint idx= join->const_tables; // index into 'join->best_ref'
uint best_idx; uint best_idx;
uint rem_size; // cardinality of remaining_tables uint size_remain; // cardinality of remaining_tables
POSITION best_pos; POSITION best_pos;
JOIN_TAB *best_table; // the next plan node to be added to the curr QEP JOIN_TAB *best_table; // the next plan node to be added to the curr QEP
DBUG_ENTER("greedy_search"); DBUG_ENTER("greedy_search");
/* number of tables that remain to be optimized */ /* number of tables that remain to be optimized */
rem_size= my_count_bits(remaining_tables); size_remain= my_count_bits(remaining_tables);
do { do {
/* Find the extension of the current QEP with the lowest cost */ /* Find the extension of the current QEP with the lowest cost */
...@@ -4146,7 +4146,7 @@ greedy_search(JOIN *join, ...@@ -4146,7 +4146,7 @@ greedy_search(JOIN *join,
best_extension_by_limited_search(join, remaining_tables, idx, record_count, best_extension_by_limited_search(join, remaining_tables, idx, record_count,
read_time, search_depth, prune_level); read_time, search_depth, prune_level);
if (rem_size <= search_depth) if (size_remain <= search_depth)
{ {
/* /*
'join->best_positions' contains a complete optimal extension of the 'join->best_positions' contains a complete optimal extension of the
...@@ -4182,7 +4182,7 @@ greedy_search(JOIN *join, ...@@ -4182,7 +4182,7 @@ greedy_search(JOIN *join,
read_time+= join->positions[idx].read_time; read_time+= join->positions[idx].read_time;
remaining_tables&= ~(best_table->table->map); remaining_tables&= ~(best_table->table->map);
--rem_size; --size_remain;
++idx; ++idx;
DBUG_EXECUTE("opt", print_plan(join, join->tables, DBUG_EXECUTE("opt", print_plan(join, join->tables,
...@@ -8442,12 +8442,14 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, ...@@ -8442,12 +8442,14 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
param->group_length : 0, param->group_length : 0,
NullS)) NullS))
{ {
if (temp_pool_slot != MY_BIT_NONE)
bitmap_clear_bit(&temp_pool, temp_pool_slot); bitmap_clear_bit(&temp_pool, temp_pool_slot);
DBUG_RETURN(NULL); /* purecov: inspected */ DBUG_RETURN(NULL); /* purecov: inspected */
} }
/* Copy_field belongs to TMP_TABLE_PARAM, allocate it in THD mem_root */ /* Copy_field belongs to TMP_TABLE_PARAM, allocate it in THD mem_root */
if (!(param->copy_field= copy= new (thd->mem_root) Copy_field[field_count])) if (!(param->copy_field= copy= new (thd->mem_root) Copy_field[field_count]))
{ {
if (temp_pool_slot != MY_BIT_NONE)
bitmap_clear_bit(&temp_pool, temp_pool_slot); bitmap_clear_bit(&temp_pool, temp_pool_slot);
free_root(&own_root, MYF(0)); /* purecov: inspected */ free_root(&own_root, MYF(0)); /* purecov: inspected */
DBUG_RETURN(NULL); /* purecov: inspected */ DBUG_RETURN(NULL); /* purecov: inspected */
...@@ -8972,6 +8974,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, ...@@ -8972,6 +8974,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
err: err:
thd->mem_root= mem_root_save; thd->mem_root= mem_root_save;
free_tmp_table(thd,table); /* purecov: inspected */ free_tmp_table(thd,table); /* purecov: inspected */
if (temp_pool_slot != MY_BIT_NONE)
bitmap_clear_bit(&temp_pool, temp_pool_slot); bitmap_clear_bit(&temp_pool, temp_pool_slot);
DBUG_RETURN(NULL); /* purecov: inspected */ DBUG_RETURN(NULL); /* purecov: inspected */
} }
...@@ -9260,6 +9263,7 @@ free_tmp_table(THD *thd, TABLE *entry) ...@@ -9260,6 +9263,7 @@ free_tmp_table(THD *thd, TABLE *entry)
(*ptr)->free(); (*ptr)->free();
free_io_cache(entry); free_io_cache(entry);
if (entry->temp_pool_slot != MY_BIT_NONE)
bitmap_clear_bit(&temp_pool, entry->temp_pool_slot); bitmap_clear_bit(&temp_pool, entry->temp_pool_slot);
free_root(&own_root, MYF(0)); /* the table is allocated in its own root */ free_root(&own_root, MYF(0)); /* the table is allocated in its own root */
......
This diff is collapsed.
...@@ -572,7 +572,7 @@ fi ...@@ -572,7 +572,7 @@ fi
%doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1* %doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1*
%doc %attr(644, root, man) %{_mandir}/man1/myisampack.1* %doc %attr(644, root, man) %{_mandir}/man1/myisampack.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_explain_log.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_explain_log.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqld.1* %doc %attr(644, root, man) %{_mandir}/man8/mysqld.8*
%doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*
......
...@@ -15028,6 +15028,49 @@ static void test_bug20152() ...@@ -15028,6 +15028,49 @@ static void test_bug20152()
} }
/*
Bug#21206: memory corruption when too many cursors are opened at once
Memory corruption happens when more than 1024 cursors are open
simultaneously.
*/
static void test_bug21206()
{
const size_t cursor_count= 1025;
const char *create_table[]=
{
"DROP TABLE IF EXISTS t1",
"CREATE TABLE t1 (i INT)",
"INSERT INTO t1 VALUES (1), (2), (3)"
};
const char *query= "SELECT * FROM t1";
Stmt_fetch *fetch_array=
(Stmt_fetch*) calloc(cursor_count, sizeof(Stmt_fetch));
Stmt_fetch *fetch;
DBUG_ENTER("test_bug21206");
myheader("test_bug21206");
fill_tables(create_table, sizeof(create_table) / sizeof(*create_table));
for (fetch= fetch_array; fetch < fetch_array + cursor_count; ++fetch)
{
/* Init will exit(1) in case of error */
stmt_fetch_init(fetch, fetch - fetch_array, query);
}
for (fetch= fetch_array; fetch < fetch_array + cursor_count; ++fetch)
stmt_fetch_close(fetch);
free(fetch_array);
DBUG_VOID_RETURN;
}
/* /*
Read and parse arguments and MySQL options from my.cnf Read and parse arguments and MySQL options from my.cnf
*/ */
...@@ -15300,6 +15343,7 @@ static struct my_tests_st my_tests[]= { ...@@ -15300,6 +15343,7 @@ static struct my_tests_st my_tests[]= {
{ "test_bug14169", test_bug14169 }, { "test_bug14169", test_bug14169 },
{ "test_bug17667", test_bug17667 }, { "test_bug17667", test_bug17667 },
{ "test_bug19671", test_bug19671}, { "test_bug19671", test_bug19671},
{ "test_bug21206", test_bug21206},
{ 0, 0 } { 0, 0 }
}; };
......
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