msvensson@pilot.(none)
179cd4e016
Merge 192.168.0.7:mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-08 18:03:56 +02:00
msvensson@shellback.(none)
6d2f738ff9
Don't require a space between "if" and "(". This should
...
also fix "while" and "connect"
It's now possible to write "if("
2007-08-08 18:03:44 +02:00
msvensson@pilot.(none)
24666e55cf
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-08 16:49:15 +02:00
msvensson@pilot.(none)
a2f59d74f4
Merge 192.168.0.7:mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-08 16:47:35 +02:00
msvensson@shellback.(none)
87f81bce4e
Remove extra newline added to files created by write_file and append_file
2007-08-08 16:44:01 +02:00
msvensson@pilot.(none)
a5eab2c65f
Remove file before writing to it.
2007-08-08 16:39:13 +02:00
gni@dev3-221.dev.cn.tlan
794f6b17e1
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240
2007-08-08 20:12:05 +08:00
kostja@bodhi.(none)
3ecef8c0b9
A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due to loaded system
2007-08-08 15:49:19 +04:00
msvensson@pilot.(none)
5e4b4ca6ab
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-08 10:05:09 +02:00
msvensson@pilot.(none)
912aad3b2e
Improve comments and log messages in lib/mtr_timer.pl
2007-08-08 10:04:26 +02:00
kostja@bodhi.(none)
28f1f1828d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-08 11:36:55 +04:00
kostja@bodhi.(none)
3c6eb0002d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-08-08 11:34:35 +04:00
lzhou/zhl@dev3-63.(none)
cbe2a3c780
BUG#29674 Restore/backup are endian compatible in 5.0
2007-08-07 18:07:57 +00:00
msvensson@pilot.(none)
59bebf2904
Bug#26793 mysqld crashes when doing specific query on information_schema
...
- Drop the newly created user user1@localhost
- Cleanup testcase
2007-08-07 19:16:06 +02:00
bar@bar.myoffice.izhnet.ru
2be7a90a9a
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875v2
...
into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
2007-08-07 19:30:23 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
7269c6cc6c
Reversing additional change suggested by Serg
...
under terms of bug#28875 for better performance.
The change appeared to require more changes in item_cmpfunc.cc,
which is dangerous in 5.0.
Conversion between a latin1 column and an ascii string constant
stopped to work.
2007-08-07 19:25:45 +05:00
cmiller@zippy.cornsilk.net
cdc03f7a19
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-08-07 06:53:40 -04:00
cmiller@zippy.cornsilk.net
c2df7e082a
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my50-bug27562
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-08-07 06:52:34 -04:00
cmiller@zippy.cornsilk.net
da83da434c
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my51-bug27562
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-08-07 06:49:58 -04:00
cmiller@zippy.cornsilk.net
e0139d23d9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-08-07 06:48:46 -04:00
cmiller@zippy.cornsilk.net
1380fb167d
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my50-bug27562
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my51-bug27562
2007-08-07 06:22:52 -04:00
msvensson@pilot.(none)
a7ba7109c7
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-07 12:15:19 +02:00
msvensson@pilot.(none)
7c0341376d
Merge 192.168.0.7:mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-07 11:58:00 +02:00
msvensson@pilot.(none)
66b74f6a33
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-07 11:42:14 +02:00
msvensson@pilot.(none)
f785bf00de
Bug#20037 mysqltest requires cygwin on windows(part 1, new mysqltest commands)
...
- Update comments
- Make "write_file" fail if file already exist
- Remove temporary files created by test cases
2007-08-07 11:40:03 +02:00
cmiller@zippy.cornsilk.net
0221888e39
Bug#27562: ascii.xml invalid?
...
Two character mappings were way off (backtick and tilde were "E"
and "Y"!), and three others were slightly rotated. The first
would cause collisions, and the latter was probably benign.
Now, assign the character mappings exactly to their normal values.
2007-08-07 05:35:20 -04:00
omer@linux.site
36ff199535
Updated funcs_1 test and result files (not including cluster) for 5.1.21
2007-08-06 18:46:00 -07:00
tsmith@ramayana.hindu.god
2073c488af
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-06 16:34:30 -06:00
skozlov/ksm@virtop.localdomain
48c5305808
Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
2007-08-06 21:41:13 +04:00
gkodinov/kgeorge@magare.gmz
0ac8d08959
Bug 29536 : error message changed 5.0-opt -> 5.1-opt
2007-08-06 06:55:50 -07:00
gkodinov/kgeorge@magare.gmz
5068ebc1c5
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B29536-5.0-opt
2007-08-06 06:37:05 -07:00
gkodinov/kgeorge@magare.gmz
5af5954ab5
Merge magare.gmz:/home/kgeorge/mysql/work/B29536-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B29536-5.1-opt
2007-08-06 06:34:21 -07:00
msvensson@pilot.(none)
35503e7678
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-06 15:14:11 +02:00
cmiller@zippy.cornsilk.net
869da2dd55
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-08-06 08:17:49 -04:00
gkodinov/kgeorge@magare.gmz
117c3ff9d7
Bug #29536 : timestamp inconsistent in replication around 1970
...
MySQL replicates the time zone only when operations that involve
it are performed. This is controlled by a flag. But this flag
is set only on successful operation.
The flag must be set also when there is an error that involves
a timezone (so the master would replicate the error to the slaves).
Fixed by moving the setting of the flag before the operation
(so it apples to errors as well).
2007-08-06 04:57:28 -07:00
msvensson@shellback.(none)
b8a2161673
Remove NOT_YET code
...
Update comments
Add more tests for "let from query"
2007-08-06 11:20:36 +02:00
igor@olga.mysql.com
46c29c8797
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.1-opt
2007-08-06 01:08:28 -07:00
igor@olga.mysql.com
b8e85da37b
Removed a query from the test case for bug 39219 that displayed in valgrind
...
a problem for BIT type values different from the one reported for the bug.
2007-08-06 01:01:22 -07:00
msvensson@shellback.(none)
5fdd29e3d1
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-08-06 09:41:24 +02:00
igor@olga.mysql.com
676c5ef471
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug30219
2007-08-05 18:39:12 -07:00
dkatz@damien-katzs-computer.local
a933f28a93
Bug #29804 UDF parameters don't contain correct string length
...
Previously, UDF *_init functions were passed constant strings with erroneous lengths.
The length came from the containing variable's size, not the length of the value itself.
Now the *_init functions get the constant as a null terminated string with the correct
length supplied.
2007-08-05 21:37:55 -04:00
kent@kent-amd64.(none)
0065e85e32
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
...
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-06 01:35:43 +02:00
kent@mysql.com/kent-amd64.(none)
6ab4112c37
mysql-test-run.pl:
...
Search "relwithdebinfo" directory in CMake Visual Studio build
Search for "mysqld-debug" even in source tree
2007-08-06 01:29:53 +02:00
igor@olga.mysql.com
a8debc6503
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30219
2007-08-05 14:21:36 -07:00
igor@olga.mysql.com
5f6df1b232
Fix bug #30219 .
...
This bug manifested itself for queries with grouping by columns of
the BIT type. It led to wrong comparisons of bit-field values and
wrong result sets.
Bit-field values never cannot be compared as binary values. Yet
the class Field_bit had an implementation of the cmp method that
compared bit-fields values as binary values.
Also the get_image and set_image methods of the base class Field
cannot be used for objects of the Field_bit class.
Now these methods are declared as virtual and specific implementations
of the methods are provided for the class Field_bit.
2007-08-05 14:16:49 -07:00
gkodinov/kgeorge@magare.gmz
e53af13d1e
rpl_row_tabledefs_2myisam.result:
...
merged 5.1-main to 5.1-opt : error numbers changed.
Many files:
merged 5.1-main to 5.1-opt : error numbers changed
rpl_extraCol_innodb.result:
merged 5.1-main to 5.1-opt : error numbers changed
2007-08-05 14:02:33 +03:00
dlenev@mockturtle.local
c3e3a5e188
Added test for bug #21281 "Pending write lock is incorrectly removed
...
when its statement being KILLed". The bug itself was fixed by separate
patch in 5.0 tree.
2007-08-05 13:55:37 +04:00
dlenev@mockturtle.local
ec2aeb4fae
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21281
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg21281-2
2007-08-05 13:26:10 +04:00
igor@olga.mysql.com
a5e4e70100
Merge olga.mysql.com:/home/igor/mysql-5.1
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge
2007-08-04 22:36:54 -07:00
igor@olga.mysql.com
d9373125e1
Merge olga.mysql.com:/home/igor/mysql-5.0
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-merge
2007-08-04 20:53:26 -07:00