reggie@ubuntu.(none)
50c0e826db
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ubuntu.(none):/home/reggie/bk/mysql-5.0
2005-09-13 20:40:19 -05:00
monty@mishka.mysql.fi
8b028bae87
Removed compiler warnings
2005-09-14 04:40:18 +03:00
monty@mishka.mysql.fi
31d8027e94
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.mysql.fi:/home/my/mysql-5.0
2005-09-14 04:18:38 +03:00
monty@mishka.mysql.fi
e7d7b2c757
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.mysql.fi:/home/my/mysql-5.0
2005-09-14 03:18:05 +03:00
monty@mishka.mysql.fi
d6ebc3bb34
Fixed wrong merge
2005-09-14 03:16:25 +03:00
monty@mishka.mysql.fi
9f22a16972
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.mysql.fi:/home/my/mysql-5.0
2005-09-14 01:47:38 +03:00
monty@mishka.mysql.fi
f348f62cc3
Added option --valgrind-mysqltest to mysql-test-run
...
Added flag to Field::store(longlong) to specify if value is unsigned.
This fixes bug #12750 : Incorrect storage of 9999999999999999999 in DECIMAL(19, 0)
Fixed warning from valgrind in CREATE ... SELECT
Fixed double free of mysql.options if reconnect failed
2005-09-14 01:41:44 +03:00
serg@serg.mylan
9e51538f0a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-13 23:47:04 +02:00
serg@serg.mylan
deb23f8691
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-13 23:26:54 +02:00
serg@serg.mylan
c74b0b0d0f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-13 22:04:06 +02:00
reggie@ubuntu.(none)
31be8fb694
fixed the service bits of the IM
2005-09-13 14:53:19 -05:00
reggie@linux.site
6985adffc1
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into linux.site:/home/reggie/bk/mysql-5.0-new
2005-09-13 12:59:20 -06:00
eric@mysql.com
84534bc629
Fixed minor error message bug from work for WL#2414
2005-09-13 11:59:19 -07:00
eric@mysql.com
671d63b6eb
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/eric/mysql-5.0
2005-09-13 11:52:05 -07:00
evgen@moonbone.local
62fa6c5eae
Merge
2005-09-13 22:22:51 +04:00
serg@serg.mylan
8427a10c01
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-13 19:51:13 +02:00
serg@serg.mylan
43ff196ada
after pull review - many bugs in mysqldump --routines
2005-09-13 19:32:37 +02:00
eric@mysql.com
9944cbf8f6
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/eric/mysql-5.0
2005-09-13 10:17:40 -07: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
eric@mysql.com
1a79e25537
Made changes to add federated CONNECTION information to the .frm file
...
(per Monty's patch).
Remove references to the "COMMENT" field.
WL#2414
2005-09-12 18:02:17 -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