gluh@gluh.mysql.r18.ru
c6f1e9627a
Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-02-23 20:22:51 +03:00
gluh@gluh.mysql.r18.ru
fc9c20995f
Fix for bug #6572 : SHOW ERRORS doesn't
2005-02-23 20:18:21 +03:00
gluh@gluh.mysql.r18.ru
907c7af3ce
Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-02-23 18:47:00 +03:00
gluh@gluh.mysql.r18.ru
2b5ee94a33
Fix for bug#6317: string function CHAR, parameter is NULL, wrong result
2005-02-23 18:15:45 +03:00
gluh@gluh.mysql.r18.ru
3e9bf3af34
Fix for bug #7217 : information_schema: columns are varbinary() instead of timestamp &
...
bug #7215 : information_schema: columns are longtext instead of varchar
2005-02-23 15:15:36 +03:00
gluh@gluh.mysql.r18.ru
eac72d405f
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-23 12:08:35 +03:00
jimw@mysql.com
41043bb3f5
Merge
2005-02-22 16:39:21 -08:00
lars@mysql.com
e330e2698d
After merge fixes
2005-02-23 00:50:30 +01:00
lars@mysql.com
77f46e9c43
Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0
2005-02-22 23:05:53 +01:00
lars@mysql.com
7271a6014f
Merge 4.1->5.0
2005-02-22 22:40:34 +01:00
jimw@mysql.com
df3c8db4f3
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:14:49 -08:00
sergefp@mysql.com
cdadc990e4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug8397
2005-02-22 21:59:42 +03:00
sergefp@mysql.com
18373b1611
Fix for BUG#8397 (second commit after review):
...
In Item_cache_decimal::store(item) the call item->val_decimal_result()
returns NULL if the passed item has an SQL null value. Don't try copying
NULL into Item_cache_decimal::val in this case.
2005-02-22 21:58:10 +03:00
monty@mysql.com
dcea8122d6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-22 18:31:30 +02:00
monty@mysql.com
ee8c7a3eb5
After merge fixes
2005-02-22 18:30:40 +02:00
serg@serg.mylan
1ca547f5b2
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-22 17:02:16 +01:00
sergefp@mysql.com
1f21ac3cd3
Fix for BUG#8579 (failing test case): Allow small differences in #rows estimate in test results
2005-02-22 18:30:44 +03:00
serg@serg.mylan
8cb554b3c7
merged
2005-02-22 15:31:38 +01:00
serg@serg.mylan
a4dbb3b061
compatibility fixes, crashing tests
2005-02-22 15:22:37 +01:00
monty@mysql.com
e2ea35ec67
Merge with 4.1
2005-02-22 15:47:00 +02:00
gluh@gluh.mysql.r18.ru
c058e25397
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-22 16:39:39 +03:00
lars@mysql.com
c583eb6954
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
2005-02-22 14:17:17 +01:00
monty@mysql.com
7914e24409
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-22 14:43:14 +02:00
bell@51.0.168.192.in-addr.arpa
babcdb6407
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 14:34:59 +02:00
lars@mysql.com
d2ecf8e6a5
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
2005-02-22 13:29:20 +01:00
monty@mysql.com
f55e200248
Fixed compiler warnings
...
Fixed failing myisam.test and rpl_rotate_logs.test on some configurations
2005-02-22 14:15:50 +02:00
bar@mysql.com
89a5530822
A user variable are now always have IMPLICIT coercibility,
...
independently from the expression it is initialized from.
In other words, this change treats a user variable like
a table with one column and one record. Discussed with
PeterG, Serg and Lars. This change also simplifies replication
allowing not to replicate variables' coercibility.
2005-02-22 15:55:40 +04:00
gluh@gluh.mysql.r18.ru
4ea9835455
Fix for bug #7476 : crash on SELECT * FROM INFORMATION_SCHEMA.TABLES(after review)
2005-02-22 14:42:44 +03:00
bell@51.0.168.192.in-addr.arpa
9a9811f3a4
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 13:00:00 +02:00
monty@mysql.com
22a76c1dfb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-02-22 12:51:54 +02:00
monty@mysql.com
e2dc9b4099
Backport my_strntod() from 5.0
...
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740 )
2005-02-22 12:51:23 +02:00
bar@mysql.com
c0230f6f5f
ctype_latin1.result, ctype_latin1.test, charset.c:
...
Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
2005-02-22 09:56:07 +04:00
serg@serg.mylan
178be07aa3
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-22 00:17:56 +01:00
serg@serg.mylan
b43029f4eb
bug#8646 - deadlock if long transaction causes binlog rotate
2005-02-22 00:15:31 +01:00
monty@mysql.com
f5acf0be01
Generate warning in ha_delete_table() if files is missing in handler
2005-02-21 20:41:48 +02:00
lars@mysql.com
5cffeb2b85
BUG#6676: Derivation of user variables should be of derivation "IMPLICIT"
2005-02-21 16:26:04 +01:00
hf@deer.(none)
f7b5ef47b1
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-21 19:23:03 +04:00
hf@deer.(none)
803ed1a116
Tests modified to coved decimal-related code
2005-02-21 19:20:05 +04:00
ramil@mysql.com
d2f8149861
Cleanup.
2005-02-21 18:03:06 +04:00
bar@mysql.com
1bd47888b3
ctype_utf8.result, ctype_utf8.test, ctype-utf8.c:
...
Bugs: #8385 : utf8_general_ci treats cyrillic letters I and SHORT I as the same
2005-02-21 17:17:30 +04:00
ramil@mysql.com
39f497b9dd
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0
2005-02-21 16:53:00 +04:00
ramil@mysql.com
a290359477
A fix (bug #7661 : 'classic' shows different test effects which must be cared for)
...
"create table ta(a bit...) engine=innodb" moved to innodb.test
2005-02-21 16:39:13 +04:00
joreland@mysql.com
a467157878
ndb - ndb_multi - reset query cache at end of test
2005-02-21 11:45:51 +01:00
serg@serg.mylan
5cc794b753
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-20 15:53:40 +01:00
serg@serg.mylan
24dcb103f3
fix rpl_trunc_binlog to test the new behaviour
2005-02-19 22:24:13 +01:00
monty@mysql.com
88d2e2973d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-19 19:00:41 +02:00
monty@mysql.com
218e00ac68
Fixed BUILD script to use --with-berkeley-db instead of --with-bdb
...
Lots of small fixes to multi-precision-math path
Give Note for '123.4e'
Added helper functions type 'val_string_from_real()
Don't give warnings for end space for string2decimal()
Changed storage of values for SP so that we can detect length of argument without strlen()
Changed interface for str2dec() so that we must supple the pointer to the last character in the buffer
2005-02-19 18:58:27 +02:00
jimw@mysql.com
10800c1eb5
Merge mysql.com:/home/jimw/my/mysql-4.1-8475
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-18 15:40:17 -08:00
pem@mysql.com
32a3c16385
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-02-18 17:46:30 +01:00
pem@mysql.comhem.se
a69fc3c03f
Fixed...
...
BUG#6642: Stored procedure crash if expression with set function
BUG#7013: Stored procedure crash if group by ... with rollup
BUG#7743: 'Lost connection to MySQL server during query' on Stored Procedure
BUG#7992: SELECT .. INTO variable .. within Stored Procedure crashes
the server
BUG#8116: calling simple stored procedure twice in a row results
in server crash
Rolling back the item change list after each substatement in a procedure
fixed the failing assert().
2005-02-18 17:39:32 +01:00