marko@hundin.mysql.fi
8ade0f9a14
Merge marko@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-10-05 17:12:16 +03: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
lenz@mysql.com
762381980e
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2004-10-05 15:06:39 +02: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
joreland@mysql.com
761bc1ce4d
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-05 15:02:10 +02: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
lenz@mysql.com
5db0d20b88
- Rename the *.cnf files to *.ini for the Windows source distribution
2004-10-05 14:42:15 +02:00
marko@hundin.mysql.fi
42f3c0eb5b
Merge marko@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-10-05 15:15:45 +03:00
joreland@mysql.com
9d6cb54bce
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-05 14:04:33 +02:00
Sinisa@sinisa.nasamreza.org
19c112dfb5
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-10-05 14:54:40 +03:00
joreland@mysql.com
ac7771becd
Don't need to scan exclusive since keyinfo is sent anyway
2004-10-05 13:51:32 +02:00
Sinisa@sinisa.nasamreza.org
2ffb87f6a5
Fix for wrongly calculated Examined_rows in 4.0 UNION's.
2004-10-05 14:47:10 +03: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
joreland@mysql.com
0a8bbe4d85
wl2135 - index restart
2004-10-05 12:17:42 +02:00
ingo@mysql.com
ca6533dbae
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0
2004-10-05 12:05:13 +02:00
tomas@poseidon.ndb.mysql.com
d60ba54d1c
moved code out of DBUG_ASSERT
2004-10-05 10:04:09 +00:00
joerg@mysql.com
1b39262a8b
Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/push-4.0
2004-10-05 11:33:57 +02:00
ingo@mysql.com
c546074e21
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug4286
2004-10-05 11:33:13 +02:00
brian@brian-akers-computer.local
97cf755a26
Row level lock code for the archive storage engine.
2004-10-05 01:40:00 -07:00
tomas@poseidon.ndb.mysql.com
250d643ee2
last try didnt work
2004-10-05 07:48:51 +00:00
joreland@mysql.com
e5f1db69cf
wl2135 test prg + bug fixes
2004-10-05 09:01:22 +02: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
rburnett@build.mysql.com
b4ee4d358a
Bug #5829 mysqlimport garbles path of the file to be imported
...
Original code was checking ! unix_socket for local_file flag. This doesn't work and so was removed. Now
to import a local file, you must use the --local command line option.
mysqlimport.c:
Removed check of unix_socket to set local_file
2004-10-04 20:26:43 +02:00
vva@eagle.mysql.r18.ru
91e8afac37
patch fixing after review on patch-fixing of
...
Bug #5492
"set @@session.read_rnd_buffer_size=33554432" crashes server on query
1. added warning comments for uint3korr (need one more byte allocated)
2. unsigned long in uint3korr was replaced by unsigned int to
avoid problems on 64-bits platforms
3. shorten warning comments in init_rr_cache in sql/records.cc
2004-10-04 23:26:42 +05: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
vva@eagle.mysql.r18.ru
d3dc011844
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_5492/mysql-4.0
2004-10-04 21:30:45 +05: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
joreland@mysql.com
f41211f9e8
wl2135 - ndb api test prg
2004-10-04 17:48:03 +02:00
konstantin@mysql.com
e107778119
Comments to the single-select optimization algorithm.
2004-10-04 18:58:06 +04:00
joreland@mysql.com
fd420f72b6
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-04 15:53:37 +02: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
marko@hundin.mysql.fi
d5728b91bb
InnoDB: make ALTER TABLE to work on table names containing '#' (Bug #5856 )
2004-10-04 16:24:37 +03: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
marko@hundin.mysql.fi
c0531d70f6
Merge marko@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-10-04 15:17:32 +03:00
joreland@mysql.com
98fd1c32f3
Don't compile -O1 if --with-debug=full (as it can optimize away the call stack)
2004-10-04 13:43:16 +02:00
joreland@mysql.com
766752ed3b
new printer
2004-10-04 13:08:58 +02:00
joreland@mysql.com
0783bfb6c3
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-10-04 13:02:16 +02:00
joreland@mysql.com
0c7e32fcab
NdbIndexScanOperation::reset_bounds()
...
- Send BOUNDS as KEYINFO
- At restart, only reset KEYINFO
--
Fix resource shortage at KEYINFO in Dbtc and Dblqh w.r.t scan
--
2004-10-04 12:59:04 +02: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