iggy@rolltop.ignatz42.dyndns.org
8bc745456f
Bug #11972 : client uses wrong character set after reconnect.
...
The mysql client uses the default character set on reconnect. The default character set is now controled by the client charset command while the client is running. The charset command now also issues a SET NAMES command to the server to make sure that the client's charset settings are in sync with the server's.
2006-08-24 11:15:08 -04:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
68e1e60f27
Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-maint
2006-08-24 14:51:54 +02:00
tsmith@maint1.mysql.com
2225f14755
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into maint1.mysql.com:/data/localhome/tsmith/bk/50
2006-08-24 02:49:03 +02:00
tsmith/tim@siva.hindu.god
80e565dfe1
Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-08-23 18:31:15 -06:00
tsmith/tim@siva.hindu.god
df6b8516c4
Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41
...
into siva.hindu.god:/usr/home/tim/m/bk/beef-50
2006-08-23 18:24:59 -06:00
tsmith/tim@siva.hindu.god
45460bd0af
Bug #21531 : EXPORT_SET() doesn't accept args with coercible character sets
...
- Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail
- Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors
2006-08-23 18:02:31 -06:00
cmiller@zippy.cornsilk.net
05df2f9402
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint
2006-08-23 18:37:04 -04:00
cmiller@zippy.cornsilk.net
a4f32ff2e8
String broken up to avoid silly MICROS~1 string-size limit.
2006-08-23 18:29:05 -04:00
tsmith/tim@siva.hindu.god
ade64d467e
Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-08-23 16:28:53 -06:00
tsmith/tim@siva.hindu.god
0831d404e1
Manual merge
2006-08-23 15:46:57 -06:00
tsmith/tim@siva.hindu.god
dba7b8e81c
Bug #20402 : DROP USER failure logged as ERROR rather than WARNING
...
Remove some sql_print_error() calls which were triggered by user error (i.e., not server-level events at all).
Also, convert an sql_print_error -> sql_print_information for a non-error server event.
2006-08-23 15:37:54 -06:00
tsmith/tim@siva.hindu.god
bf8fc6e82a
Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-08-23 13:43:28 -06:00
cmiller@maint1.mysql.com
c640ed93b6
Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908
...
into maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
2006-08-23 19:41:46 +02:00
cmiller@maint1.mysql.com
977e696677
Bug #20908 : Crash if select @@""
...
Zero-length variables caused failures when using the length to look
up the name in a hash. Instead, signal that no zero-length name can
ever be found and that to encounter one is a syntax error.
2006-08-23 19:14:58 +02:00
cmiller@maint1.mysql.com
5572348ba5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
2006-08-23 17:37:18 +02:00
cmiller@zippy.cornsilk.net
73963de637
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/m50-maint-b21224
2006-08-23 10:47:46 -04:00
tnurnberg@salvation.intern.azundris.com
f07937730a
Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411
...
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
2006-08-22 17:27:36 +02:00
tnurnberg@salvation.intern.azundris.com
a74c4c0d4d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
2006-08-22 17:22:46 +02:00
cmiller@zippy.cornsilk.net
34fd70452c
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-22 10:32:07 -04:00
tnurnberg@salvation.intern.azundris.com
10c351b124
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411
2006-08-22 14:31:57 +02:00
tnurnberg@salvation.intern.azundris.com
002adef0e1
Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
...
when X.509 subject was required for a connect, we tested whether it was the right
one, but did not refuse the connexion if not. fixed.
(corrected CS now --replace_results socket-path)
2006-08-22 14:29:48 +02:00
tnurnberg@salvation.intern.azundris.com
0ead4ec836
Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-4.1-maint-20987
...
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
2006-08-22 14:03:52 +02:00
kent@mysql.com/g4-2.local
c8b6563dfc
mysql.spec.sh:
...
Added ndb_error_reporter to the RPM install (bug#20426)
2006-08-22 11:55:08 +02:00
kent@mysql.com/g4-2.local
d210c8cfc3
Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194
...
into mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194
2006-08-22 11:52:26 +02:00
kent@mysql.com/g4-2.local
442c111b72
mysql.spec.sh:
...
Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)
2006-08-22 11:48:58 +02:00
iggy@rolltop.ignatz42.dyndns.org
39a8fe6e44
Bug#21757: mysql_client_test fails in testcase when reading master.log file
2006-08-21 20:29:11 -04:00
msvensson@shellback.(none)
adaa3a2a60
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-21 14:09:38 +02:00
msvensson@shellback.(none)
2b2985e0ea
Print lines from log file to see what's in them
2006-08-21 14:06:59 +02:00
jani@hasky.mysql.fi
6dc1122084
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hasky.mysql.fi:/home/jani/mysql-5.0_bug21537
2006-08-21 13:06:45 +03:00
petr/cps@mysql.com/owlet
30ef47a93c
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2006-08-18 16:48:32 +04:00
tnurnberg@salvation.intern.azundris.com
c8d1c498fb
innodb r702
...
innodb r719
2006-08-18 14:16:11 +02:00
cmiller@zippy.cornsilk.net
64092ca93b
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:55:57 -04:00
cmiller@zippy.cornsilk.net
6998c5140b
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:53:12 -04:00
cmiller@zippy.cornsilk.net
7d38d61398
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:49:56 -04:00
cmiller@zippy.cornsilk.net
030ddb48f3
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:47:23 -04:00
cmiller@zippy.cornsilk.net
c627a6ce84
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
2006-08-17 10:42:50 -04:00
iggy@rolltop.ignatz42.dyndns.org
00ab7be7b9
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
2006-08-16 19:31:33 -04:00
iggy@rolltop.ignatz42.dyndns.org
af844dbed6
manual merge
2006-08-16 19:19:49 -04:00
iggy@rolltop.ignatz42.dyndns.org
ca6532af50
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
2006-08-16 16:16:10 -04:00
msvensson@shellback.(none)
a6a8ea0bc9
Remove duplicate free of "ds_res"
2006-08-16 20:38:33 +02:00
iggy@rolltop.ignatz42.dyndns.org
a86f035a08
Bug#20328 - Correction to test/result for broken Windows build.
2006-08-16 13:55:16 -04:00
jani@ua141d10.elisa.omakaista.fi
88b91d1e02
Fix for bug#21537, "Error at startup"
...
These variables must be defined for Netware, or it fails
to recognize hard paths starting from the device.
2006-08-16 19:30:46 +03:00
rburnett@bk-internal.mysql.com
38a36da86d
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-16 17:47:20 +02:00
msvensson@shellback.(none)
510d5f1401
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 17:37:18 +02:00
reggie@big_geek.
55165b2f55
small fix to enable the test suite to find executables and scripts on Windows
2006-08-16 10:19:48 -05:00
msvensson@shellback.(none)
da60a5194c
Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 17:14:40 +02:00
msvensson@shellback.(none)
98eaa07600
Bug#20328 mysql client: dumb about trailing spaces on 'help' command
...
Fix testcase to also work on windows
2006-08-16 17:03:41 +02:00
rburnett@bk-internal.mysql.com
8baecf7ed6
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-16 16:04:10 +02:00
msvensson@shellback.(none)
27a4154631
Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 15:52:52 +02:00
msvensson@shellback.(none)
b963293595
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-16 15:50:50 +02:00