into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
BUILD/SETUP.sh:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/des_key_file.cc:
Auto merged
fix for bug #13451 "view test produces warning about unfreed memory").
sql/sql_view.cc:
mysql_rename_view():
Intead of doing full-blown opening of view and then doing extensive cleanup
of its and main LEXes afterwards, let us just read and parse its .FRM file.
New VC7 project files
des_key_file.cc:
Visual C++ wants '"' for local include
mysql.cc:
Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
Added to convince VS .Net generate a lib for mysqlserver
VC++Files/mysqlserver/dummy.cpp:
Added to convince VS .Net generate a lib for mysqlserver
VC++Files/bdb/bdb.vcproj:
New VC7 project files
VC++Files/client/mysql.vcproj:
New VC7 project files
VC++Files/client/mysqladmin.vcproj:
New VC7 project files
VC++Files/client/mysqlclient.vcproj:
New VC7 project files
VC++Files/client/mysqldump.vcproj:
New VC7 project files
VC++Files/client/mysqlimport.vcproj:
New VC7 project files
VC++Files/client/mysqlshow.vcproj:
New VC7 project files
VC++Files/client/mysqltest.vcproj:
New VC7 project files
VC++Files/comp_err/comp_err.vcproj:
New VC7 project files
VC++Files/dbug/dbug.vcproj:
New VC7 project files
VC++Files/heap/heap.vcproj:
New VC7 project files
VC++Files/innobase/innobase.vcproj:
New VC7 project files
VC++Files/libmysql/libmysql.vcproj:
New VC7 project files
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
New VC7 project files
VC++Files/libmysqld/libmysqld.vcproj:
New VC7 project files
VC++Files/libmysqltest/myTest.vcproj:
New VC7 project files
VC++Files/my_print_defaults/my_print_defaults.vcproj:
New VC7 project files
VC++Files/myisam/myisam.vcproj:
New VC7 project files
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
New VC7 project files
VC++Files/myisamchk/myisamchk.vcproj:
New VC7 project files
VC++Files/myisamlog/myisamlog.vcproj:
New VC7 project files
VC++Files/myisammrg/myisammrg.vcproj:
New VC7 project files
VC++Files/myisampack/myisampack.vcproj:
New VC7 project files
VC++Files/mysql-test/mysql_test_run_new.vcproj:
New VC7 project files
VC++Files/mysql.sln:
New VC7 project files
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
New VC7 project files
VC++Files/mysqlcheck/mysqlcheck.vcproj:
New VC7 project files
VC++Files/mysqldemb/mysqldemb.vcproj:
New VC7 project files
VC++Files/mysqlserver/mysqlserver.vcproj:
New VC7 project files
VC++Files/mysys/mysys.vcproj:
New VC7 project files
VC++Files/perror/perror.vcproj:
New VC7 project files
VC++Files/regex/regex.vcproj:
New VC7 project files
VC++Files/replace/replace.vcproj:
New VC7 project files
VC++Files/sql/mysqld.vcproj:
New VC7 project files
VC++Files/strings/strings.vcproj:
New VC7 project files
VC++Files/test1/test1.vcproj:
New VC7 project files
VC++Files/tests/mysql_client_test.vcproj:
New VC7 project files
VC++Files/thr_test/thr_test.vcproj:
New VC7 project files
VC++Files/vio/vio.vcproj:
New VC7 project files
VC++Files/zlib/zlib.vcproj:
New VC7 project files
client/mysql.cc:
Cast my_cgets() argument for VC6 and VC7
sql/des_key_file.cc:
Visual C++ wants '"' for local include
scripts/make_win_src_distribution.sh:
New VC7 project files
sql/ha_innodb.cc:
innobase_convert_and_store_changed_col(), calc_row_difference():
Replace parameter "is_unsigned" with "prtype".
innobase_convert_and_store_changed_col():
When trimming spaces, note that UCS2 spaces are 0x0020, not 0x20.
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
myisam/mi_open.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
myisam/myisampack.c:
Auto merged
sql/sql_parse.cc:
Auto merged
"configure --without-server" (without giving "--enable-thread-safe-client").
mysys/mf_keycache.c:
This module is needed both in the server (multi-threaded) and in some myisam tools (single-threaded).
For the latter use, compilation failed in a "configure --without-server" as thread support was not
defined then (unless "--enable-thread-safe-client" was also given, but this should not be required).
The solution is to guard all threading operations in "#ifdef THREAD", and in the "#else" case adding
assertions where appropriate. This fixes bug#11680.
Also minor cleanup: Delete an unused variable, change "return" -> "DBUG_RETURN" in one place.
Add support/test for using my.cnf [cluster_config]
mysql-test/r/ndb_config.result:
Add support for ndb_config to read my.cnf
mysql-test/t/ndb_config.test:
Add support for ndb_config to read my.cnf
ndb/src/mgmsrv/InitConfigFileParser.cpp:
merge
ndb/tools/ndb_config.cpp:
Add support for ndb_config to read my.cnf
mysql-test/std_data/ndb_config_mycnf1.cnf:
New BitKeeper file ``mysql-test/std_data/ndb_config_mycnf1.cnf''
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
mysql-test/r/ndb_config.result:
Auto merged
mysql-test/t/ndb_config.test:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.hpp:
Auto merged
ndb/tools/ndb_config.cpp:
Auto merged
add support for reading config.ini from ndb_config
(as alternative to contacting ndb_mgmd)
mysql-test/r/ndb_config.result:
Add support for reading config.ini from ndb_config
mysql-test/t/ndb_config.test:
Add support for reading config.ini from ndb_config
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Handle prinouts better
ndb/src/mgmsrv/InitConfigFileParser.hpp:
Handle prinouts better
ndb/tools/ndb_config.cpp:
Add support for reading config.ini from ndb_config
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
client/mysqltest.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
include/my_sys.h:
Initialised TYPE_NOT_SET to zero to make sure no
enum is added before it.
server-tools/instance-manager/protocol.cc:
Changed int to const int.
client/mysqlbinlog.cc:
tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog)
mysql-test/r/ctype_ucs_binlog.result:
update
mysql-test/r/mysqlbinlog.result:
update
mysql-test/r/mysqlbinlog2.result:
update
mysql-test/r/rpl_charset.result:
update
mysql-test/r/rpl_timezone.result:
update
mysql-test/r/user_var-binlog.result:
update
allow ndb_mgmd to use my.cnf for cluster configuration
ndb/src/mgmsrv/ConfigInfo.cpp:
Depricate Id infavor of nodeid in config.ini
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/InitConfigFileParser.hpp:
Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/MgmtSrvr.cpp:
Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
Add support for getting cluster config from my.cnf [cluster_config]
ndb/src/mgmsrv/main.cpp:
Add support for getting cluster config from my.cnf [cluster_config]
analog with defaults_extra_file and defaults_grouop_suffix
include/my_sys.h:
export forced_defaults_file using global variable defaults_file
mysys/default.c:
export forced_defaults_file using global variable defaults_file
The problem was in that when finding the last table reference in a nested join tree,
the procedure doing the iteration over the right-most branches of a join tree
was testing for RIGHT JOINs the table reference that represents the join, and not
the second operand of the JOIN. Currently the information whether a join is LEFT/RIGHT
is stored not on the join object itself, but on one of its operands.
mysql-test/r/select.result:
Added test for BUG#13597
mysql-test/t/select.test:
Added test for BUG#13597
sql/table.cc:
- test whether a table reference is a right join by testing the
rigth join operand (first in the list of operands), and not
the table reference that represents the join itself.
- clearer comments
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
