- 18 Nov, 2004 20 commits
-
-
unknown authored
post-conflict-merge fix (duplicate comment) sql/log_event.cc: post-conflict-merge fix (duplicate comment)
-
unknown authored
sql/log_event.cc: SCCS merged
-
unknown authored
When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some customer would have benefited much from this in his recovery. All this change does is adding one commented (#) line before the LOAD DATA command, so it is quite innocuous.
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
-
unknown authored
corrected mistake in previous patch ndb/tools/Makefile.am: change file name to avoid conflict ndb/tools/restore/restore_main.cpp: corrected mistake in previous patch
-
unknown authored
-
unknown authored
-
unknown authored
Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max: innobase/fil/fil0fil.c: Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max: innobase/include/fil0fil.h: Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max:
-
unknown authored
.c -> .cc fix source dist problem for ndb fix type check problem for mysqladmin client/Makefile.am: fix for mysqladmin link problem .c -> .cc client/mysqladmin.cc: fix for mysqladmin link problem .c -> .cc configure.in: fix for mysqladmin link problem .c -> .cc ndb/include/Makefile.am: fix source dist problem for ndb ndb/src/mgmclient/CommandInterpreter.cpp: fix type check problem ndb/src/mgmclient/ndb_mgmclient.hpp: fix type check problem ndb/src/mgmclient/ndb_mgmclient.h: fix type check problem
-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
-
unknown authored
row_ins_scan_sec_index_for_duplicate(), row_ins_duplicate_error_in_clust(): remove unused variables "ptr" innobase/row/row0ins.c: row_ins_scan_sec_index_for_duplicate(), row_ins_duplicate_error_in_clust(): remove unused variables "ptr"
-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1 sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
-
unknown authored
into mysql.com:/space/pekka/ndb/version/my41
-
unknown authored
clause resolves collation conflict for the first and the second parts pair.
-
unknown authored
-
unknown authored
into mysql.com:/space/pekka/ndb/version/my41 sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
ndb/src/common/util/NdbSqlUtil.cpp: charset fix from Bar (strxfrm_multiply can be 0) ndb/src/ndbapi/NdbIndexOperation.cpp: charset fix from Bar (strxfrm_multiply can be 0) ndb/src/ndbapi/NdbOperationSearch.cpp: charset fix from Bar (strxfrm_multiply can be 0) ndb/src/ndbapi/NdbScanOperation.cpp: charset fix from Bar (strxfrm_multiply can be 0)
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
-
unknown authored
-
- 17 Nov, 2004 5 commits
-
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
-
unknown authored
mysql-test/r/ctype_ucs.result: result update mysql-test/t/ctype_ucs.test: time independent
-
unknown authored
Moving the part of user_var.test using UCS2 to ctype_ucs.test mysql-test/r/ctype_ucs.result: result update mysql-test/r/user_var.result: result update mysql-test/t/ctype_ucs.test: importing test piece from user_var.test mysql-test/t/user_var.test: using UCS2 in this test fails on non-USC2-capable binaries, so let's move this piece to ctype_ucs.test. sql/slave.cc: changing arg type to uint32* (as what is used in this arg is &thd->db_length which is uint32*) sql/slave.h: changing arg type to uint32* sql/sql_parse.cc: changing arg types to uint32, as what is used in these args is a create_field::length which is uint32.
-
unknown authored
sql/ha_innodb.cc: Auto merged
-
unknown authored
-
- 16 Nov, 2004 15 commits
-
-
unknown authored
into rurik.mysql.com:/home/igor/mysql-4.1
-
unknown authored
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
-
unknown authored
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
-
unknown authored
Added a test case for bug #6447. mf_keycache.c: Fixed bug #6447. Erronious code in the key_cache_read function caused problems when reading key blocks with offset>0 into key cache. The code of key_cache_insert and key_cache_write was modified similarly. mysys/mf_keycache.c: Fixed bug #6447. Erronious code in the key_cache_read function caused problems when reading key blocks with offset>0 into key cache. The code of key_cache_insert and key_cache_write was modified similarly. mysql-test/t/key_cache.test: Added a test case for bug #6447. mysql-test/r/key_cache.result: Added a test case for bug #6447.
-
unknown authored
into hundin.mysql.fi:/home/heikki/mysql-4.1
-
unknown authored
Anthony's http://lists.mysql.com/internals/18505 patch for DROP DATABASE broke caused it to return errno if .ibd files were present (bas_ext() was obsolete in ha_innodb.cc); fix this sql/ha_innodb.cc: Anthony's http://lists.mysql.com/internals/18505 patch for DROP DATABASE broke caused it to return errno if .ibd files were present (bas_ext() was obsolete in ha_innodb.cc); fix this
-
unknown authored
sql/item_func.cc: Fix comment (used_table_cache is completely different from used_tables_cache :)
-
unknown authored
Manually ported this bug fix from 4.0: Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master sql/ha_innodb.cc: Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
-
unknown authored
Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master sql/ha_innodb.cc: Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
-
unknown authored
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug heap/hp_hash.c: Auto merged mysql-test/r/heap.result: Auto merged sql/ha_heap.cc: Auto merged
-
unknown authored
reverting previous patch sql/ha_ndbcluster.cc: reverting previous patch
-
unknown authored
into mysql.com:/usr/home/bar/mysql-4.1
-
unknown authored
Space allocated didn't take in account trailing '\0' bytes. strings/ctype-tis620.c: Space allocated didn't take in account trailing '\0' bytes.
-
unknown authored
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6449
-
unknown authored
Also print warning if there is an ndb->mysql errorcode mapping, this since the warning provides valuable info to the user
-