msvensson@neptunus.(none)
fac966560a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-12 18:25:51 +01:00
msvensson@neptunus.(none)
0dffbdfb61
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-12 18:23:44 +01:00
msvensson@neptunus.(none)
7f919f9ef7
Use "test ! -s" to check that file does not exist
2006-01-12 18:19:57 +01:00
bar@mysql.com
6301568290
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-01-12 16:07:06 +04:00
bar@mysql.com
5f17cbaba4
sql_show.cc:
...
after-merge fix for
bug#15581 COALESCE function truncates mutli-byte TINYTEXT values
2006-01-12 16:05:46 +04:00
bar@mysql.com
832148ded2
ctype_utf8.result:
...
After merge fix:
fixing order of results.
2006-01-12 13:08:49 +04:00
sergefp@mysql.com
40b7fab55d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug16166-r2
2006-01-12 11:55:34 +03:00
sergefp@mysql.com
aa00d65ead
Fix typo bug in previous cset
2006-01-12 11:11:16 +03:00
sergefp@mysql.com
e40759e370
BUG#16166, "Can't use index_merge with FORCE INDEX": adjust the heurstics check to take into
...
account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)
2006-01-12 10:48:27 +03:00
bar@mysql.com
0e9c8395c7
Merge mysql.com:/usr/home/bar/mysql-4.1.b15581
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-01-12 11:38:09 +04:00
bar@mysql.com
45c84d0aa9
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15581
2006-01-12 11:13:34 +04:00
anozdrin@mysql.com
00936e2777
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/MySQL/devel/5.0-bug15103
2006-01-12 03:05:29 +03:00
anozdrin@mysql.com
dae00c191f
Fix for BUG#15103: SHOW TRIGGERS: small output alignment problem.
2006-01-12 03:02:52 +03:00
reggie@linux.site
b03abd2888
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into linux.site:/home/reggie/work/mysql-5.0
2006-01-11 16:34:51 -06:00
reggie@linux.site
8de137a3aa
simple Windows compile fixes.
2006-01-11 16:18:11 -06:00
konstantin@mysql.com
4d272aba67
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-11 17:49:56 +03:00
konstantin@mysql.com
9105d06dd6
A fix for Bug#13944 "libmysqlclient exporting sha1_result function":
...
rename sha1_* to mysql_sha1_*
2006-01-11 17:31:52 +03:00
knielsen@mysql.com
db7e7cbef9
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/mysql/tmpbuild
2006-01-11 13:03:19 +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)
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
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
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
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
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
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
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
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
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
igor@rurik.mysql.com
32c7a0b62f
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-09 21:46:33 -08:00
igor@rurik.mysql.com
a3a2f065fb
Ajustement after merge
2006-01-09 21:44:42 -08:00
igor@rurik.mysql.com
e4b1399b5a
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-01-09 15:20:01 -08:00
msvensson@neptunus.(none)
e0d3410a3e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2006-01-09 20:12:18 +01:00
msvensson@neptunus.(none)
8dab567f25
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 18:06:16 +01:00
msvensson@neptunus.(none)
33d5dc041d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 17:18:49 +01:00
msvensson@neptunus.(none)
4bcf141799
Bug #15598 Server crashes in specific case during setting new password
...
- Comparing host string against NULL caused crash.
- If host.hostname is NULL treat it as ""
2006-01-09 17:12:26 +01:00
msvensson@neptunus.(none)
0e7953d8b3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
2006-01-09 15:31:38 +01:00
msvensson@devsrv-b.mysql.com
74d5ae2437
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into devsrv-b.mysql.com:/space/magnus/my41-bug15598
2006-01-09 15:29:25 +01:00
ingo@mysql.com
211734c36e
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug5390
2006-01-09 12:56:09 +01:00
ingo@mysql.com
e72e4fc35f
Merge mysql.com:/home/mydev/mysql-4.0-bug5390
...
into mysql.com:/home/mydev/mysql-4.1-bug5390
2006-01-09 12:54:24 +01:00