Commit graph

14990 commits

Author SHA1 Message Date
dlenev@mysql.com
0d83bdf20d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
2004-10-04 20:13:16 +04:00
konstantin@mysql.com
e107778119 Comments to the single-select optimization algorithm. 2004-10-04 18:58:06 +04:00
tomas@poseidon.ndb.mysql.com
16ab4447bf corrected merge error rgarding NDB_CONNECTSTRING 2004-10-04 13:53:36 +00:00
tomas@poseidon.ndb.mysql.com
31f0226f00 added debug printouts in ndbapi 2004-10-04 13:26:33 +00:00
dlenev@mysql.com
a4d5804e31 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
2004-10-04 17:16:49 +04:00
dlenev@brandersnatch.localdomain
cfd34f779f Made TIMESTAMP NULL columns without explicit DEFAULT value to be always
treated as DEFAULT NULL columns (independently from their position in
table).

(still to be discussed with Monty, Brian, Trudy et al. before push)
2004-10-04 17:13:31 +04:00
tomas@poseidon.ndb.mysql.com
ca3cda0b72 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-10-04 12:52:12 +00:00
tomas@poseidon.ndb.mysql.com
e1da620f98 typo 2004-10-04 12:40:46 +00:00
tomas@poseidon.ndb.mysql.com
bc5ca3a1ce Merge 2004-10-04 12:36:25 +00:00
tomas@poseidon.ndb.mysql.com
dd3cc0c1e9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-04 12:27:43 +00:00
tomas@poseidon.ndb.mysql.com
e13b136c9a bug #5872, transactions should only be restarted with transaction.on flag off if execute_commit has been performed
added testcase for this
use force send for all executes
2004-10-04 12:26:26 +00:00
konstantin@mysql.com
0cadd78db7 A couple of typos fixed. 2004-10-04 14:14:30 +04:00
tomas@poseidon.ndb.mysql.com
1e66b6b3a6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
2004-10-04 06:59:12 +00:00
tomas@poseidon.ndb.mysql.com
c7cadf6575 addes auto pointer class for using with my_ functions
switch to using my_ for heap allocations
2004-10-04 06:58:33 +00:00
bar@mysql.com
534848558d sql_show.cc:
ctype_recode does not hang anymore. Small fix after Marko's change.
2004-10-04 11:50:31 +05:00
tomas@poseidon.ndb.mysql.com
4cab81d8c3 Merge 2004-10-04 00:34:34 +00:00
tomas@poseidon.ndb.mysql.com
e554888be6 use new function stop_ndbcluster 2004-10-04 00:25:04 +00:00
tomas@poseidon.ndb.mysql.com
fd0e3d0899 Merge 2004-10-04 00:15:32 +00:00
tomas@poseidon.ndb.mysql.com
794755cd9d better cleanup of cluster processes with test failure 2004-10-04 00:10:33 +00:00
tomas@poseidon.ndb.mysql.com
08ce5f4a35 make sure old mysqld's are shutdown 2004-10-03 23:41:15 +00:00
tomas@poseidon.ndb.mysql.com
63a8c6d8de Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-03 23:23:13 +00:00
tomas@poseidon.ndb.mysql.com
65949b5eb0 merge error 2004-10-03 23:20:05 +00:00
tomas@poseidon.ndb.mysql.com
b17bcca66f merge error 2004-10-03 22:27:04 +00:00
tomas@poseidon.ndb.mysql.com
f6ad058388 Merge 2004-10-03 21:39:04 +00:00
paul@kite-hub.kitebird.com
d5bb2099f7 mysqldump.c:
typos in comment.
2004-10-02 20:16:14 -05:00
tomas@poseidon.ndb.mysql.com
fbf2a6ac0c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-01 22:15:05 +00:00
tomas@poseidon.ndb.mysql.com
5745223a90 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-01 21:35:50 +00:00
dellis@goetia.(none)
141a5eeaca Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
2004-10-01 14:53:52 -05:00
dellis@goetia.(none)
ce6f076315 grant.test, grant.result, sql_acl.cc:
BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
2004-10-01 14:48:48 -05:00
heikki@hundin.mysql.fi
c4c398bce3 ha_innodb.cc:
A partial bugfix to a multibyte charset / column prefix index bug: my_charpos() does not handle right some cases, we try to mask the bug for ASCII chars < 128 in the UTF-8 charset
2004-10-01 21:43:19 +03:00
heikki@hundin.mysql.fi
8e8b34b1af fsp0fsp.h:
Remove accidentally pushed fsp debug code
2004-10-01 20:05:30 +03:00
heikki@hundin.mysql.fi
d7a6614d63 Merge heikki@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-10-01 20:02:34 +03:00
heikki@hundin.mysql.fi
1390ce0f75 Many files:
Fix bug introduced by the prefix key + multibyte charsets patch today
2004-10-01 20:01:25 +03:00
kent@mysql.com
391cc2963a Merge mysql.com:/home/bk/mysql-4.1
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
2004-10-01 18:28:44 +02:00
kent@mysql.com
3f717d7c00 client_test.test:
Temporarely disabled client_test test
  Use MASTER_MYSOCK to get socket path
