evgen@moonbone.local
62fa6c5eae
Merge
2005-09-13 22:22:51 +04:00
ingo@mysql.com
1ec6872197
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-13 18:18:02 +02:00
petr@mysql.com
ddc6bd8918
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-09-13 20:01:28 +04:00
msvensson@neptunus.(none)
6d99d18876
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
2005-09-13 18:01:27 +02:00
petr@mysql.com
8f12dc9378
after-merge fix
2005-09-13 19:59:26 +04:00
ingo@mysql.com
176ce23082
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-13 17:53:11 +02:00
petr@mysql.com
48028584b7
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-09-13 19:52:33 +04:00
jani@ua141d10.elisa.omakaista.fi
e512bddc2c
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-09-13 18:23:37 +03:00
jani@ua141d10.elisa.omakaista.fi
cb4f132075
Merged code. Removed unneccessary repeating.
2005-09-13 18:11:51 +03:00
msvensson@neptunus.(none)
47a5c451ca
BUG#12526 yassl: Crashes in "integer.cpp"
...
- Avoid problem with "Sun C++ 5.6 2004/07/15"
2005-09-13 17:06:14 +02:00
petr@mysql.com
e7c2da63da
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-09-13 18:54:47 +04:00
ingo@mysql.com
b8bd894723
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-13 16:19:46 +02:00
pem@mysql.com
5b8bfd4d95
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.0
2005-09-13 15:40:04 +02:00
pem@mysql.com
b145ca0694
Fixed BUG#12379: PROCEDURE with HANDLER calling FUNCTION with error
...
get strange result
according to Monty's suggestions, fixing the SELECT behaviour on errors
with SP handlers. Note that some warnings from SELECT still shows up when
the handler has caught - this is an effect of another known bug (BUG#7049).
2005-09-13 15:32:42 +02:00
petr@mysql.com
dd036077ff
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-09-13 17:05:17 +04:00
ingo@mysql.com
c8366b4328
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-13 14:40:45 +02:00
ingo@mysql.com
7953594a4d
Bug#12845 - Stress test: Server crashes on CREATE .. SELECT statement
...
Solution for 5.0.
Changed calls to open_table(). Requested to ignore
flush at places where the command did already lock tables.
This could happen in CREATE ... SELECT and ALTER TABLE.
No test case. The bug can only be triggered by true concurrency.
The stress test suite provides a test case for this.
2005-09-13 14:36:43 +02:00
ramil@mysql.com
9a64991030
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-09-13 16:54:08 +05:00
ramil@mysql.com
f402871a5e
Print a dummy section in order not to interference
...
with /etc/my.cnf and ~/.my.cnf [client] section.
2005-09-13 16:41:39 +05:00
pem@mysql.com
54560d506b
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.0
2005-09-13 13:18:15 +02:00
ndbdev@dl145c.mysql.com
a80d0e5d39
merge
2005-09-13 13:18:14 +02:00
petr@mysql.com
e9659d2159
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-09-13 15:17:52 +04:00
petr@mysql.com
d2b9085df8
Fix for Bug #13124 Stored Procedure using SELECT INTO crashes server
2005-09-13 15:15:38 +04:00
pem@mysql.com
2865184ea2
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.0
2005-09-13 12:53:12 +02:00
timour@mysql.com
dc935404c3
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-09-13 13:51:25 +03:00
pem@mysql.com
c76d5768a7
Fixed BUG#13133: Local variables in stored procedures are not initialized correctly.
...
Have to init. all local variables in their frames, not just once at the beginning
of invocation.
2005-09-13 12:50:21 +02:00
kent@mysql.com
ffc213a192
sql_prepare.cc:
...
VC6 can't handle initializing const in declaration
2005-09-13 10:15:48 +02:00
tulin@dl145c.mysql.com
5f122007fa
minor compile error fix
2005-09-13 10:03:50 +02:00
jimw@mysql.com
8369e7de8a
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-12 19:34:07 -07:00
kent@mysql.com
1313a30c83
innochecksum.c:
...
Changed from C++ comments to C comments
Did some adaption to MySQL Coding Style
2005-09-13 02:31:47 +02:00
jimw@mysql.com
a60ed0b75d
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-12 17:00:50 -07:00
jimw@mysql.com
0eec7c3cf4
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 16:48:00 -07:00
kent@mysql.com
b5dbd1c7a1
mysql-test-run.pl:
...
Corrected typo
2005-09-13 01:41:15 +02:00
kent@mysql.com
0fa6cb9b19
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-13 01:22:11 +02:00
kent@mysql.com
b3446746b9
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-09-13 01:12:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
e760a58f07
Merged from 4.1 to 5.0.
2005-09-13 01:44:50 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
cb55497bdb
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-13 01:11:55 +03:00
jmiller@mysql.com
9f573f0ac8
Adding comment for force manual merge 5.0 -> wl1012
2005-09-12 22:47:15 +02:00
jimw@mysql.com
d7dc2f68db
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 12:47:45 -07:00
jimw@mysql.com
7efd9582a2
Update test result
2005-09-12 12:45:03 -07:00
ndbdev@dl145b.mysql.com
e17e8b38a3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1
2005-09-12 20:41:50 +02:00
SergeyV@selena.
2ca1a688cd
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into selena.:H:/MYSQL/src/#05588-mysql-4.1
2005-09-12 22:19:04 +04:00
paul@kite-hub.kitebird.com
d6f32f1361
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kite-hub.kitebird.com:/tmp/merge-4.1
2005-09-12 12:53:49 -05:00
paul@kite-hub.kitebird.com
bbb8e309de
Merge kite-hub.kitebird.com:/tmp/merge-4.0
...
into kite-hub.kitebird.com:/tmp/merge-4.1
2005-09-12 12:44:52 -05:00
paul@kite-hub.kitebird.com
7240863009
README:
...
Update README (2nd try)
2005-09-12 12:44:13 -05:00
jimw@mysql.com
16e5f22162
Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 10:19:56 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
01ce8a8aa9
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-12 20:18:49 +03:00
timour@mysql.com
d0f585f11f
BUG#12943 - post-merge fix
2005-09-12 19:18:17 +03:00
timour@mysql.com
54db60c080
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-12943
2005-09-12 19:05:55 +03:00
tulin@dl145b.mysql.com
63aef9d58b
Corrected construct of faked Node fail signals in ndb SignalSender
2005-09-12 17:49:48 +02:00