Commits · 1d56e0df19fec04d68d2353c5c93c89102426aba · nexedi / MariaDB

18 Nov, 2004 15 commits

adopted testprograms to changes in mgmapi · 1d56e0df
unknown authored Nov 18, 2004

1d56e0df
bug#6684, error messages id wrong settings · 55c57bf6
unknown authored Nov 18, 2004

55c57bf6
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0058b322
unknown authored Nov 18, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
```
0058b322

changed mysqladmin.c to mysqladmin.cc · 61cf4698

unknown authored Nov 18, 2004

no need for dvlags to have DEFINE_CXA_PURE_VIRTUAL anymore
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
enabled multiple management servrs to fetch data configurations from eachother

client/Makefile.am:
changed mysqladmin.c to mysqladmin.cc
client/mysqladmin.cc:
changed mysqladmin.c to mysqladmin.cc
configure.in:
no need for dvlags to have DEFINE_CXA_PURE_VIRTUAL anymore
ndb/include/mgmapi/mgmapi.h:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/include/mgmcommon/ConfigRetriever.hpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/include/ndbapi/ndb_cluster_connection.hpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/kernel/main.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/kernel/vm/Configuration.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
changed to config setting to always use noOfMetaTables to make sure we don't overflow arrays
ndb/src/kernel/vm/Configuration.hpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmapi/LocalConfig.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmapi/LocalConfig.hpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmapi/mgmapi.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/CommandInterpreter.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/main.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/ndb_mgmclient.hpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/ndb_mgmclient.h:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmsrv/MgmtSrvr.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
enabled multiple management servrs to fetch data configurations from eachother
ndb/src/mgmsrv/MgmtSrvr.hpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmsrv/main.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/ndbapi/ndb_cluster_connection.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
ndb/tools/waiter.cpp:
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals

61cf4698

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · e1ac2e62
unknown authored Nov 18, 2004
```
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
```
e1ac2e62

row0ins.c: · 9df54b9a

unknown authored Nov 18, 2004

  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"

9df54b9a

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 080ec6a0
unknown authored Nov 18, 2004
```
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
```
080ec6a0
correct name of function in synopsis · 4a0728fd
unknown authored Nov 18, 2004
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
4a0728fd
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7d375cc4
unknown authored Nov 18, 2004
```
into mysql.com:/space/pekka/ndb/version/my41
```
7d375cc4
Check that the third UNION part with COLLATE · fdc0d0a9
unknown authored Nov 18, 2004
```
clause resolves collation conflict for the
first and the second parts pair.
```
fdc0d0a9
Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key .. · cfedb6d9
unknown authored Nov 18, 2004

cfedb6d9
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 40b8b2ea
unknown authored Nov 18, 2004
```
into mysql.com:/space/pekka/ndb/version/my41


sql/ha_ndbcluster.cc:
  Auto merged
```
40b8b2ea

ndb: charset fix from Bar (strxfrm_multiply can be 0) · e1d92127

unknown authored Nov 18, 2004


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)

e1d92127

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d995bed2
unknown authored Nov 18, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
```
d995bed2
ifdef'd unused table reorg code · 7e2a512b
unknown authored Nov 18, 2004

7e2a512b

17 Nov, 2004 5 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 2d22575d
unknown authored Nov 17, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
2d22575d

time independent test · 28afd7cc

unknown authored Nov 17, 2004


mysql-test/r/ctype_ucs.result:
  result update
mysql-test/t/ctype_ucs.test:
  time independent

28afd7cc

Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code. · cfc1b1dc

unknown authored Nov 17, 2004

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.

cfc1b1dc

merged · 713e595a
unknown authored Nov 17, 2004
```
sql/ha_innodb.cc:
  Auto merged
```
713e595a
test for bug#5528 · 395a28b0
unknown authored Nov 17, 2004

395a28b0

16 Nov, 2004 20 commits

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 83317e5b
unknown authored Nov 16, 2004
```
into rurik.mysql.com:/home/igor/mysql-4.1
```
83317e5b
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · c66db6ce
unknown authored Nov 17, 2004
```
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
```
c66db6ce
Merge rurik.mysql.com:/home/igor/mysql-4.1 · 5decc21b
unknown authored Nov 16, 2004
```
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
```
5decc21b

key_cache.result, key_cache.test: · 1001becf

unknown authored Nov 16, 2004

  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.

1001becf

Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 · c659d1b4
unknown authored Nov 16, 2004
```
into hundin.mysql.fi:/home/heikki/mysql-4.1
```
c659d1b4

ha_innodb.cc: · 341dba87

unknown authored Nov 16, 2004

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

341dba87

Fix comment. · b0f26d2c

unknown authored Nov 16, 2004


sql/item_func.cc:
  Fix comment (used_table_cache is completely different from 
  used_tables_cache :)

b0f26d2c

ha_innodb.cc: · c612fb50

unknown authored Nov 16, 2004

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

c612fb50

ha_innodb.cc: · 305a9468

unknown authored Nov 16, 2004

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

305a9468

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · fa0254d6

unknown authored Nov 16, 2004

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

fa0254d6

ha_ndbcluster.cc: · 811143ea

unknown authored Nov 16, 2004

  reverting previous patch


sql/ha_ndbcluster.cc:
  reverting previous patch

811143ea

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 66ec4f7a
unknown authored Nov 16, 2004
```
into mysql.com:/usr/home/bar/mysql-4.1
```
66ec4f7a

ctype-tis620.c: · 4b7b8565

unknown authored Nov 16, 2004

  Space allocated didn't take in account trailing '\0' bytes.


strings/ctype-tis620.c:
  Space allocated didn't take in account trailing '\0' bytes.

4b7b8565

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ec89017b
unknown authored Nov 16, 2004
```
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6449
```
ec89017b
Also print warning if there is an ndb->mysql errorcode mapping, this since the... · 660042cf
unknown authored Nov 16, 2004
```
Also print warning if there is an ndb->mysql errorcode mapping, this since the warning provides valuable info to the user
```
660042cf

A fix (bug #6449: DO server-crashing bug). · d03b6d22

unknown authored Nov 16, 2004


sql/sql_yacc.yy:
  A fix (bug #6449: DO server-crashing bug).
  expr_list is used for DO command.

d03b6d22

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 158119f2
unknown authored Nov 16, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
158119f2

Makefile.am: · 4738fd2f

unknown authored Nov 16, 2004

  changed link order to fix linking problems


client/Makefile.am:
  changed link order to fix linking problems

4738fd2f

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · a2b4f022
unknown authored Nov 16, 2004
```
into mysql.com:/usr/home/bar/mysql-4.1
```
a2b4f022
Bug #6552 CHAR column w/o length is legal, BINARY w/o length is not · b4e3829e
unknown authored Nov 16, 2004

b4e3829e