2004-10-01 18:27:24 +02:00
tomas@poseidon.ndb.mysql.com
929e98b45b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-01 16:17:04 +00:00
tomas@poseidon.ndb.mysql.com
22c07a6be9 Fix for bug#5782: Don't choose the plan that accesses table with index_prev if the handler doesn't support it (see also ChangeSet@1.2039) 2004-10-01 15:47:56 +00:00
dlenev@mysql.com
53209cc4fc Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
2004-10-01 18:55:17 +04:00
dlenev@brandersnatch.localdomain
2511990c97 Support for TIMESTAMP columns holding NULL values. Unlike all other
column types TIMESTAMP is NOT NULL by default, so in order to have 
TIMESTAMP column holding NULL valaues you have to specify NULL as
one of its attributes (this needed for backward compatibility).

Main changes:
Replaced TABLE::timestamp_default_now/on_update_now members with
TABLE::timestamp_auto_set_type flag which is used everywhere
for determining if we should auto-set value of TIMESTAMP field 
during this operation or not. We are also use Field_timestamp::set_time()
instead of handler::update_timestamp() in handlers.
2004-10-01 18:54:06 +04:00
dellis@goetia.(none)
f5b7774e99 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
2004-10-01 08:22:12 -05:00
mskold@mysql.com
f095b82a04 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-10-01 14:57:56 +02:00
mskold@mysql.com
dd8c74beac Added index cardinality check 2004-10-01 14:57:17 +02:00
dellis@goetia.(none)
8a12b5add0 logging_ok:
Logging to logging@openlogging.org accepted
sql_acl.cc, grant.test, grant.result:
  BUG 5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
2004-10-01 07:50:26 -05:00
mskold@mysql.com
ca47a4a25c Changed test to be independent on scan order 2004-10-01 14:23:31 +02:00
marko@hundin.mysql.fi
76cda983a9 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-10-01 14:17:05 +03:00
tomas@poseidon.ndb.mysql.com
5e8ce3841a bug#5349 ALTER TABLE corrupts TEXT (and blob?) 2004-10-01 11:16:49 +00:00
jan@hundin.mysql.fi
bd5dc4513b Added more comments on the code and made some code polishing. 2004-10-01 13:32:44 +03:00
mskold@mysql.com
53d77cfcb3 Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-10-01 12:08:04 +02:00
marko@hundin.mysql.fi
d7ea8e7c6c InnoDB: quote identifiers according to MySQL settings (Bug #5292) 2004-10-01 11:51:59 +03:00
jan@hundin.mysql.fi
aaf661fcaa Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-10-01 08:39:34 +03:00