7106dcfd06
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
2004-03-16 15:14:11 +02:00
bfc1e46c10
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2885
2004-03-16 17:14:10 +04:00
73e5e0672c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
2004-03-16 15:14:10 +02:00
8d5430ef73
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2709/mysql-4.1
2004-03-16 17:14:09 +04:00
f54827e5d0
Fix for the bug #3118 : Subquery and order by
2004-03-16 16:28:50 +04:00
cdc27d597e
Fix for #233 (final part)
2004-03-16 14:59:22 +04:00
8ba33d7dd3
Fix for bug#2586 Disallow global/session/local as structured var. instance names
2004-03-16 14:01:05 +04:00
75ced0832e
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2885
2004-03-16 12:59:06 +04:00
f6816f32bd
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.0.3067
2004-03-16 11:33:36 +04:00
86211a1b44
Fix for bug #2629 NULLIF() doesn't behave as described in manual
2004-03-16 11:33:03 +04:00
e8a9242893
merge
2004-03-16 08:32:21 +02:00
7ff1a94358
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
2004-03-16 08:18:36 +02:00
ac8c1cc4be
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-fix_fields-4.1
2004-03-16 07:40:11 +02:00
325f661525
Remove not needed patch
2004-03-16 02:59:39 +02:00
37390968e7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-03-16 00:04:05 +02:00
189761bcd3
actions for bug
...
#2709 Affected Rows for ON DUPL. KEY undocumented, perheps illogical
1. added COPY_INFO::updated to work with it in
'insert .. on duplicate' instead of COPY_INFO::deleted
2. added affected rows to output of "info:" in mysqltest.c
2004-03-15 21:36:16 +04:00
8c4b59b72c
update.test:
...
a fix for a test with latest change
2004-03-15 19:17:18 +02:00
c5d4801678
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
2004-03-15 17:41:03 +02:00
9f22beb242
Fix for bug#2972 Problem the the CONV() function
2004-03-15 19:18:30 +04:00
6fc3d9ba81
merge
2004-03-15 17:01:30 +02:00
3e1c841ced
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-fix_fields-4.1
2004-03-15 16:31:41 +02:00
df0ede69fc
Task #835 : additional changes fot str_to_date
2004-03-15 18:28:21 +04:00
9e8938cbae
merge & simple cleanup
2004-03-15 13:21:14 +02:00
d2265b6345
merge
2004-03-15 13:16:40 +02:00
cf66e187e2
Optimizations
2004-03-15 12:53:27 +02:00
ded8fa56eb
my_strtod fixes:
...
sigsegv protection (exp overflow)
don't return inf!
use errno=EOVERFLOW to signal an overflow (as my_strntod uses errno anyway)
if errno will be too slow, my_strtod can be changed to return overflow status in a parameter (like my_strntod does)
2004-03-14 17:25:20 +01:00
283d455711
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_856/mysql-4.1
2004-03-14 01:33:16 +04:00
b3cb4dace5
fixed bug #856 'Naming a key "Primary" causes trouble'
2004-03-14 01:31:30 +04:00
91386f63de
after merge fixes.
2004-03-13 21:22:55 +02:00
5bada5ee99
fixed bug #1427 "enum allows duplicate values in the list"
2004-03-13 23:13:31 +04:00
639f411a82
multi_update.result:
...
Fix for a bug in the result
multi_update.test:
Fix for a bug in the test
2004-03-13 21:06:36 +02:00
158770e356
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2985/mysql-4.0
2004-03-12 17:56:27 +04:00
91a8546112
Portability fixes & fixing of test suite
2004-03-12 09:15:08 +02:00
012ce71c7f
Merge
2004-03-12 01:13:04 +02:00
98fb8ea4c7
Merge with 3.23 to get patch for floor()
2004-03-12 01:12:14 +02:00
e27960a44e
Ensure that install_test_db.sh script works with both 'make install' and 'make_binary_distribution' layouts
...
Abort if we can't allocate memory for table cache
Fix bug with multi-update-tables and BDB tables.
2004-03-12 01:10:22 +02:00
37817f60cc
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-11 22:27:17 +02:00
a86753b00e
multi_update.result:
...
Test case for a #2996 bug fix
multi_update.test:
test case for a #2996 bug fix
sql_select.cc:
Fix for a bug #2996 involving multi-table updates over the const tables
2004-03-11 22:26:03 +02:00
0be2ef688c
merge correcttion in mysql-test/r/mysqldump.result
2004-03-11 22:43:10 +04:00
bb6aee84ef
Merge
2004-03-11 22:01:25 +04:00
69517b22a1
Fix for BUG#2983 "If statement was killed on master, slave errors despite replicate-wild-ignore-t"
...
We introduce a new function mysql_test_parse_for_slave().
If the slave sees that the query got a really bad error on master
(killed e.g.), then it calls this function to know if this query
can be ignored because of replicate-*-table rules (do not worry
about replicate-*-db rules: they are checked so early that they have
no bug). If the answer is yes, it skips the query and continues. If
it's no, then it stops and say "fix your slave data manually" (like it
did before this change).
2004-03-11 17:38:19 +01:00
3c1ba83296
fixed bug #2591 "mysqldump quotas names inconsistently"
2004-03-11 18:46:27 +04:00
0aab3a9eba
a fix (bug #2885 : like datetime)
2004-03-11 18:21:57 +04:00
8dc504a3c5
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
2004-03-10 23:36:22 +04:00
a135907547
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
2004-03-10 23:35:40 +04:00
faa9c92765
fixed BUG #2874 "Grant table bug" and
...
added tests for testing structure of mysql db
2004-03-10 22:54:07 +04:00
4ee44751d9
Fixed memory leak in DROP DATABASE when using RAID tables (Bug #2882 )
2004-03-10 13:46:11 +02:00
cd7ec53dad
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3036
2004-03-10 13:36:20 +04:00
8dcb41d8d9
Fixed Bug#3115. CAST AS DATE with malformed string returns NULL but IS NULL
...
is false.
2004-03-09 22:03:01 +02:00
8ffd9a9190
Fix for the bug #3089 : SUBSTRING bug when mixed with CONCAT and ORDER BY
2004-03-09 16:52:37 +04:00
