ingo@mysql.com
7916e63c5a
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug6151
2004-10-22 21:07:09 +02:00
dlenev@mysql.com
796ccbf478
Manual merge of fix for bug #6081 "Call to deprecated mysql_create_db()
...
function crashes server" with main tree.
2004-10-22 22:51:55 +04:00
dlenev@mysql.com
2d5f423988
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6081
2004-10-22 20:59:00 +04:00
monty@mysql.com
a308981257
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-10-22 19:51:04 +03:00
monty@mysql.com
e5f30a8375
After merge fixes
2004-10-22 19:50:31 +03:00
dlenev@mysql.com
2dfc05b147
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-tzfix
2004-10-22 20:21:57 +04:00
dlenev@mysql.com
fbdc20e0af
Manual merge of fix for bug #6081 "Call to deprecated mysql_create_db() function crashes
...
server" with main tree.
2004-10-22 20:21:56 +04:00
monty@mysql.com
91c80cf44e
merge
2004-10-22 19:21:55 +03:00
dlenev@mysql.com
0ea8f29186
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-tzfix
2004-10-22 20:21:55 +04:00
konstantin@mysql.com
016d5adeeb
Followup to fix for bug#6050: fix valgrind warnings.
2004-10-22 20:21:55 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
af7ecf4c78
Fixed a bug in vis.c
2004-10-22 19:21:54 +03:00
mysqldev@mysql.com
50ff14b9a1
Merge mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/build/mysqldev/my/mysql-4.1-tomastest
2004-10-22 18:21:53 +02:00
kent@mysql.com
e58f924020
Merge mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/users/kboortz/daily/work/mysql-4.1-sjis
2004-10-22 18:21:52 +02:00
tomas@poseidon.ndb.mysql.com
5037886d14
removing compiler warnings
2004-10-22 16:21:51 +00:00
monty@mysql.com
bd04041264
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
2004-10-22 18:46:35 +03:00
monty@mysql.com
3afecef4df
Fix compiler warnings (detected by Intel's C++ compiler)
...
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094 )
2004-10-22 18:44:51 +03:00
dlenev@mysql.com
6b6692dc4d
Part of fix for bug #6081 "Call to deprecated mysql_create_db() function
...
crashes server"
(in 4.0 we fix only connection stalling in case of error, crash itself is
fixed in 4.1, the test case for this code is also there).
2004-10-22 19:27:43 +04:00
tomas@poseidon.ndb.mysql.com
31501a9939
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-22 15:22:47 +00:00
tomas@poseidon.ndb.mysql.com
8c9dd887f7
Add extra include on OSF1 (to let c++ program use stdint.h)
2004-10-22 15:20:15 +00:00
tomas@poseidon.ndb.mysql.com
48f1ee6acf
AIX compile fixes
2004-10-22 15:13:06 +00:00
ingo@mysql.com
20cea41f76
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug6151
2004-10-22 17:03:26 +02:00
mysqldev@mysql.com
36e59a681e
remove compiler warnings
2004-10-22 16:57:19 +02:00
kent@mysql.com
90a8caee45
Merge
2004-10-22 15:41:56 +02:00
monty@mysql.com
97b4a3415d
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
2004-10-22 14:59:59 +03:00
konstantin@mysql.com
f99d6ccfd0
A test case for Bug#6046: no fix is needed (the bug is already
...
fixed in the main tree).
2004-10-22 15:59:59 +04:00
konstantin@mysql.com
33c97a499b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/media/sda1/mysql/mysql-4.1-6050
2004-10-22 15:59:58 +04:00
tomas@poseidon.ndb.mysql.com
c21b47540f
fix c++ style comments in .h and .c files
...
compilation problems on some platforms'
2004-10-22 11:59:57 +00:00
konstantin@mysql.com
a7c52d755b
A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field
...
names with ident. tables fr. diff. schemata": revise all uses of
Item_field and make them prepared-statements friendly when necessary.
2004-10-22 14:47:35 +04:00
joreland@mysql.com
e95f46bbd2
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-10-22 11:01:11 +02:00
tomas@poseidon.ndb.mysql.com
6d0e947051
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-22 09:01:10 +00:00
tomas@poseidon.ndb.mysql.com
009bf31915
use the right make in make_binary_distribution
2004-10-22 08:57:52 +00:00
heikki@hundin.mysql.fi
dd1b2ace33
os0file.c:
...
Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway
2004-10-22 10:45:00 +03:00
kent@mysql.com
21fd8948e6
Merge mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/users/kboortz/daily/work/mysql-4.1-purify2
2004-10-22 08:57:20 +02:00
kent@mysql.com
bd3d0f6cea
sql_parse.cc:
...
Bug#6167 One element missing in 'uc_update_queries[]'
2004-10-22 08:54:14 +02:00
jan@hundin.mysql.fi
baeecbd6e4
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/talle/mysql-4.1
2004-10-22 07:58:04 +03:00
jan@hundin.mysql.fi
64061eea5a
Show table status now shows creation time of the table for InnoDB. Note that
...
this timestamp might not be the correct time because e.g. ALTER TABLE
changes this timestamp.
2004-10-22 07:52:52 +03:00
kent@mysql.com
7a640b44dd
mysqltest.c, mysqltest.result, mysqltest.test:
...
Added SQLSTATE matching support to test engine
mysqltest.result, mysqltest.test:
new file
2004-10-22 05:56:27 +02:00
heikki@hundin.mysql.fi
215cd1e4a3
row0mysql.c, row0ins.c:
...
Fix bug #5961 : release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users
2004-10-22 00:25:57 +03:00
tomas@poseidon.ndb.mysql.com
04b8a57b01
Compile fix
2004-10-21 20:49:37 +00:00
ingo@mysql.com
0d044c6869
BUG#6151 - myisam index corruption.
...
Removed the assumption of a certain key order.
Since 4.1, keys are padded with blanks for comparison.
Hence, shorter keys sort behind longer keys, if the
data bytes have values below BLANK.
2004-10-21 22:17:10 +02:00
tomas@poseidon.ndb.mysql.com
22d3333563
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-21 19:27:46 +00:00
tomas@poseidon.ndb.mysql.com
5c36f5b298
more snprintf...
2004-10-21 19:23:18 +00:00
tomas@poseidon.ndb.mysql.com
966067063a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-21 19:22:08 +00:00
tomas@poseidon.ndb.mysql.com
6e10fe2519
changed to call internal snprintf/vsnprintf
2004-10-21 19:02:01 +00:00
dlenev@brandersnatch.localdomain
e6a44b719a
Fix for bug #6116 "SET time_zone := ... requires access to
...
mysql.time_zone* tables".
We are excluding implicitly used time zone tables from privilege
checking.
2004-10-21 22:18:00 +04:00
tomas@poseidon.ndb.mysql.com
8224ef80e4
some platforms provide posix snprintf via special defined, these defines however cause problems elsewhere
...
so this is a way to only have to do this define in one file
2004-10-21 16:26:53 +00:00
konstantin@mysql.com
69a803c0ac
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/media/sda1/mysql/mysql-4.1-6059
2004-10-21 20:00:54 +04:00
joerg@mysql.com
a7d054d18f
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2004-10-21 17:57:48 +02:00
konstantin@mysql.com
9d73472840
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/media/sda1/mysql/mysql-4.1-6059
2004-10-21 19:57:23 +04:00
joerg@mysql.com
a77d91e82e
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1
2004-10-21 17:47:05 +02:00