Commit graph

15907 commits

Author SHA1 Message Date
unknown
ac9891722a ignore fix 2004-11-19 09:38:41 +00:00
unknown
b140e465f4 added to ignore list
BitKeeper/etc/ignore:
  added ../ndb/tools/ndb_restore
2004-11-19 09:35:12 +00:00
unknown
d6407c760e ha_ndbcluster.cc:
merge error


sql/ha_ndbcluster.cc:
  merge error
2004-11-19 09:27:16 +00:00
unknown
5381a881e1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-19 09:18:36 +00:00
unknown
bd51cf30d2 ndb_grant.result, ndb_grant.test:
new file
2004-11-19 09:17:36 +00:00
unknown
fb36bc2a43 log_event.cc:
post-conflict-merge fix (duplicate comment)


sql/log_event.cc:
  post-conflict-merge fix (duplicate comment)
2004-11-19 00:57:26 +01:00
unknown
3ef38a3732 moved ndb_use_transactions out of opts and to be set default true in THD::init 2004-11-18 22:45:48 +00:00
unknown
31914653cd Merge
sql/log_event.cc:
  SCCS merged
2004-11-18 23:31:23 +01:00
unknown
f336c62a44 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.
2004-11-18 22:59:17 +01:00
unknown
f7164c732b Merge
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged
2004-11-18 21:54:53 +00:00
unknown
1af6e72e4e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-18 21:43:03 +00:00
unknown
13710e869f change file name to avoid conflict
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
2004-11-18 21:42:25 +00:00
unknown
ebe7fe1481 bug#6677 bug#6684 2004-11-18 21:15:18 +00:00
unknown
a8ba534cee Some comments regarding Bug#6275 ""client_test" fail in 4.1.7 make test" 2004-11-18 23:35:45 +03:00
unknown
6aab88c916 fil0fil.h, fil0fil.c:
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:
2004-11-18 22:28:37 +02:00
unknown
75431a2e16 fix for mysqladmin link problem
.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
2004-11-18 20:28:36 +00:00
unknown
283592b77d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-18 18:21:20 +01:00
unknown
9039cff65d row0ins.c:
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"
2004-11-18 17:01:33 +02:00
unknown
29d84f73de Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
2004-11-18 15:55:18 +01:00
unknown
1faf1d2349 correct name of function in synopsis
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-11-18 16:52:45 +02:00
unknown
55ddbd46bd Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-18 13:39:47 +01:00
unknown
8453693a05 Check that the third UNION part with COLLATE
clause resolves collation conflict for the
first and the second parts pair.
2004-11-18 16:15:48 +04:00
unknown
be5b6f4d4b Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key .. 2004-11-18 12:11:56 +01:00
unknown
006448b90d Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41


sql/ha_ndbcluster.cc:
  Auto merged
2004-11-18 11:55:53 +01:00
unknown
9615e9becf ndb: charset fix from Bar (strxfrm_multiply can be 0)
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)
2004-11-18 11:48:21 +01:00
unknown
ede2179175 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
2004-11-18 08:43:00 +00:00
unknown
2267ea3e02 ifdef'd unused table reorg code 2004-11-18 08:42:26 +00:00
unknown
6ce9ed784e Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-17 17:54:15 +01:00
unknown
d1e4a1f171 time independent test
mysql-test/r/ctype_ucs.result:
  result update
mysql-test/t/ctype_ucs.test:
  time independent
2004-11-17 17:06:24 +01:00
unknown
ab51882b77 Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code.
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.
2004-11-17 16:41:30 +01:00
unknown
71da21b2e9 merged
sql/ha_innodb.cc:
  Auto merged
2004-11-17 15:28:37 +01:00
unknown
835e0159b6 test for bug#5528 2004-11-17 13:38:35 +01:00
unknown
5368ba56b5 Merge
sql/ha_ndbcluster.cc:
  SCCS merged
2004-11-17 10:59:16 +00:00
unknown
c617037b23 Enabled usage of new system variables for ndb
- ndb_use_exact_count
  - ndb_autoincrement_prefetch_sz
  - ndb_use_transactions
  - ndb_force_send
moved "inlined" functions to .cc file since they are virtual anyways
enabled printout od ndb errors in warnings even if mapping existst to mysql error code


sql/ha_ndbcluster.h:
  Enabled usage of new system variables for ndb
    - ndb_use_exact_count
    - ndb_autoincrement_prefetch_sz
    - ndb_use_transactions
    - ndb_force_send
  moved "inlined" functions to .cc file since they are virtual anyways
sql/mysqld.cc:
  Enabled usage of new system variables for ndb
    - ndb_use_exact_count
    - ndb_autoincrement_prefetch_sz
    - ndb_use_transactions
    - ndb_force_send
sql/set_var.cc:
  Enabled usage of new system variables for ndb
    - ndb_use_exact_count
    - ndb_autoincrement_prefetch_sz
    - ndb_use_transactions
    - ndb_force_send
sql/sql_class.h:
  Enabled usage of new system variables for ndb
    - ndb_use_exact_count
    - ndb_autoincrement_prefetch_sz
    - ndb_use_transactions
    - ndb_force_send
2004-11-17 08:15:53 +00:00
unknown
692311f53c enabled having system tables in ndb 2004-11-17 08:10:26 +00:00
unknown
3a301ac1f8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2004-11-16 15:07:49 -08:00
unknown
d7729a859c Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
2004-11-17 01:26:23 +03:00
unknown
0033fa4be8 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-11-16 14:01:40 -08:00
unknown
2094d80b48 key_cache.result, key_cache.test:
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.
2004-11-16 13:58:49 -08:00
unknown
190227dc57 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-11-16 22:50:29 +02:00
unknown
d711df11f5 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


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
2004-11-16 22:49:28 +02:00
unknown
a710ebb413 Fix comment.
sql/item_func.cc:
  Fix comment (used_table_cache is completely different from 
  used_tables_cache :)
2004-11-16 23:27:31 +03:00
unknown
7d074100d3 ha_innodb.cc:
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
2004-11-16 20:45:52 +02:00
unknown
16d735adb0 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


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
2004-11-16 20:37:42 +02:00
unknown
f2db7d57f5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
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
2004-11-16 21:36:31 +03:00
unknown
c9a09e12db ha_ndbcluster.cc:
reverting previous patch


sql/ha_ndbcluster.cc:
  reverting previous patch
2004-11-16 13:56:25 +00:00
unknown
5aab4ac28a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-11-16 16:50:17 +04:00
unknown
b226bebcc8 ctype-tis620.c:
Space allocated didn't take in account trailing '\0' bytes.


strings/ctype-tis620.c:
  Space allocated didn't take in account trailing '\0' bytes.
2004-11-16 16:45:47 +04:00
unknown
996986fea1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6449
2004-11-16 16:10:45 +04:00
unknown
9ae173c4ff Also print warning if there is an ndb->mysql errorcode mapping, this since the warning provides valuable info to the user 2004-11-16 12:10:44 +00:00