gluh@mysql.com
f07d2aaac6
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-01-11 15:05:40 +04:00
gluh@eagle.intranet.mysql.r18.ru
9f729c45d7
Additional fix for wl#2506
2006-01-11 15:04:18 +04:00
andrey@lmy004.
8515610f2e
manual merge
2006-01-11 12:01:36 +01:00
mats@mysql.com
0933a3bc34
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b16095-mysql-5.1-new
2006-01-11 11:50:09 +01:00
jonas@perch.ndb.mysql.com
161645c81e
wl2723 - ndb opt. nr
2006-01-11 11:35:25 +01:00
msvensson@neptunus.(none)
4b913614fc
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-11 11:24:57 +01:00
msvensson@neptunus.(none)
4bcc1845eb
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
2006-01-11 11:21:23 +01:00
msvensson@neptunus.(none)
f60f757689
Add comments that groups and describes the inits
2006-01-11 11:10:58 +01:00
msvensson@neptunus.(none)
f4ad824df9
Remove obsolete comment
2006-01-11 11:07:17 +01:00
msvensson@neptunus.(none)
2f48e4f1dc
Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.
2006-01-11 11:06:26 +01:00
knielsen@mysql.com
adce077dfb
Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-11 09:21:11 +01:00
mats@mysql.com
31c3ae5603
Bug#16095 (INSERT DELAYED crashes mysqld server):
...
Checking that binlog is open before calling binlog_query().
2006-01-11 09:16:24 +01:00
knielsen@mysql.com
246690cb1e
Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-01-11 09:02:13 +01:00
brian@zim.(none)
b56432cd19
Added support for CREATE TABLE AUTO_INCREMENT and added more tests. Also non-unique index scans of autoincrement not function.
2006-01-10 22:54:34 -08:00
msvensson@neptunus.(none)
d42d399464
Disable code for "let" to assign each column from query to it's own variable
2006-01-11 00:24:57 +01:00
anozdrin@mysql.com
e5d26fc446
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/MySQL/devel/5.0-bug15110
2006-01-11 02:10:59 +03:00
anozdrin@mysql.com
b04b851ef9
Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
...
There are two main idea of this fix:
- introduce a common function for server and client to split user value
(<user name>@<host name>) into user name and host name parts;
- dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03:00
ingo@mysql.com
fc85125a93
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/nfstmp1/ingo/autopush-773/mysql-5.0
2006-01-10 21:57:47 +01:00
andrey@lmy004.
cda83534b1
WL #1034 (Internal CRON) pre-push update
...
fix errmsg.txt
2006-01-10 21:47:12 +01:00
mskold@mysql.com
0f7214d9dc
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-01-10 21:43:09 +01:00
mskold@mysql.com
cb1bd7d7ae
Can't repeat bug#15004, enable tests again
2006-01-10 21:39:12 +01:00
andrey@lmy004.
7c049782fa
WL #1034 (Internal CRON)
...
merge before push
2006-01-10 21:02:19 +01:00
ingo@mysql.com
4c447ea454
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2006-01-10 20:03:28 +01:00
jani@hasky.mysql.fi
5182d40412
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hasky.mysql.fi:/home/jani/mysql-5.0
2006-01-10 20:56:24 +02:00
andrey@lmy004.
d2f0002e77
WL #1034 (Internal CRON) pre-push updates
...
- fixed test results
- fixed bug caught by information_schema.test . Bison temporal
variables are very nice but extremely error-prone (Count one more
time just to be sure).
2006-01-10 19:16:58 +01:00
aivanov@mysql.com
cdf3e4c02e
Post-merge changes
2006-01-10 21:03:02 +03:00
jani@ua141d10.elisa.omakaista.fi
d9d6dfea3a
Changed function prototype.
2006-01-10 19:19:56 +02:00
monty@mysql.com
2970e71ce8
Re-run fix-fields on condition if table was reopened in HANDLERREAD
2006-01-10 19:13:12 +02:00
msvensson@neptunus.(none)
43d563b073
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 18:09:39 +01:00
jani@ua141d10.elisa.omakaista.fi
df801decef
Fixed refresh_status function.
2006-01-10 18:56:23 +02:00
aivanov@mysql.com
2871e85f2e
Merge mysql.com:/home/alexi/dev/mysql-4.1-15805
...
into mysql.com:/home/alexi/dev/mysql-5.0-15805
2006-01-10 19:22:47 +03:00
monty@mysql.com
3143daf8ac
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2006-01-10 18:03:54 +02:00
gluh@eagle.intranet.mysql.r18.ru
be4ebd9038
WL#2506: Information Schema tables for PARTITIONing
...
added I_S 'PARTITIONS' table
2006-01-10 19:44:04 +04:00
msvensson@neptunus.(none)
4a000ba857
Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-small_fix
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 16:00:37 +01:00
aivanov@mysql.com
16004acce1
Commenting out testcases which cause type_time.test failure.
...
To be uncommented after fixing bug 15805.
2006-01-10 17:57:46 +03:00
ingo@mysql.com
0f7f9c67d6
Merge mysql.com:/home/mydev/mysql-4.1-bug5390
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2006-01-10 15:56:47 +01:00
msvensson@neptunus.(none)
a09473e652
Fix for crashing mysqltest
2006-01-10 15:56:30 +01:00
msvensson@neptunus.(none)
5a9b31e940
Merge neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 14:56:46 +01:00
msvensson@neptunus.(none)
b10bed08ce
Fix mysqltest crash problem
2006-01-10 14:55:39 +01:00
aelkin@mysql.com
9f0b5092e3
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-10 14:40:05 +02:00
aelkin@mysql.com
d7eb02f439
BUG#9483 test was overworked to account reviews finally to leave only REVOKE check.
...
There is a specific rpl_ignore_grant test case for GRANT.
2006-01-10 13:44:08 +02:00
svoj@april.(none)
1e8e3856da
Fixed warnings.
2006-01-10 15:05:31 +04:00
msvensson@neptunus.(none)
12fcc10533
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 11:42:20 +01:00
andrey@lmy004.
64d2033f09
WL 1034 update
...
(pre-push cleanups removing debugging code)
2006-01-10 11:31:45 +01:00
igor@rurik.mysql.com
19f3821ccb
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-01-10 02:19:01 -08:00
msvensson@neptunus.(none)
8c8d0b0add
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
2006-01-10 11:03:31 +01:00
joerg@mysql.com
74ef14158f
Some casts and simple fixes to fix compile errors in Visual 2005,
...
cleaned up some of the casts as a result of Mats' review.
(transferred from "2005/12/10 22:31:58-06:00 reggie@fedora.(none)"
and from "2006/01/03 22:37:24-06:00 reggie@fedora.(none)")
2006-01-10 10:35:43 +01:00
msvensson@neptunus.(none)
86e8958a4e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2006-01-10 09:57:59 +01:00
msvensson@neptunus.(none)
d37c04d125
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/bug15598/my51-bug15598
2006-01-10 09:20:30 +01:00
igor@rurik.mysql.com
ed7a11895f
Merge rurik.mysql.com:/home/igor/mysql-5.1
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-01-10 00:14:39 -08:00