Commit graph

15013 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
66923bf968 forgot to remove ndbrequire 2004-10-06 13:26:38 +00:00
tomas@poseidon.ndb.mysql.com
884892a650 bug#5736, subqueries and not in
and testcases
2004-10-06 13:18:55 +00:00
dlenev@mysql.com
96458f8f64 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bf
2004-10-05 21:24:08 +04:00
dlenev@brandersnatch.localdomain
eabec4c3ca Fixed small bug in handling of pre-4.1 TIMESTAMP columns which was
introduced during implementation of TIMESTAMP columns, which are able 
to store NULLs (Unfortunately it is impossible to write test case for
this. Kudos to Holyfoot for noticing it!)
2004-10-05 21:23:38 +04:00
hf@deer.(none)
bc46b3c3c5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5730
2004-10-05 21:29:40 +05:00
bar@mysql.com
3fc7640a19 Bug #5832 SELECT doesn't return records in some cases 2004-10-05 21:22:14 +05:00
heikki@hundin.mysql.fi
5d2492c855 dict0mem.h:
Fix typos in previous push
2004-10-05 19:22:13 +03:00
heikki@hundin.mysql.fi
e1952a7b9e Merge heikki@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-10-05 19:22:12 +03:00
tomas@poseidon.ndb.mysql.com
fe17cecac0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-05 16:22:11 +00:00
tomas@poseidon.ndb.mysql.com
ebb425d9c9 more and better arbitration warnings for cluster config 2004-10-05 15:18:32 +00:00
heikki@hundin.mysql.fi
3985d58ad2 ha_innodb.cc:
Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum); add comments about why innobase_get_at_most_n_mbchars() works ok
dict0mem.h:
  Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum)
row0mysql.c:
  If MySQL tries to create a column prefix index longer that 255 UTF-8 characters, give an error, and drop the table from the InnoDB internal data dictionary. MySQL did not drop the table there in its own error handling.
2004-10-05 17:08:22 +03:00
marko@hundin.mysql.fi
092d1a5084 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-10-05 16:02:10 +03:00
gluh@gluh.mysql.r18.ru
2a621e275b Fix for bug #5555: "GROUP BY enum_field" returns incorrect results 2004-10-05 17:02:09 +04:00
marko@hundin.mysql.fi
ff4b6b2b33 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-10-05 13:22:14 +03:00
tomas@poseidon.ndb.mysql.com
d60ba54d1c moved code out of DBUG_ASSERT 2004-10-05 10:04:09 +00:00
tomas@poseidon.ndb.mysql.com
250d643ee2 last try didnt work 2004-10-05 07:48:51 +00:00
tomas@poseidon.ndb.mysql.com
c36637a96e bumped up version to 3.5.2
removed staus flag
2004-10-05 06:49:11 +00:00
marko@hundin.mysql.fi
d4b3df6d31 InnoDB: Fix ALTER TABLE t DISCARD TABLESPACE (Bug #5851) 2004-10-04 20:38:23 +03:00
heikki@hundin.mysql.fi
e7500f435f lock0lock.c:
Fix compiler warning
2004-10-04 19:48:41 +03:00
dlenev@mysql.com
46826a291d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
2004-10-04 20:46:51 +04:00
joerg@mysql.com
5c8aadb5e3 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2004-10-04 18:14:36 +02:00
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
joerg@mysql.com
7da1ff33d9 To allow compilation on Tru64, the MySQL code should not mess
with the system-reserved (and system-defined) '_REENTRANT' 
CPP identifier.
Especially, it must not be "undefine"d, because the Tru64 compiler
needs it if threads are enabled.
2004-10-04 11:45:07 +02: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