Commit graph

29123 commits

Author SHA1 Message Date
gluh@mysql.com
ab67605976 Merge mysql.com:/home/gluh/MySQL/Merge/mysql-5.0-release
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-03 15:39:38 +04:00
gluh@eagle.intranet.mysql.r18.ru
f3e993d9a6 Fix for bug#17826 'type_decimal' fails with ps-protocol
removed unnecessary calculation of cache value 
 otherwise Join::preapre tries to calculate 
 undefined values(filed values)
2006-03-03 15:29:39 +04:00
ramil@mysql.com
1a07140515 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b17615
2006-03-03 09:35:25 +04:00
kent@mysql.com
7ae10acbc4 mysql.spec.sh:
Don't create empty embedded RPM, bug#15769
2006-03-03 03:27:27 +01:00
kent@mysql.com
32b003e64d Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2006-03-03 02:55:51 +01:00
cmiller@zippy.(none)
c672c119e3 Expanding a binary field should result in 0x00-filled positions, not 0x20
(ASCII space).  For Bug#16857.
2006-03-02 20:49:10 -05:00
kent@mysql.com
5557a442e9 Makefile.am:
Use libtool convenience lib, to access get_password object correctly, bug#17155
2006-03-03 02:46:47 +01:00
cmiller@zippy.(none)
5147bb8e9b Expanding a binary field should result in 0x00-filled positions, not 0x20
(ASCII space).  For Bug#16857.
2006-03-02 19:59:49 -05:00
SergeyV@selena.
1bacdef0a7 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/#17595-mysql-5.0
2006-03-02 20:52:58 +03:00
pem@mysql.com
fef5cf16c8 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
2006-03-02 16:39:43 +01:00
pem@mysql.com
d85e929547 Fixed BUG#17476: Stored procedure not returning data when it is called first
time per connection
  Removed const_string() method from Item_string (it was only used in one
  place, in a bad way). Defer possible SP variable, and access data directly
  instead, in date_format item.
2006-03-02 14:54:04 +01:00
bpontz@mysql.com
7410560baf configure.in:
cloned
2006-03-02 12:24:07 +01:00
ramil@mysql.com
72da0c6091 Fix for bug #17615: invalid handling of function results in UPDATE...SET statement. 2006-03-02 15:05:55 +04:00
joerg@mysql.com
053a56c751 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0 2006-03-02 11:09:16 +01:00
joerg@mysql.com
0a90a424fe Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2006-03-02 11:07:48 +01:00
joerg@mysql.com
ff4b093d3a Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0 2006-03-02 11:04:05 +01:00
msvensson@neptunus.(none)
9c91f8034c Bug#17279 user with no global privs and with create priv in db can create
database
 - Fix test case for systems with "lowercase names"
2006-03-02 11:01:58 +01:00
msvensson@neptunus.(none)
4697536963 Make the define start at "start of line" 2006-03-02 10:55:55 +01:00
joerg@mysql.com
6838660267 Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1 2006-03-02 10:48:46 +01:00
joerg@mysql.com
a454821d12 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2006-03-02 10:31:42 +01:00
holyfoot@mysql.com
d25c2e9d41 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9088
2006-03-02 12:35:42 +04:00
holyfoot@mysql.com
5cbcf9388c Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9088
2006-03-02 12:34:05 +04:00
paul@snake-hub.snake.net
fc7ca83a90 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
2006-03-01 18:51:33 -06:00
paul@snake-hub.snake.net
26caa52c01 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
2006-03-01 18:44:44 -06:00
paul@snake-hub.snake.net
fc6cdbded4 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-01 18:39:18 -06:00
paul@snake-hub.snake.net
31d7f7b0b5 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
2006-03-01 18:38:19 -06:00
paul@snake-hub.snake.net
fe613502af README:
revise README.
2006-03-01 18:37:41 -06:00
paul@snake-hub.snake.net
6bdd4993a8 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-01 17:57:47 -06:00
paul@snake-hub.snake.net
32bdb2cc72 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
2006-03-01 17:55:41 -06:00
paul@snake-hub.snake.net
be887ea830 README.gcov:
Revise README.gcov.
2006-03-01 17:55:10 -06:00
paul@snake-hub.snake.net
a3797344a2 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-01 17:48:17 -06:00
paul@snake-hub.snake.net
3b67fdf5f5 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
2006-03-01 17:41:34 -06:00
paul@snake-hub.snake.net
98f1d2d33e Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
2006-03-01 17:37:49 -06:00
paul@snake-hub.snake.net
7b4f0dc8b0 README:
Revise mysql-test README.
2006-03-01 17:37:07 -06:00
joerg@mysql.com
4b29ce6053 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/comment-4.0
2006-03-01 20:13:23 +01:00
joerg@mysql.com
1b698f03e4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/comment-4.1
2006-03-01 17:43:16 +01:00
tkatchaounov@lsmy3.wdf.sap.corp
95fe35437a Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin
into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-bug-17523
2006-03-01 17:27:39 +01:00
msvensson@shellback.(none)
c26674d7a0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-01 15:43:57 +01:00
tkatchaounov@lsmy3.wdf.sap.corp
6a44bb6403 Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin
into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-dbg
2006-03-01 15:43:57 +01:00
joerg@mysql.com
6493af1884 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2006-03-01 15:43:56 +01:00
paul@snake-hub.snake.net
312177d3e3 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-01 08:43:56 -06:00
timour@mysql.com
0408f2bfc7 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-17523
2006-03-01 16:43:56 +02:00
aivanov@mysql.com
d20ccef6e5 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/bugs/mysql-5.0-merged
2006-03-01 17:43:55 +03:00
msvensson@shellback.(none)
b802826fc9 Dont' run the mysql_protocols on Windows 2006-03-01 15:22:47 +01:00
msvensson@shellback.(none)
3a325cb81e Bug#2845 client fails to reconnect if using TCP/IP
- Change to use non blocking read to empty channel in case of too large sd number
 - Don't check for too large socket number on Windows.
2006-03-01 15:21:03 +01:00
aivanov@mysql.com
a3ea894758 Fixed BUG #16175: Memory leak in rpl_trigger.test
Allocating/freeing memory for the db member of THD
  is wholy managed by slave thread.
2006-03-01 16:21:01 +03:00
joerg@mysql.com
24cb1ceb81 Merge mysql.com:/M50/comment-5.0 into mysql.com:/M50/mysql-5.0 2006-03-01 13:35:32 +01:00
joerg@mysql.com
30e00b0f7f Manual merge of the added "--comment=<string>" option
to both the Shell and the Perl vaerion of "mysql-test-run"-
2006-03-01 13:29:37 +01:00
joerg@mysql.com
38a7f5551a mysql-test/mysql-test-run.pl : Add a "--comment=<string>" option (backport from 5.1). 2006-03-01 13:15:37 +01:00
joerg@mysql.com
21a57a8f85 Merge mysql.com:/M40/comment-4.0 into mysql.com:/M41/comment-4.1 2006-03-01 13:10:59 +01:00