- 11 Dec, 2006 1 commit
-
-
unknown authored
- Updated result file to fit test case automerge. mysql-test/r/windows.result: Updated result file to fit automerge.
-
- 10 Dec, 2006 2 commits
- 07 Dec, 2006 1 commit
-
-
unknown authored
- Using DATA/INDEX DIRECTORY option on Windows put data/index file into default directory because the OS doesn't support readlink(). - The procedure for changing data/index file directory is different under Windows. - With this fix we report a warning if DATA/INDEX option is used, but OS doesn't support readlink(). mysql-test/r/windows.result: - updated result file. mysql-test/t/windows.test: - Added test case to verify we get warnings if we specify DATA/INDEX DIRECTORY on a platform which doesn't support readlink(). sql/sql_parse.cc: - Added warnings if DATA/INDEX DIRECTORY option is used but not supported by the target platform.
-
- 05 Dec, 2006 23 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint client/mysqltest.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ndb_update.result: Auto merged sql/ha_ndbcluster.cc: Auto merged storage/ndb/src/common/util/socket_io.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.cpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged storage/ndb/tools/ndb_condig.cpp: Auto merged storage/ndb/src/common/util/File.cpp: Manual merge storage/ndb/src/common/util/InputStream.cpp: Manual merge
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/parser.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/sp_gis.result: Auto merged mysql-test/r/udf.result: Auto merged mysql-test/t/parser.test: Auto merged mysql-test/t/udf.test: Auto merged sql/item_create.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
-
unknown authored
client/mysqltest.c: Exclude
-
unknown authored
-
unknown authored
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint sql/sql_class.cc: Auto merged
-
unknown authored
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836 sql/sql_class.cc: Auto merged
-
unknown authored
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 sql/sql_class.cc: manual merge
-
unknown authored
- Comment Cleanup. sql/sql_class.cc: Removed misleading comment.
-
unknown authored
-
unknown authored
error message in the logs before shutting down the server
-
unknown authored
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged
-
unknown authored
mysql-test/r/sp.result: offset error number according to changed error messages file mysql-test/r/sp_gis.result: offset error number according to changed error messages file
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
mysql-test/mysql-test-run.pl: delete $default_vardir if the 4.1 vardir trick is to be used to re-enable more than one test run in sequence
-
unknown authored
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
-
- 04 Dec, 2006 13 commits
-
-
unknown authored
into example.com:/work/bug22369-v2/my51
-
unknown authored
into naruto.:C:/cpp/mysql-5.1-maint
-
unknown authored
disables binlog. mysql-test/t/disabled.def: disabled test flush2
-
unknown authored
fileno(), and many other stdio functions, may be macros (at least on *BSD). Don't explicitly qualify it with global scope (::fileno()), because it causes syntax errors. <cstdio> doesn't define *most* of these macros. It still has a macro for fileno(), however, on FreeBSD 6.1, so even using <cstdio> isn't a fix for this. Better to just avoid ::standard_library_function() in general, in order to be portable. storage/ndb/src/common/util/File.cpp: fileno(), and many other stdio functions, may be macros (at least on *BSD). Don't explicitly qualify it with global scope (::fileno()), because it causes syntax errors. Note that <cstdio> doesn't define *most* of these macros. It still has a macro for fileno(), however, on FreeBSD 6.1, so even using <cstdio> isn't a fix for this. Better to just avoid ::standard_library_function() in general, in order to be portable.
-
unknown authored
into example.com:/work/bug22369-v2/my51
-
unknown authored
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint BitKeeper/etc/ignore: auto-union Docs/Makefile.am: Auto merged Makefile.am: Auto merged client/mysql.cc: Auto merged client/mysqltest.c: Auto merged extra/yassl/taocrypt/include/algebra.hpp: Auto merged include/Makefile.am: Auto merged mysql-test/lib/mtr_io.pl: Auto merged mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/rpl_sp.result: Auto merged mysql-test/r/view_grant.result: Auto merged mysql-test/t/information_schema.test: Auto merged mysql-test/t/rpl_sp.test: Auto merged mysql-test/t/view_grant.test: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sp.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_parse.cc: Auto merged sql-common/my_time.c: Auto merged sql/sql_table.cc: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisam/myisampack.c: Auto merged
-
unknown authored
mysql-5.1-build tree, in order to get it into mysql-5.1 faster. See comments from Marc's original push for patch details.
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint Makefile.am: Auto merged client/mysqltest.c: Auto merged myisam/mi_open.c: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/mysqld.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/ignore: auto-union Docs/Makefile.am: Auto merged Makefile.am: Auto merged client/mysql.cc: Auto merged client/mysqltest.c: Auto merged include/Makefile.am: Auto merged myisam/myisampack.c: Auto merged mysql-test/lib/mtr_io.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/view_grant.result: Auto merged mysql-test/t/view_grant.test: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sp.cc: Auto merged sql/sql_base.cc: Auto merged sql-common/my_time.c: Auto merged sql/sql_handler.cc: Auto merged extra/yassl/taocrypt/include/algebra.hpp: Manual merge with import of upstream yaSSL
-
unknown authored
Close any statements that might be open before program exit Close any statments that might be open when calling "disable_ps_protocol" client/mysqltest.c: Close any statements that might be open before program exit Close any statments that might be open when calling "disable_ps_protocol"
-
unknown authored
mysql-test/lib/mtr_misc.pl: Append .nlm to the binary name on NetWare
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint BitKeeper/etc/collapsed: auto-union BitKeeper/etc/ignore: auto-union Makefile.am: Auto merged client/mysql.cc: Auto merged client/mysqltest.c: Auto merged configure.in: Auto merged extra/yassl/taocrypt/include/algebra.hpp: Auto merged include/Makefile.am: Auto merged include/my_sys.h: Auto merged mysql-test/lib/mtr_io.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/parser.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/view_grant.result: Auto merged mysql-test/t/information_schema.test: Auto merged mysql-test/t/parser.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/system_mysql_db_fix30020.test: Auto merged mysql-test/t/udf.test: Auto merged mysql-test/t/view_grant.test: Auto merged scripts/mysql_fix_privilege_tables.sql: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_create.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sp.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql-common/my_time.c: Auto merged sql/sql_yacc.yy: Auto merged storage/myisam/myisampack.c: Auto merged mysql-test/r/sp.result: Manual merge mysql-test/r/udf.result: Manual merge mysql-test/t/events_bugs.test: Manual merge sql/share/errmsg.txt: Manual merge support-files/mysql.spec.sh: Manual merge
-