acurtis@xiphis.org
b9476f7d50
Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
...
into xiphis.org:/usr/home/antony/work2/merge-5.0
2005-08-11 12:18:53 +01:00
jimw@mysql.com
de46ae18c2
Merge mysql.com:/home/jimw/my/mysql-5.0-11602
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-02 16:50:12 -07:00
monty@mishka.local
8437e9c1be
Fixes during review of new pushed code
...
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
2005-07-31 12:49:55 +03:00
monty@mysql.com
987edeaa9b
Fixed compiler warnings
2005-07-28 21:25:05 +03:00
jimw@mysql.com
0536bd6679
Increase allowed size of stored procedure bodies to 4GB, and
...
produce a sensible error when that limit is exceeded. (Bug #11602 )
2005-07-26 18:08:49 -07:00
konstantin@mysql.com
52b8928b09
Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
...
into mysql.com:/home/kostja/mysql/mysql-5.0-merge
2005-07-19 00:55:37 +04:00
jimw@mysql.com
eb785d70b8
Fix error in formatting metadata in mysqltest.
2005-07-15 12:31:57 -07:00
monty@mysql.com
86d7b02199
Merge with 4.1
2005-07-03 14:17:52 +03:00
msvensson@neptunus.(none)
ead7b076dc
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-07-01 15:40:42 +02:00
msvensson@neptunus.(none)
11d3c28575
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-07-01 15:40:29 +02:00
msvensson@neptunus.(none)
9613c434e0
Win port fixes
2005-07-01 15:39:36 +02:00
pem@mysql.comhem.se
6fd1e8227e
Fixed compiler errors (i.e. changed C++-isms into C)
2005-06-29 14:23:43 +02:00
monty@mishka.local
7398252d02
Portability fixes
...
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
2005-06-27 20:31:00 +03:00
msvensson@neptunus.(none)
7d42249bf1
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 15:14:23 +02:00
msvensson@neptunus.(none)
87d681c7bb
Include <sys/wait.h> to get WEXITSTATUS
2005-06-27 15:11:40 +02:00
msvensson@neptunus.(none)
5e703ebbbb
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 15:02:39 +02:00
msvensson@neptunus.(none)
f8472c0e49
Add "#include <stdlib.h>" to define WEXITSTATUS
2005-06-27 15:01:49 +02:00
msvensson@neptunus.(none)
85b9ffc4ca
Merged from mysql-4.1 to mysql-5.0
2005-06-22 14:10:02 +02:00
msvensson@neptunus.(none)
ddeaf342a7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-21 14:24:13 +02:00
msvensson@neptunus.(none)[msvensson]
39636f48f0
patch
2005-06-21 14:19:56 +02:00
lars@mysql.com
41d1c094b6
Fix of 5.0 tree
2005-06-17 14:03:27 +02:00
lars@mysql.com
869882f321
WL#2076: Added if(...) construct to mysqltest
...
Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
2005-06-16 16:56:03 +02:00
reggie@monster.
4283fdb170
fixes for compiler warnings from VC6
2005-06-06 11:34:52 -05:00
jimw@mysql.com
b2b9485a94
Merge mysql.com:/home/jimw/my/mysql-5.0-10251
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-17 16:59:39 -07:00
kent@mysql.com
24b34fa9fe
Merge
2005-05-16 01:25:14 +02:00
kent@mysql.com
b076cdb208
mysqltest.c:
...
To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings
2005-05-16 01:08:42 +02:00
kent@mysql.com
6374bfeb61
mysqltest.c:
...
To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
In cleanup, remove possible soft link to var directory
2005-05-15 20:38:54 +02:00
kent@mysql.com
bd70ce726b
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 07:06:47 +02:00
kent@mysql.com
221b1ccae8
mysqltest.c, mysql-test-run.sh:
...
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
Use Purify suppress file
2005-05-15 06:59:34 +02:00
jimw@mysql.com
ff2d0938dd
Support quoted identifiers containing single and double quotes in
...
mysqltest. (Bug #10251 )
2005-05-06 05:48:46 -07:00
ramil@mysql.com
9f440d2b20
Merge mysql.com:/usr/home/ram/work/mysql-4.1
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-04-14 16:39:42 +05:00
ramil@mysql.com
a835045b8f
Merge mysql.com:/usr/home/ram/work/mysql-4.0
...
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-04-14 16:26:39 +05:00
ramil@mysql.com
c7a6c8de06
In order not to conflict with a Linux kernel header
...
set_bit replaced with internal_set_bit,
clear_bit replaced with internal_clear_bit.
2005-04-14 11:13:08 +05:00
monty@mysql.com
780202f130
Moved some old test and added a new test to only be run with mysql-test-run --big
...
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files
2005-04-07 19:24:14 +03:00
jimw@mysql.com
bb215f648b
Merge
2005-04-04 23:03:56 -07:00
jimw@mysql.com
1f1c44779a
Merge mysql.com:/home/jimw/my/mysql-4.1-8866
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 18:26:39 -07:00
pekka@mysql.com
727015dbb3
Merge
2005-03-28 23:06:19 +02:00
jimw@mysql.com
9c86b35194
Fix reconnect when using prepared statements, and add
...
--disable_reconnect and --enable_reconnect to mysqltest
so that it can be tested properly. (Bug #8866 )
2005-03-28 09:59:41 -08:00
serg@serg.mylan
f21f8f983f
client/mysqltest.c
...
corrected number of fields for --enable_metadata
sql/sql_union.cc
fixed a apparent typo in assert
2005-03-23 20:38:42 +01:00
dlenev@brandersnatch.localdomain
c87912c8da
Fix for spurious failures of sp.test on many platforms (aka Bug #9161
...
"Warnings on 'drop procedure' platform-specific").
In mysqltest we should not issue "SHOW WARNINGS" until we have not
read results from all statements in multi-statement.
Otherwise such "SHOW WARNINGS" will either cause "Packets out of order"
error and thus will ruin current connection (but we may not notice this as
it happened in sp.test because we ignore errors from such auxilary
SHOW WARNINGS and use auto-reconnecting connections) or will
succeed but consume first packet from next statement in multi-statement
sequence (this happens if "SHOW WARNINGS" is issued when this packet
is already received by client. Packet is thrown away by net_clear()
call which is issued when "SHOW WARNINGS" is sent to server).
In our case sp.test failed because usually we had first situation
but sometimes second situation occured causing warning to pop-up.
2005-03-20 20:29:03 +03:00
jimw@mysql.com
1055e52575
Fix failure in 'kill' test due to change of default
...
reconnect setting in mysql client library. (Bug #8866 )
2005-03-16 17:13:45 -08:00
monty@mysql.com
410e51c854
Fixed failing test cases 'row.test' when running with --ps-protocol
...
Simple optimzations done while reviewing code
2005-02-15 16:45:00 +02:00
monty@mysql.com
a1a39fab84
Merge with 4.1
2005-02-10 02:27:37 +02:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb
Applied a patch for Netware.
2005-02-08 19:49:40 +02:00
serg@serg.mylan
c76405a7ee
merged
2005-01-24 19:41:42 +01:00
serg@serg.mylan
67ba2e367a
fixes/cleanups according to Coverity report
2005-01-24 15:48:25 +01:00
jani@ua141d10.elisa.omakaista.fi
625ae2c5a0
Added possibility to use --error <name> instead of --error <number>
...
The old syntax works as well. WL#2356.
2005-01-18 20:16:21 +02:00
jani@ua141d10.elisa.omakaista.fi
f3e73e26d7
A patch for Netware.
2005-01-13 19:24:54 +02:00
wax@kishkin.ru
9d5fc07494
WL#964
...
move my_end() after free_used_memory()
2005-01-02 19:58:49 +05:00
dlenev@mysql.com
536cb92195
Manual merge.
2004-12-31 12:48:27 +03:00
