- 13 Oct, 2005 31 commits
-
-
unknown authored
into mysql.com:/usr/home/bar/mysql-5.0.b9278 mysql-test/t/cast.test: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-tis620.c: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/r/select.result: Auto merged
-
unknown authored
into mysql.com:/usr/home/bar/mysql-5.0.b9278
-
unknown authored
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
-
unknown authored
-
unknown authored
after merge fix. range.result: fixing result accordingly , cast.result: after merge fix range.test: Avoid SELECT'ing of BINARY column not to output 0x00 bytes. mysql-test/t/range.test: Avoid SELECT'ing of BINARY column not to output 0x00 bytes. mysql-test/r/cast.result: after merge fix mysql-test/r/mysqldump-max.result: after merge fix. mysql-test/r/range.result: fixing result accordingly , mysql-test/r/select.result: after merge fix.
-
unknown authored
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 configure.in: Auto merged include/config-win.h: Auto merged include/m_string.h: Auto merged include/my_pthread.h: Auto merged myisam/mi_search.c: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/select.test: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_alarm.c: Auto merged netware/pack_isam.def: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-tis620.c: Auto merged strings/xml.c: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged mysql-test/r/select.result: Merged from 4.1. netware/BUILD/mwenv: Merged from 4.1. scripts/make_binary_distribution.sh: Merged from 4.1. sql/mysqld.cc: Merged from 4.1. sql/sql_show.cc: Merged from 4.1. strings/my_strtoll10.c: Merged from 4.1.
-
unknown authored
- ensure in ndb_mgmd that the stop command is not issued if a node is restarting - added some new error messages - in ndbcntr on master check so that node does not shutdown id shutdoen in progress
-
unknown authored
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
-
unknown authored
netware/BUILD/mwenv: Removed -O3 for Metrowerks compiler. netware/pack_isam.def: NetWare specific change, Added SCRENNAME for pack_isam. scripts/make_binary_distribution.sh: Netware specific change for creating help tables. strings/my_strtoll10.c: Fix for Metrowerks compiler.
-
unknown authored
into mysql.com:/usr/home/bar/mysql-5.0.b9278 mysql-test/r/alter_table.result: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/r/federated.result: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/federated.test: Auto merged
-
unknown authored
new file mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh: Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding. Many files: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. Adding true BINARY/VARBINARY: new pad_char structure member. ctype-bin.c: Adding true BINARY/VARBINARY: new pad_char structure member. New strnxfrm, with two trailing length bytes. field.cc: Adding true BINARY/VARBINARY. sql/field.cc: Adding true BINARY/VARBINARY. strings/ctype-big5.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-bin.c: Adding true BINARY/VARBINARY: new pad_char structure member. New strnxfrm, with two trailing length bytes. strings/ctype-cp932.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-czech.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-euc_kr.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-eucjpms.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-extra.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-gb2312.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-gbk.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-latin1.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-simple.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-sjis.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-tis620.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-uca.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-ucs2.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-ujis.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-utf8.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-win1250ch.c: Adding true BINARY/VARBINARY: new pad_char structure member. include/m_ctype.h: Adding true BINARY/VARBINARY: new pad_char structure member. mysql-test/t/alter_table.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/binary.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/cast.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ctype_cp1251.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ctype_many.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/federated.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/func_in.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ndb_condition_pushdown.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ndb_types.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/sp.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/type_blob.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/alter_table.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/binary.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/cast.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ctype_cp1251.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ctype_many.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/federated.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/func_in.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ndb_condition_pushdown.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ndb_types.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/sp.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/system_mysql_db.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/type_blob.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. scripts/mysql_create_system_tables.sh: Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding. scripts/mysql_fix_privilege_tables.sql: Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
-
unknown authored
into moonbone.local:/work/13535-bug-4.1-mysql mysql-test/r/select.result: Auto merged mysql-test/t/select.test: Auto merged
-
unknown authored
into moonbone.local:/work/7672-bug-5.0-mysql
-
unknown authored
VC++Files/mysql.sln: Auto merged mysql-test/t/func_group.test: Auto merged
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
-
unknown authored
sql/sql_lex.h: Auto merged
-
unknown authored
-
unknown authored
into mysql.com:/opt/local/work/mysql-5.0-12736
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0 mysql-test/t/kill.test: Auto merged
-
unknown authored
mysql-test/t/cast.test: Auto merged sql/item.h: Auto merged
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0 sql/item_strfunc.cc: Auto merged
-
unknown authored
Updated more DDL statements to cause implicit commit. mysql-test/r/rpl_ddl.result: updated results to test for implicit commit for: CREATE OR REPLACE VIEW ALTER VIEW DROP VIEW CREATE TRIGGER DROP TRIGGER CREATE USER RENAME USER DROP USER mysql-test/t/rpl_ddl.test: updated results to test for implicit commit for: CREATE OR REPLACE VIEW ALTER VIEW DROP VIEW CREATE TRIGGER DROP TRIGGER CREATE USER RENAME USER DROP USER sql/sql_parse.cc: added implicit commit for: CREATE OR REPLACE VIEW ALTER VIEW DROP VIEW CREATE TRIGGER DROP TRIGGER CREATE USER RENAME USER DROP USER
-
unknown authored
into mysql.com:/usr/home/bar/mysql-4.1.b12476
-
unknown authored
strings/ctype-tis620.c: memcpy_overlap() replaced with memmove() during the merge.
-
unknown authored
into mysql.com:/opt/local/work/mysql-5.0-12736 sql/sql_select.cc: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
-
unknown authored
The bug was in JOIN::join_free which was wrongly determining that all joins have been already executed and therefore all used tables can be closed. mysql-test/r/subselect_innodb.result: - test results fixed (Bug#12736 "Server crash during a select mysql-test/t/subselect_innodb.test: - a test case for Bug#12736 "Server crash during a select": test that ha_index_or_rnd_end and mysql_unlock_tables are called for all used tables in proper order. sql/item_subselect.cc: - implement subselect_union_engine::is_executed sql/item_subselect.h: - implement Item_subselect::is_evaluated. This function is used to check whether we can clean up a non-correlated join of a subquery when cleaning up the join of the outer query sql/sql_lex.h: - declare st_select_lex::cleanup_all_joins sql/sql_select.cc: - remove an argument from JOIN::join_free, it's now not used - reimplement JOIN::join_free to not unlock tables if there is a subquery that has not yet been evaluated. Make sure that the new implementation calls ha_index_or_rnd_end for every table in the join and inner joins, because all table cursors must be closed before mysql_unlock_tables. sql/sql_select.h: - JOIN::join_free signature changed sql/sql_union.cc: - implement a helper method st_select_lex::cleanup_all_joins, which recursively walks over a tree of joins and calls cleanup() for each join.
-
unknown authored
into mysql.com:/usr/home/ram/work/mysql-4.1 myisam/mi_search.c: Auto merged include/m_string.h: SCCS merged
-
unknown authored
into mysql.com:/usr/home/bar/mysql-4.1.b12476 sql/item_cmpfunc.cc: Auto merged
-
unknown authored
Clean application of patch - - Added --tz-utc to fix issue of dumping timestamp values between servers with different global time zone settings, particularly with regard to the day of DST changeover, which without this fix, would dump duplicate timestamp values. client/client_priv.h: BUG# 13052 - clean application of http://lists.mysql.com/internals/30993 client/mysqldump.c: BUG# 13052 Clean application of patch http://lists.mysql.com/internals/30993 - added new --tz-utc option - added saving of TIME_ZONE in dump file - set TIME_ZONE to "+00:00" in dump mysql-test/r/mysqldump.result: BUG# 13052 New results mysql-test/t/mysqldump.test: BUG# 13052 Added new test to test if the new option --tz-utc places 'SET TIME_ZONE="+00:00" at the top of the file and that this fixes the problem of ending up with duplicate timestamp values that should be unique on eve of DST
-
- 12 Oct, 2005 9 commits
-
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean
-
unknown authored
into mysql.com:/users/lthalmann/bk/mysql-5.0-mysqlbinlog-ulong
-
unknown authored
into mysql.com:/home/mysql_src/mysql-5.0
-
unknown authored
mysql-test/r/subselect.result: correcting non-ascii chars hosed by automerge as usual mysql-test/t/subselect.test: correcting non-ascii chars hosed by automerge as usual sql/log_event.cc: correcting bad manual merge. ZERO_LEN is not needed in 5.0, as ::exec_event() just tell()s the relay log instead of using get_event_len(). sql/log_event.h: get_event_len() is not needed in 5.0, ZERO_LEN neither. sql/slave.cc: fixes to take into account 5.0 specificities in replication. ZERO_LEN is not needed.
-
unknown authored
so a typo on flags will go unnoticed; I put flags in this my_free() definition (as a no-op which will still make the compiler check correctness of the flags). Applied: this caught a typo in my_realloc.c. Kindly approved by Konstantin and Mats. include/my_sys.h: When we define my_free(PTR,FG) to be my_no_flags_free(PTR) we don't make the compiler check correctness of FG, which can hurt if another person build with a different definition of my_free; so I add FG in the expression. mysys/my_realloc.c: typo found by the change in my_sys.h :)
-
unknown authored
into mysql.com:/users/lthalmann/bk/mysql-5.0-mysqlbinlog-ulong
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean
-
unknown authored
into mysql.com:/home/mysql_src/mysql-5.0
-
unknown authored
(problem found by kent) mysql-test/r/federated.result: replace port number with a named identifier mysql-test/t/federated.test: add call to replace the resulting display of the port number with a string
-