- 30 Sep, 2005 40 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231 client/mysqltest.c: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/query_cache.test: Auto merged sql/mysql_priv.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_db.cc: Auto merged
-
unknown authored
into mysql.com:/home/timka/mysql/src/5.0-bug-13597
-
unknown authored
into hundin.mysql.fi:/home/marko/mysql-5.0-bk sql/ha_innodb.cc: Ignore 4.1 specific change.
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
-
unknown authored
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc include/my_sys.h: Auto merged
-
unknown authored
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
-
unknown authored
sql/ha_innodb.cc: Avoid bitwise arithmetics, as it might be difficult to read. The added readability costs one register and two instructions on x86.
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0 mysql-test/t/mysqldump.test: Auto merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
-
unknown authored
Fix compile error with gcc296 ndb/src/common/util/SimpleProperties.cpp: Fix compile error with gcc296
-
unknown authored
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
-
unknown authored
Quote here is unneccessary as it should all be handled in quote_opt_arg().
-
unknown authored
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.
-
unknown authored
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
-
unknown authored
mysys/mf_keycache.c: Auto merged
-
unknown authored
"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.
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvrConfig.cpp: Auto merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push include/my_sys.h: Auto merged mysys/default.c: Auto merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 ndb/tools/ndb_config.cpp: merge
-
unknown authored
Check returnvalue on load/fetch configuration ndb/tools/ndb_config.cpp: Check returnvalue on load/fetch configuration
-
unknown authored
into mysql.com:/home/psergey/mysql-5.0-sept30-test
-
unknown authored
HA_KEY_SCAN_NOT_ROR index flag) as NDB index scans are not guaranteed to be ROR scans.
-
unknown authored
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''
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
-
unknown authored
mysql-test/r/innodb.result: after merge fix
-
unknown authored
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
-
unknown authored
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
-
unknown authored
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
-
unknown authored
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.
-
unknown authored
Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle. 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
-
unknown authored
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]
-
unknown authored
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
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-5.0 mysql-test/r/mysqldump.result: Auto merged
-
unknown authored
Fix for BUG#13597 - columns in ON condition not resolved if references a table in a nested right join. 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
-
unknown authored
-
unknown authored
into mysql.com:/usr/home/ram/work/mysql-5.0
-
unknown authored
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
-
unknown authored
ndb/include/mgmapi/ndb_logevent.h: more post-merge fixes ndb/src/mgmapi/ndb_logevent.cpp: more post-merge fixes
-
unknown authored
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
-