msvensson@shellback.(none)
b0754b3d02
Disable testing of "encrypt" in ctype_ucs.test
2006-08-31 11:53:08 +02:00
tsmith@maint2.mysql.com
0af0180468
Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50
...
into maint2.mysql.com:/data/localhome/tsmith/bk/50
2006-08-31 00:01:43 +02:00
tsmith@maint2.mysql.com
b0adc47e86
Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50
...
into maint2.mysql.com:/data/localhome/tsmith/bk/50
2006-08-30 23:46:17 +02:00
tsmith@maint2.mysql.com
d5ee5049be
Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
...
into maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50
2006-08-30 23:14:29 +02:00
tsmith@maint2.mysql.com
e80741b3a5
Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows
2006-08-30 22:39:23 +02:00
tsmith@maint2.mysql.com
843135ae1f
portability fix in BUILD/* for solaris
2006-08-30 21:24:09 +02:00
tsmith@maint2.mysql.com
0da8a4e321
Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/40
...
into maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
2006-08-30 20:04:33 +02:00
msvensson@neptunus.(none)
f35371b9b4
Merge neptunus.(none):/home/msvensson/mysql/bug21813/my50-bug21813
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-30 17:21:22 +02:00
msvensson@neptunus.(none)
9d87db7767
Bug#21813 An attacker has the opportunity to bypass query logging, part2
...
- Use the "%.*b" format when printing prepared and exeuted prepared statements to the log.
- Add test case to check that also prepared statements end up in the query log
Bug#14346 Prepared statements corrupting general log/server memory
- Use "stmt->query" when logging the newly prepared query instead of "packet"
2006-08-30 17:11:00 +02:00
rburnett@bk-internal.mysql.com
001aaedddc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-29 21:15:49 +02:00
kaa@polly.local
61482f3542
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/m50-maint--07OGt
2006-08-29 19:57:52 +04:00
tsmith@maint1.mysql.com
54e73e93d7
minor portability fix in SETUP.sh
2006-08-29 01:13:06 +02:00
iggy@rolltop.ignatz42.dyndns.org
bfe86ca448
Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the information_schema database.
...
init_dumping now accepts a function pointer to the table or view specific init_dumping function. This allows both tables and views to use the init_dumping function.
2006-08-28 17:48:06 -04:00
rburnett@bk-internal.mysql.com
f80ba7a147
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-28 17:56:44 +02:00
timour/tkatchaounov@dl145s.mysql.com
4761ea5c82
Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data/tkatchaounov/autopush/5.0-bug-21456
2006-08-28 16:08:48 +02:00
evgen@moonbone.local
7a55f7fac4
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-mysql
2006-08-27 00:32:14 +04:00
evgen@moonbone.local
13f50fdb69
Merge moonbone.local:/work/tmp_merge-4.1-mysql
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-26 23:11:34 +04:00
evgen@moonbone.local
bafd6d5065
Merge moonbone.local:/work/tmp_merge-5.0-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-mysql
2006-08-26 22:17:34 +04:00
kaa@polly.local
b0619ace21
Post-review fix (bug #21250 )
2006-08-26 10:21:26 +04:00
cmiller@zippy.cornsilk.net
5ea2a01fee
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release_mergable
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-maint
2006-08-25 11:55:43 -04:00
cmiller@zippy.cornsilk.net
89d759b93e
Bug#21543: 5.0.24 breaks ABI compatibility for python bindings: \
...
InterfaceError on connect
Removed the bool flag from the st_mysql_options struct, since it adds
another word in size to the memory size and shifts member memory locations
down, both of which break binary-interface compatibility.
Instead, use a flag, 2**30, in the client_options bit-field to represent
that the client should check the SSL certificate of the server.
2006-08-25 11:54:33 -04:00
kaa@polly.local
17a3c45122
Added stacktrace dumps for x86_64 (bug #21250 )
...
Fixed stacktrace dumps for i386/NPTL
2006-08-25 17:59:47 +04:00
sergefp@mysql.com
46480b22d2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug16255-merge
2006-08-25 14:44:28 +04:00
igor@rurik.mysql.com
d10d5b835d
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-08-25 02:18:30 -07:00
igor@rurik.mysql.com
218a96d2c6
Fixed bug #21390 : wrong estimate of rows after elimination of
...
const tables. This resulted in choosing extremely inefficient
execution plans in same cases when distribution of data in
joined were skewed (see the customer test case for the bug).
2006-08-25 02:17:41 -07:00
evgen@sunlight.local
32cab70cfa
opt_range.cc:
...
Corrected fix for bug#18165
2006-08-25 00:23:42 +04:00
evgen@moonbone.local
7240c97d48
opt_range.cc:
...
Corrected fix for bug#18165
2006-08-24 23:16:54 +04:00
sergefp@mysql.com
84e9cb794f
BUG#16255: Merge to 5.0
2006-08-24 20:56:28 +04:00
iggy@rolltop.ignatz42.dyndns.org
e4bfce3058
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972
2006-08-24 11:19:33 -04:00
sergefp@mysql.com
848548e16f
BUG#16255: Post-review fixes: adjust the testcase.
2006-08-24 19:16:27 +04:00
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
sergefp@mysql.com
d4cacdb5cc
Bug #16255 : Subquery in WHERE (the cset by Georgi Kodinov)
...
Must not use Item_direct_ref in HAVING because it points to
the new value (witch is not yet calculated for the first row).
2006-08-24 19:14:36 +04:00
msvensson@neptunus.(none)
0b3c2aa1b3
Merge neptunus.(none):/home/msvensson/mysql/bug21749/my50-bug21749
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-24 16:46:37 +02:00
msvensson@neptunus.(none)
984e9ce099
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-24 16:08:25 +02: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
msvensson@neptunus.(none)
b25b49a05a
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060612110740|13873
2006-08-24 11:39:52 +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
evgen@sunlight.local
1e9b5cead2
view.result, view.test:
...
Corrected test case for the bug#21261
sql_parse.cc:
Corrected fix for bug#21261
2006-08-24 03:05:13 +04: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