into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
client/mysqldump.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
sql/sql_class.h:
Fixed indentation
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/t/ndb_index_unique.test:
Auto merged
mysql-test/r/ndb_index_unique.result:
Using local
will re-generate
sql/ha_ndbcluster.cc:
Using local
will merge manually
sql/ha_ndbcluster.h:
Using local
will merge manually
Added --force-restart pseudo server argument to shell version as well
mysql-test/mysql-test-run.sh:
Added --force-restart pseudo server argument to shell version as well
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Added LICENSE.mysql, removed LICENSE.doc README.NW.
Removed obselete section about MySQLEULA.txt and README.NW.
README:
Added reference to the EXCEPTIONS-CLIENT file.
Changed reference to the commercial license file.
Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
Delete: Docs/MySQLEULA.txt
README:
Added reference to the EXCEPTIONS-CLIENT file.
Changed reference to the commercial license file.
Corrected references into chapters in the manual.
BitKeeper/deleted/.del-MySQLEULA.txt~4a1afd9284f9be5a:
Delete: Docs/MySQLEULA.txt
scripts/make_binary_distribution.sh:
Added LICENSE.mysql, removed LICENSE.doc README.NW.
Removed obselete section about MySQLEULA.txt and README.NW.
- Fix memory leak in vio_VioSSLFD that occurs when one of the calls to SSL_* function fails. As in the "ssl_des"
test case where the server is currently not supposed to be able to read the specific cert/key file.
- Change error message to be generic as it's called both from server and client code.
vio/viosslfactories.c:
Fix memory leak in vio_VioSSLFD that occurs when one of the calls to SSL_* function fails.
Change error message to be generic as it's called both from server and client code.
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
configure.in:
Auto merged
include/my_time.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/kill.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/rename.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/rename.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/time.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/mysql-test-run.pl:
Manually merged.
sql/sql_parse.cc:
Manually merged.
Make sure index scan does not commitDelete
mysql-test/r/ndb_index_ordered.result:
testcase
mysql-test/t/ndb_index_ordered.test:
testcase
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Make sure index scan does not commitDelete
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
BitKeeper/deleted/.del-abi_check.ic:
Delete: include/abi_check.ic
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/r/im_daemon_life_cycle.result:
Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
Auto merged
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
