- Apply patch to remove dependency on C++ libs when linking "libmysql" from c
extra/yassl/include/openssl/rsa.h:
Fix spelling error
extra/yassl/include/openssl/ssl.h:
Fix spelling error
extra/yassl/include/yassl_int.hpp:
Remove static instance
extra/yassl/include/yassl_types.hpp:
Add CleanUp function for static singletons
extra/yassl/src/handshake.cpp:
Use buffered.reset(0) instead of null_buffer
extra/yassl/src/template_instnt.cpp:
Add instantiation of two new templates
extra/yassl/src/yassl_int.cpp:
Use static pointers for singletons
extra/yassl/taocrypt/include/integer.hpp:
Remove statoc singletons from class scope
extra/yassl/taocrypt/include/misc.hpp:
Add clenaup function
extra/yassl/taocrypt/include/runtime.hpp:
Add runtime for Solaris
extra/yassl/taocrypt/src/algebra.cpp:
Use mySTL::vector to avoid array of Element being on the stack
extra/yassl/taocrypt/src/integer.cpp:
Use static pointers for singletons
Add cleanup function
extra/yassl/taocrypt/src/template_instnt.cpp:
Add instantiation of one new template
into rurik.mysql.com:/home/igor/mysql-5.1
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_insert.cc:
Auto merged
Without a flush this test is nondeterministic for "row" binlog-format.
mysql-test/r/innodb.result:
Without a flush this test is nondeterministic for "row" binlog-format.
mysql-test/t/innodb.test:
Without a flush this test is nondeterministic for "row" binlog-format.
storage/ndb/src/ndbapi/NdbBlob.cpp:
set part id from main table op (may not be complete fix)
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
log partition id set/get
Fix the way that instance manager finds the version number of instances,
so that it works properly when the executable name isn't the same as what
the instance-manager launched, such as when wrapping a libtool-wrapped
executable from the source tree.
This removes the 'Ver ' reported in the version column output by
'SHOW INSTANCE STATUS ...', but the format of this column is not
documented (and is pretty free-form to begin with).
server-tools/instance-manager/instance_options.cc:
Look for 'Ver' to get version from running mysqld --version
server-tools/instance-manager/parse_output.cc:
Make parse_output_and_get_value() look at the whole line to find
the word, instead of just at the beginning of each line.
sql/mysqld.cc:
Note that the instance manager relies on 'Ver' in mysqld --version
mysql-test/r/archive.result:
Adding test case for data directory support in create table.
mysql-test/t/archive.test:
Added test for "data directory" support in archive.
sql/ha_archive.cc:
Updated comments, added printable bits for support of "data directory"
sql/ha_archive.h:
Added real_path to share (will come in handy in later code)
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
mysql-test/t/partition.test:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/partition.result:
manual merge
sql/share/errmsg.txt:
manual merge
Include "." in header search, to find #include <lex_hash.h>
VC++Files/sql/mysqld.vcproj:
Include "." in header search, to find #include <lex_hash.h>
VC++Files/libmysqld/libmysqld.vcproj:
Include "." in header search, to find #include <lex_hash.h>
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
(With hand-merged tests.)
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_insert.cc:
Auto merged
into mysql.com:/usr/home/bar/mysql-5.1-new.b16319
mysql-test/r/xml.result:
Auto merged
mysql-test/t/xml.test:
Auto merged
sql/item_xmlfunc.cc:
Auto merged
