Commit graph

27228 commits

Author SHA1 Message Date
jimw@mysql.com
2c90e2f7a6 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-19 13:47:05 -07:00
elliot@mysql.com
9b62dd1545 Merge mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-10-19 14:40:05 -04:00
elliot@mysql.com
f9648bc815 Merge bk-innodb.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0
2005-10-19 13:20:21 -04:00
elliot@mysql.com
0955163bb1 BUG#14056 Column prefix index on UTF-8 primary key column causes 'Can't find record..'
Applying InnoDB patch from Jan Lindstrom
2005-10-19 12:06:29 -04:00
konstantin@mysql.com
bee76b78a2 A fix and a test case for Bug#13587 "Server crash when SP is created
without database"
2005-10-19 14:46:32 +04:00
sergefp@mysql.com
867e790dc8 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug12915-merge
2005-10-19 12:42:50 +04:00
sergefp@mysql.com
841a2abde0 Post-merge fixes 2005-10-19 12:41:30 +04:00
patg@krsna.patg.net
b310e430f9 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-10-18 18:53:54 -07:00
patg@krsna.patg.net
f1bd9c0d0a Changeset:
Changed option text in mysqldump.c
mysqldump.c:
  Changed text to read "+00:00" as opposed to "UTC" (per what the code does)
2005-10-18 18:51:07 -07:00
patg@krsna.patg.net
c35d32a04d Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
2005-10-18 16:31:12 -07:00
patg@krsna.patg.net
4b71f1762e Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
2005-10-18 16:02:24 -07:00
patg@krsna.patg.net
85f12e97c8 Re-application of earlier patch for create_where_from_key and and delete_all_rows 2005-10-18 15:54:50 -07:00
brian@zim.(none)
3cde418f27 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-10-18 15:01:50 -07:00
brian@zim.(none)
6ab502e523 Per a user request there is now support for "CHECK TABLE" where the table is an archive file. 2005-10-18 14:52:38 -07:00
sergefp@mysql.com
e7065d355c BUG#121915: Merge 4.1->5.0 2005-10-19 01:52:06 +04:00
bell@sanja.is.com.ua
7be184a1f7 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
2005-10-19 00:26:19 +03:00
petr@mysql.com
2fc14efff1 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-build
2005-10-19 01:26:18 +04:00
bell@sanja.is.com.ua
aadf571b4f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-10-19 00:26:18 +03:00
ranger@regul.home.lan
9fc23406de Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  regul.home.lan:/mnt/md/bk/mysql-5.0
2005-10-19 00:26:17 +03:00
ranger@regul.home.lan
e3b17f529c After review fixes 2005-10-18 23:49:31 +03:00
petr@mysql.com
1f97d42b3d fix compilation failure on serg's box: we shouldn't
use USE_PRAGMA_INTERFACE before include of my_global.h,
where it is defined
2005-10-19 00:31:00 +04:00
bell@sanja.is.com.ua
408f2619e5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-10-18 21:50:00 +03:00
bell@sanja.is.com.ua
f95489f91b check of ACL initialization in is_acl_user() (BUG#13504) 2005-10-18 21:42:26 +03:00
jimw@mysql.com
746251a47c Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 10:49:28 -07:00
jimw@mysql.com
e284a57c88 Merge mysql.com:/home/jimw/my/mysql-4.1-13334
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 09:45:12 -07:00
jimw@mysql.com
162b3de29a Merge mysql.com:/home/jimw/my/mysql-4.1-13064
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-18 09:44:29 -07:00
ranger@regul.home.lan
366b7017e4 Added initial support of stress testing. Now it is possible to start stress test from mysql-test-run script.
For details see README.stress
2005-10-18 19:26:31 +03:00
jani@ua141d10.elisa.omakaista.fi
1b7a4abf59 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-10-18 18:04:00 +03:00
jani@ua141d10.elisa.omakaista.fi
8e1dac44b4 Some fixes to avoid compiler warnings. 2005-10-18 18:03:26 +03:00
elliot@mysql.com
d3fbb13526 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-10-18 10:21:48 -04:00
jani@ua141d10.elisa.omakaista.fi
5db97a8d9a Fixed stack overflow problem and abnormal end on Netware. 2005-10-18 16:51:11 +03:00
ramil@mysql.com
a9d1a37477 Fix for bug #14064: information_schema test fails on opnsrv6c. 2005-10-18 17:23:18 +05:00
sergefp@mysql.com
d6903c4566 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug12915-r2
2005-10-18 14:08:50 +04:00
sergefp@mysql.com
b91173af11 BUG#12915: post-review fixes 2005-10-18 14:04:14 +04:00
gluh@eagle.intranet.mysql.r18.ru
7ccf861242 Fix for bug#13783 mysqlcheck tries to optimize and analyze information_schema
'information_schema' is excluded from list of databases for mysqlcheck command
2005-10-18 14:25:03 +05:00
konstantin@mysql.com
7a57b741ca Hastily fix VC++6 project files to include a new file. 2005-10-18 01:35:08 +04:00
elliot@mysql.com
2d5afc171a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-10-17 17:21:07 -04:00
elliot@mysql.com
8e48be1585 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-10-17 17:06:05 -04:00
patg@krsna.patg.net
e8d79d4ca5 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
2005-10-17 14:05:58 -07:00
patg@krsna.patg.net
b35163b9b2 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1
2005-10-17 12:38:46 -07:00
patg@krsna.patg.net
1423db9f0c BUG# 13052 Changed text in options to TIMESTAMP 2005-10-17 12:30:01 -07:00
dlenev@mysql.com
920d379228 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg12739
2005-10-17 22:47:46 +04:00
dlenev@mysql.com
ea0b89aeae Fix for bug #12739 "Deadlock in multithreaded environment during creating/
droping trigger on InnoDB table".

Deadlock occured in cases when we were trying to create two triggers for
the same InnoDB table concurrently and both threads were able to reach
close_cached_table() simultaneously. Bugfix implements new approach to
table locking and table cache invalidation during creation/dropping
of trigger.

No testcase is supplied since bug was repeatable only under high concurrency.
2005-10-17 22:37:24 +04:00
elliot@mysql.com
7d9c25c8ed Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2005-10-17 14:14:14 -04:00
elliot@mysql.com
d7189ee8a1 BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table
Applying patch from Marko.
All tests pass in pentium-debug-max build on Linux.
2005-10-17 14:11:37 -04:00
kent@mysql.com
cb034d23cb Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-17 19:05:37 +02:00
SergeyV@selena.
b357caab3d Bug #13377. Small update, code formatting. 2005-10-17 19:36:20 +04:00
SergeyV@selena.
3dec6a3b14 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/#13377-mysql-5.0
2005-10-17 19:09:12 +04:00
SergeyV@selena.
221a501120 Small update for #13377 patch 2005-10-17 19:03:54 +04:00
SergeyV@selena.
cf3625b90f Turn off EOLN_NATIVE for test files 2005-10-17 18:58:43 +04:00