matthias@three.local.lan
beec94f0bf
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-11-18 10:01:18 +01:00
serg@serg.mylan
c7532a698d
merged
2004-11-17 20:07:13 +01:00
serg@serg.mylan
e68bd85b77
merged
2004-11-17 18:04:36 +01:00
serg@serg.mylan
19067008b8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-17 17:54:15 +01:00
guilhem@mysql.com
f04832b52d
time independent test
2004-11-17 17:06:24 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
8c0d21d186
WL#638 - Fix precedence for parsing NOT ... LIKE expression s
...
Rework parser expression rules
Rework handling for "||" concat/or
Eliminate some shift/reduce conflicts
Add support for "xxx IS [ NOT ] truth_value"
2004-11-17 15:49:10 +00:00
gluh@gluh.mysql.r18.ru
a288f3b3e1
Fix for Auto_increment filed value in 'show table status'
...
code cleanup
2004-11-17 18:48:12 +03:00
guilhem@mysql.com
d34421c127
Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code.
...
Moving the part of user_var.test using UCS2 to ctype_ucs.test
2004-11-17 16:41:30 +01:00
serg@serg.mylan
37e872de8c
merged
2004-11-17 15:28:37 +01:00
serg@serg.mylan
2d8c21f700
test for bug#5528
2004-11-17 13:38:35 +01:00
matthias@three.local.lan
525d524bd5
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-11-17 10:40:50 +01:00
bell@sanja.is.com.ua
d5b21d03a5
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1
2004-11-17 10:59:04 +02:00
igor@rurik.mysql.com
078597564d
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2004-11-16 15:07:49 -08:00
igor@rurik.mysql.com
e17073c4a2
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-11-16 14:01:40 -08:00
igor@rurik.mysql.com
9edff6c591
key_cache.result, key_cache.test:
...
Added a test case for bug #6447 .
mf_keycache.c:
Fixed bug #6447 . Erronious code in the key_cache_read function
caused problems when reading key blocks with offset>0 into
key cache. The code of key_cache_insert and key_cache_write
was modified similarly.
2004-11-16 13:58:49 -08:00
bell@sanja.is.com.ua
bc5a9111d7
backport Serg's fix of FT interface (BUG#6523)
2004-11-16 22:58:02 +02:00
sergefp@mysql.com
1cc999fbd4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
2004-11-16 21:36:31 +03:00
matthias@three.local.lan
d94d8e5869
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-11-16 14:56:26 +01:00
ram@gw.mysql.r18.ru
dde88ea82b
A fix (bug #6449 : DO server-crashing bug).
2004-11-16 14:36:25 +04:00
matthias@three.local.lan
f12d74b958
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-11-16 11:25:05 +01:00
bar@mysql.com
629f1bb616
Bug #6552 CHAR column w/o length is legal, BINARY w/o length is not
2004-11-16 12:05:13 +04:00
guilhem@mysql.com
e38dae0bc1
Merge
2004-11-16 00:04:12 +01:00
bell@sanja.is.com.ua
27395a2fb1
fixed joincleunup to avoid double deletin tables, and too earlyfull cleanup in case of EXPLAIN
...
fixed cleunup of TMP_TABLE_PARAM
(BUG#6406)
2004-11-16 00:16:04 +02:00
matthias@three.local.lan
d1453f93ad
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-11-15 22:42:53 +01:00
serg@serg.mylan
87840e841c
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-15 19:27:06 +01:00
bar@mysql.com
8a2ef0a2ca
Bug#6608: MySQL server crash in some query with tis620 character set.
...
The bug was that the function allocates 'a', then changes the value
of 'a' with the operator ++, and then tries to free 'a'!
2004-11-15 21:26:16 +04:00
gluh@gluh.mysql.r18.ru
c67d479918
Fixes for information_schema
2004-11-15 19:20:45 +03:00
lars@mysql.com
b7cfe5ecad
BUG#6353 V2:
...
Replication using replicate-rewrite-db did not work for LOAD DATA INFILE.
Now is does. There was one place in the code that used current database
instead of the rewrite database.
2004-11-15 17:03:54 +01:00
dlenev@mysql.com
5ddc564d89
Proposed fix for bug #6439 "from_unixtime() function returns wrong datetime
...
values for too big argument".
Added range checking for from_unixtime() argument, cleaned up code
a bit.
2004-11-15 16:11:13 +03:00
dlenev@brandersnatch.localdomain
b02f5aa692
Fix for bug #6266 "Invalid DATETIME value is not handled properly".
...
In server we assume that datetime values stored in MYSQL_TIME struct
are normalized (and year is not greater than 9999), so we should
perform range checks in all places then we convert something to
MYSQL_TIME.
2004-11-15 15:44:29 +03:00
bell@sanja.is.com.ua
77540c8996
moved procedure list initialization (BUG#6517)
2004-11-15 14:37:40 +02:00
matthias@three.local.lan
bc8b00ec7a
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-11-15 09:10:27 +01:00
bell@sanja.is.com.ua
d76db8b999
marge
2004-11-13 19:45:36 +02:00
bell@sanja.is.com.ua
7210195f1e
now my_printf_error is not better then my_error, but my_error call is shorter
...
used only one implementation of format parser of (printf)
fixed multistatement
2004-11-13 19:35:51 +02:00
gluh@gluh.mysql.r18.ru
321f803784
WL#1629: SHOW with WHERE(partially) &
...
WL#173: Create Data Dictionary Tables for SHOW Commands
2004-11-13 13:56:39 +03:00
monty@mysql.com
63da075081
Merge with 4.1 to get latest fix to client_test.c
2004-11-12 21:27:52 +02:00
jani@ua141d10.elisa.omakaista.fi
fe0b00985f
Merge with 4.0
2004-11-12 20:38:58 +02:00
monty@mysql.com
addd1a0da8
Merge with 4.1
2004-11-12 19:58:24 +02:00
monty@mysql.com
e9c3887b58
After merge fixes
2004-11-12 17:44:17 +02:00
dlenev@mysql.com
18f033b771
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg5890
2004-11-12 17:21:24 +03:00
dlenev@brandersnatch.localdomain
e7a2466024
Fix for bug #5890 "Triggers fail for DELETE without WHERE".
...
If we have DELETE with always true WHERE clause we should not use
optimized delete_all_rows() method for tables with DELETE triggers,
because in this case we will lose side-effect of deletion.
2004-11-12 17:04:07 +03:00
bell@sanja.is.com.ua
1555469b64
merge
2004-11-12 15:36:31 +02:00
bell@sanja.is.com.ua
31f7811183
post-review fixes
2004-11-12 14:34:00 +02:00
monty@mysql.com
9252656d49
merge with 4.0
2004-11-12 11:17:53 +02:00
ram@gw.mysql.r18.ru
77fe1baf1d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6564
2004-11-12 12:38:07 +04:00
brian@avenger.(none)
f05daf02ba
Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
2004-11-11 18:58:57 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
2ad7d5c662
Bug#6123 - GRANT USAGE creates useless mysql.db row
...
Prevent creation of a row which grants no rights
Test included
2004-11-11 20:59:03 +00:00
bell@sanja.is.com.ua
0ef0b030a5
merge
2004-11-11 21:18:10 +02:00
mleich@mysql.com
3c0a2c0f31
Result of
...
WL#2225 Extend the test cases for PS + develop a basic test routine for PS
The basic test routine
mysql-test/include/patchwork-check.inc
Test cases for the the basic test routine
mysql-test/t/tool_test.test
mysql-test/r/tool_test.result
Test cases for prepared statements with functions
mysql-test/t/ps_12func.test
mysql-test/r/ps_12func.result
Some statements are set to comment, because of open bugs.
Fresh MySQL V4.1 and V5.0 souces produce in the moment (~11-Nov-2004) the
same result files.
2004-11-11 20:12:12 +01:00
ram@gw.mysql.r18.ru
98df9313c0
A fix (bug #6564 : QUOTE(NULL) returns NULL, not the string 'NULL')
2004-11-11 18:20:40 +04:00