- 09 Dec, 2006 3 commits
-
-
unknown authored
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge mysql-test/lib/init_db.sql: Auto merged mysql-test/r/1st.result: Auto merged mysql-test/r/connect.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/r/mysqlcheck.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/r/system_mysql_db.result: Auto merged scripts/mysql_create_system_tables.sh: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/federated/ha_federated.cc: Auto merged mysql-test/r/sp.result: WL# 3031 More fun with error codes. These error codes vary in the result files because new error codes have been added mysql-test/r/sp_gis.result: WL# 3031 More fun with error codes. These error codes vary in the result files because new error codes have been added
-
unknown authored
Post-commit issues fixed * Test results for other tests fixed due to added error #s * Memory allocation/free issues found with running with valgrind * Fix to mysql-test-run shell script to run federated_server test (installs mysql.servers table properly) mysql-test/r/1st.result: WL #3031 New result for 1st test mysql-test/r/backup.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/connect.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/information_schema.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/mysql.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/mysqlcheck.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/ndb_dd_basic.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/ndb_dd_ddl.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/select.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/show_check.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/sp.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/sp_gis.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/sp_trans.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/system_mysql_db.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/type_timestamp.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/warnings.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. mysql-test/r/xml.result: WL #3031 Error codes differ due to addition of error codes for federated server errors (2) so all test results with hard-coded error #s will be off by two. New results generated. scripts/mysql_create_system_tables.sh: WL #3031 Fixed old mysql-test-run.sh script to work with new mysql.servers table as reported by Cisco sql/sql_yacc.yy: WL# 3031 OPTIONS/options must be usable as table or column name. storage/federated/ha_federated.cc: WL# 3031 * Fixed allocation and free issues (warnings found with --valgrind) * Fixed cast issues * Made sure port was set accordingly
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch client/mysql.cc: Auto merged sql/field_conv.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sp.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
- 07 Dec, 2006 2 commits
-
-
unknown authored
into example.com:/work/mysql-5.1-maint
-
unknown authored
mysql-test/t/events_bugs.test: let events_bugs not fail because of timing sql/sql_table.cc: if the db or name has been changed ALTER_RENAME, then fix table_list Solution by having the second table added in the parser to the list of used tables, won't work because checking of rights of merge tables goes over table_list->next_local and checks the rights, so we will fail there. sql/sql_yacc.yy: fix name - prevents ddd from correct working
-
- 06 Dec, 2006 6 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint client/mysqltest.c: Auto merged mysys/my_getopt.c: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged mysql-test/t/disabled.def: Manual merge
-
unknown authored
Remove DBUG_ENTER in my_end client/mysqltest.c: Call 'mysql_server_end' as last function in 'free_used_memory' Don't use DBUG_VOID_RETURN after mysql_server_end in free_used_memory Only call mysql_server_end if mysql_server_init has been called
-
unknown authored
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch sql/item_func.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
-
unknown authored
uninitialized list of guarded instances. server-tools/instance-manager/guardian.cc: Initialize guarded_instance to NULL in constuctor. Avoid looping over uninitialized list of guarded instances
-
- 05 Dec, 2006 25 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-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.0-maint sql/sql_class.cc: Auto merged
-
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 4 commits