Commit graph

16146 commits

Author SHA1 Message Date
unknown
c9f8c87f39 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-12-02 12:54:32 +01:00
unknown
29b3ae4dd4 Fix for Bug#6377 "Password Generation Discrepancy"
client/mysqladmin.cc:
  Fix for Bug#6377 "Password Generation Discrepancy":
  this is not a MySQL bug.
  The problem is that Windows command line client doesn't trim single quotes
  from arguments, as any UNIX shell does.
  The fix just checks for this condition and gives a warning if it is true.
2004-12-02 14:28:59 +03:00
unknown
33a4b35ec8 A fix (bug #6878: Crash with engine=memory).
heap/hp_create.c:
  A fix (bug #6878: Crash with engine=memory).
  Record length should be >= sizeof(byte*).
2004-12-02 15:06:15 +04:00
unknown
3848713956 merge (fix for bug #6878: Crash with engine=memory) 2004-12-02 14:56:46 +04:00
unknown
a845e882fd A fix (bug #6878: Crash with engine=memory).
heap/hp_open.c:
  A fix (bug #6878: Crash with engine=memory).
  Record length should be >= sizeof(byte*).
2004-12-02 14:34:53 +04:00
unknown
491a3d90a9 Fixes (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv
bug #6933: error in the tests/grant.pl test).


mysql-test/r/grant.result:
  A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv).
mysql-test/t/grant.test:
  A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv).
sql/sql_acl.cc:
  A fix (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv).
  The problem is that we use whole key length (including 'Column_name' keypart)                          
  during scanning the 'columns_priv' table in case of revoke_grant.
tests/grant.pl:
  A fix (bug #6933: error in the tests/grant.pl test).
2004-12-02 13:34:30 +04:00
unknown
6f20687e20 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1-enum
2004-12-02 13:34:28 +04:00
unknown
39d62ccc93 mgmapi.cpp:
bug #6919


ndb/src/mgmapi/mgmapi.cpp:
  bug #6919
2004-12-02 09:34:27 +00:00
unknown
5167b5f0ce Bug #6379: ENUM values are incorrectly converted
- add_field_to_list() now uses <List>String
instead of TYPELIB to be able to distinguish
literals 'aaa' and hex literals 0xaabbcc.
- move some code from add_field_to_list() where
  we don't know column charset yet, to 
  mysql_prepare_table(), where we do.
2004-12-02 12:48:43 +04:00
unknown
ef13523dbc Bug #6815 SHOW CREATE TABLE hangs after upgrading to 4.1
A test doesn't seem to be possible.
2004-12-02 11:39:50 +04:00
unknown
befcff9ba5 configure.in:
Let MySQL check the existence of readdir_r with 3 arguments; Solaris seems to have just 2 args
  Check the existence of readdir_r and localtime_r; even though MySQL does check these too, we need our own check for Hot Backup code
os0file.c:
  Use re-entrant readdir_r where available
ut0ut.c:
  Make a function to use thread-safe localtime_r where available; that particular function was not called from anywhere, though


innobase/ut/ut0ut.c:
  Make a function to use thread-safe localtime_r where available; the function was not called from anywhere, though
innobase/os/os0file.c:
  Use re-entrant readdir_r where available
innobase/configure.in:
  Let MySQL check the existence of readdir_r with 3 arguments; Solaris seems to have just 2 args
2004-12-01 18:02:34 +02:00
unknown
561ee8fd37 Move common trailing space checks into an include file.
Check UCS2 trailing spaces.


mysql-test/r/ctype_ucs.result:
  Move common trailing space checks into an include file.
  Check UCS2 trailing spaces.
  Fix UCS2 to handle trailing spaces in PAD way.
mysql-test/t/ctype_ucs.test:
  Move common trailing space checks into an include file.
  Check UCS2 trailing spaces.
  Fix UCS2 to handle trailing spaces in PAD way.
mysql-test/t/endspace.test:
  Move common trailing space checks into an include file.
  Check UCS2 trailing spaces.
  Fix UCS2 to handle trailing spaces in PAD way.
strings/ctype-ucs2.c:
  Move common trailing space checks into an include file.
  Check UCS2 trailing spaces.
  Fix UCS2 to handle trailing spaces in PAD way.
2004-12-01 19:25:05 +04:00
unknown
2d2d61d10c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-01 10:15:25 +01:00
unknown
28d18c006d Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-01 10:13:55 +01:00
unknown
e4dbc32f63 testcase for bug#6871, ndb, replace with collations
mysql-test/r/ndb_charset.result:
  testcase for bug#6871
mysql-test/t/ndb_charset.test:
  testcase for bug#6871
2004-12-01 10:13:18 +01:00
unknown
62e7f1cae9 bug#6871 - ndb
replace with charsets
  check update of primary key wo/ normalizing
  


ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Make sure tXfrmFlag is false when checking for update of primary key
2004-12-01 10:04:49 +01:00
unknown
4386e0c348 openssl_1.result, have_openssl_1.require, openssl_1.test:
Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)


mysql-test/t/openssl_1.test:
  Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
mysql-test/r/have_openssl_1.require:
  Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
mysql-test/r/openssl_1.result:
  Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-01 02:35:02 +01:00
unknown
4915690395 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-30 22:50:40 +01:00
unknown
682a8fbb11 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.1-clean


mysql-test/r/flush_block_commit.result:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
sql/lock.cc:
  Auto merged
2004-11-30 22:22:12 +01:00
unknown
352ad8156c two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever"
(originally reported as "second run of innobackup hangs forever and can even hang server").
Plus testcase for the bugfix and comments about global read locks.


mysql-test/r/flush_block_commit.result:
  result update
mysql-test/t/flush_block_commit.test:
  testing bugfix (originally: second run of innobackup hangs)
sql/lock.cc:
  When we are in start_waiting_global_read_lock(), if we ourselves have
  the global read lock, there is nothing to start. This makes a pair with how 
  wait_if_global_read_lock() behaves when we ourselves have the global read lock.
  Previously, start_waiting_global_read_lock() decremented protect... whereas wait_if_global_read_lock()
  hadn't incremented it => very wrong => hangs.
  Descriptive comments on how global read lock works.
2004-11-30 22:20:52 +01:00
unknown
12420401a7 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1


innobase/include/lock0lock.h:
  Auto merged
2004-11-30 23:12:12 +02:00
unknown
1983ff7277 lock0lock.h:
Rename lock_table_exclusive to lock_is_table_exclusive
  (somehow this change was omitted from last changeset)


innobase/include/lock0lock.h:
  Rename lock_table_exclusive to lock_is_table_exclusive
  (somehow this change was omitted from last changeset)
2004-11-30 23:10:17 +02:00
unknown
4579806f46 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-30 21:51:58 +01:00
unknown
ac2072938f fixed so that warning on missing support for engine only printed once even if option given multiple times 2004-11-30 20:51:57 +00:00
unknown
928d2a8b80 typo fixed 2004-11-30 21:17:03 +01:00
unknown
be733ad13f fixed error in test result
added extra calls to retrieve connectstring used
    reengineered connect somewhat to make retries etc explicit


mysql-test/r/ndb_index_unique.result:
  fixed error in test result
ndb/include/mgmapi/mgmapi.h:
  added extra calls to retrieve connectstring used
ndb/include/mgmcommon/ConfigRetriever.hpp:
  added extra calls to retrieve connectstring used
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  added extra calls to retrieve connectstring used
  reengineered connect somewhat to make retries etc explicit
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  added extra calls to retrieve connectstring used
ndb/src/mgmapi/mgmapi.cpp:
  added extra calls to retrieve connectstring used
ndb/src/mgmclient/CommandInterpreter.cpp:
  moved parse of quit to avoid connect before
ndb/src/ndbapi/Ndbinit.cpp:
  reengineered connect somewhat to make retries etc explicit
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  added extra calls to retrieve connectstring used
  reengineered connect somewhat to make retries etc explicit
ndb/tools/listTables.cpp:
  reengineered connect somewhat to make retries etc explicit
sql/ha_ndbcluster.cc:
  added extra calls to retrieve connectstring used
  reengineered connect somewhat to make retries etc explicit
2004-11-30 17:47:47 +00:00
unknown
99e69f2660 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1


innobase/lock/lock0lock.c:
  Auto merged
2004-11-30 17:52:30 +02:00
unknown
93d5f62e38 lock0lock.c:
If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this


innobase/lock/lock0lock.c:
  If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this
2004-11-30 17:51:10 +02:00
unknown
892cec8555 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-11-30 17:50:56 +02:00
unknown
668d61b946 row0sel.c:
Remove compiler warning as I had forgotten an include file


innobase/row/row0sel.c:
  Remove compiler warning as I had forgotten an include file
2004-11-30 17:48:30 +02:00
unknown
795045d9a0 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-11-30 17:48:30 +02:00
unknown
fc157af39d use sql_print_warning instead of push_warning in mysqld.cc 2004-11-30 15:48:29 +00:00
unknown
d6180d37be InnoDB: Allow ALTER TABLE to do intermediate COMMIT also when the table
contains auto_increment columns.  (Bug #6633)


innobase/include/lock0lock.h:
  Replaced lock_get_table()
  with lock_get_src_table() and lock_is_table_exclusive()
innobase/lock/lock0lock.c:
  Replaced lock_get_table()
  with lock_get_src_table() and lock_is_table_exclusive()
sql/ha_innodb.cc:
  ha_innobase::write_row(): Improve the ALTER TABLE optimization
  (do intermediate COMMIT also if table contains auto_increment columns)
2004-11-30 17:34:37 +02:00
unknown
ea6614855f ps_7ndb.result, ps_7ndb.test:
ndb now runs ps tests just like the others


mysql-test/t/ps_7ndb.test:
  ndb now runs ps tests just like the others
mysql-test/r/ps_7ndb.result:
  ndb now runs ps tests just like the others
2004-11-30 15:08:26 +00:00
unknown
cb6007ceb6 mysqld.cc:
fixed erroneous previous push


sql/mysqld.cc:
  fixed erroneous previous push
2004-11-30 14:52:05 +00:00
unknown
16a130a232 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-30 12:17:21 +00:00
unknown
07ed8294fa added check connection mgmapi method
added ndb_mgm_check_connection when error is printed


ndb/include/mgmapi/mgmapi.h:
  added check connection mgmapi method
ndb/src/mgmapi/mgmapi.cpp:
  added check connection mgmapi method
ndb/src/mgmclient/CommandInterpreter.cpp:
  added mgm_check_check_connection when error is printed
ndb/src/mgmsrv/Services.cpp:
  added check connection mgmapi method
ndb/src/mgmsrv/Services.hpp:
  added check connection mgmapi method
2004-11-30 12:02:53 +00:00
unknown
32fa7e0f4d Portability fix. Why not to use UINT_MAX32 here? 2004-11-30 15:10:48 +04:00
unknown
3eada05db2 mysqld.cc:
fixed typo


sql/mysqld.cc:
  fixed typo
2004-11-30 10:22:50 +00:00
unknown
45968d1ff7 fixed bug/compiler warning
rewrote safer
    added return value to shutdown
    nicer printouts
    removed exit at shutdown


ndb/src/common/logger/Logger.cpp:
  fixed bug/compiler warning
ndb/src/mgmapi/LocalConfig.cpp:
  removed compiler warning
  rewrote safer
ndb/src/mgmclient/CommandInterpreter.cpp:
  added return value to shutdown
  nicer printouts
  removed exit at shutdown
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  fixed compiler warning
2004-11-30 10:19:49 +00:00
unknown
736875513a add warnings for INNODB,BDB,ISAM being unavailable if switch to use is supplied, i.e. --bdb,--isam,--innodb 2004-11-30 09:22:33 +00:00
unknown
f2c1ccb416 An additional test for 'CREATE DATABASE' with non-default character set. 2004-11-30 13:19:35 +04:00
unknown
8da148abe7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
2004-11-30 08:41:59 +00:00
unknown
828cefb37d added use of mysql_cluster in mysqld (e.g. for ndb-connectstring)
added warning printout if --ndbcluster switch is given in a "non-cluster" binary
2004-11-30 08:41:16 +00:00
unknown
0dacdfcc75 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101


client/mysqldump.c:
  Auto merged
2004-11-30 12:27:17 +04:00
unknown
bfab864435 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-30 07:44:11 +01:00
unknown
49c8409c25 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1


mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-11-30 07:43:19 +01:00
unknown
94a5379fbe ndb - fixed long overdue problems with unique indexes and null values
mysql-test/r/ndb_index_unique.result:
  Test of unique index and null
mysql-test/t/ndb_index_unique.test:
  Test of unique index and null
sql/ha_ndbcluster.cc:
  Fixed long overdue problems with unique indexes and null values
2004-11-30 07:41:26 +01:00
unknown
41ade141aa Applied some Netware related patches.
client/mysqladmin.cc:
  Added option to mysqladmin for Netware.
netware/comp_err.def:
  Copyright notice update, for Netware.
netware/isamchk.def:
  Copyright notice update, for Netware.
netware/isamlog.def:
  Copyright notice update, for Netware.
netware/libmysql.def:
  Copyright notice update, for Netware.
netware/my_print_defaults.def:
  Copyright notice update, for Netware.
netware/myisam_ftdump.def:
  Copyright notice update, for Netware.
netware/myisamchk.def:
  Copyright notice update, for Netware.
netware/myisamlog.def:
  Copyright notice update, for Netware.
netware/myisampack.def:
  Copyright notice update, for Netware.
netware/mysql.def:
  Copyright notice update, for Netware.
netware/mysql_install.def:
  Copyright notice update, for Netware.
netware/mysql_install_db.def:
  Copyright notice update, for Netware.
netware/mysql_test_run.def:
  Copyright notice update, for Netware.
netware/mysql_waitpid.def:
  Copyright notice update, for Netware.
netware/mysqladmin.def:
  Copyright notice update, for Netware.
netware/mysqlbinlog.def:
  Copyright notice update, for Netware.
netware/mysqlcheck.def:
  Copyright notice update, for Netware.
netware/mysqld.def:
  Copyright notice update, for Netware.
netware/mysqld_safe.def:
  Copyright notice update, for Netware.
netware/mysqldump.def:
  Copyright notice update, for Netware.
netware/mysqlimport.def:
  Copyright notice update, for Netware.
netware/mysqlshow.def:
  Copyright notice update, for Netware.
netware/mysqltest.def:
  Copyright notice update, for Netware.
netware/pack_isam.def:
  Copyright notice update, for Netware.
netware/perror.def:
  Copyright notice update, for Netware.
netware/replace.def:
  Copyright notice update, for Netware.
netware/resolve_stack_dump.def:
  Copyright notice update, for Netware.
netware/resolveip.def:
  Copyright notice update, for Netware.
sql/mysqld.cc:
  Changes to fix the abend on NetWare on recieving the server down and volume deactivation 
  events. Do not join for the main thread if these events occur
2004-11-29 17:41:47 +02:00
unknown
905db4984b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-29 15:19:08 +00:00