monty@mysql.com
78e828d32f
Review of code pushed since last 5.0 pull:
...
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
2005-10-06 17:54:43 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
01ce8a8aa9
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-12 20:18:49 +03:00
monty@mishka.mysql.com
0965bfa832
Review fixes since last pull
...
Fix for bug #13025 ; Server crash in filesort because wrong call to handler::position()
2005-09-12 18:48:17 +03:00
msvensson@neptunus.(none)
5c8d457ec8
Backport fixes for mysqltest.test from 5.0
2005-09-06 22:03:12 +02:00
msvensson@neptunus.(none)
b39f23d2b7
Bug #12984 mysqltest.test: different output from "exec NonExistsinfComamdn"
...
- Common error handling regardless of --ps-protocol or not.
2005-09-06 15:41:13 +02:00
msvensson@neptunus.(none)
9c1c075da1
Detect comment with command using extra delimiter
2005-09-06 12:33:36 +02:00
msvensson@neptunus.(none)
acd68dbf41
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
2005-09-05 17:03:25 +02:00
msvensson@neptunus.(none)
7f848c1784
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
2005-09-05 17:01:15 +02:00
msvensson@neptunus.(none)
e21d8c50bf
Merge neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
2005-09-05 16:51:31 +02:00
msvensson@neptunus.(none)
72228ea825
Bug#12959 mysqltest crashes if testcase passed with -x option
2005-09-05 16:50:32 +02:00
jimw@mysql.com
3be42aabc5
Merge mysql.com:/home/jimw/my/mysql-5.0-11787
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-03 09:34:34 -07:00
joerg@mysql.com
ed093d581a
Compile error fix.
2005-09-02 20:07:08 +02:00
msvensson@neptunus.(none)
1026fa2fe3
Fix for spelling miss and eol junk
2005-09-01 20:02:08 +02:00
msvensson@neptunus.(none)
28f529d91f
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
2005-09-01 17:21:03 +02:00
msvensson@neptunus.(none)
305dc01078
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
2005-09-01 17:15:37 +02:00
msvensson@neptunus.(none)
4b47ebcfc9
mysqltest improvements, updates after merge + test for 5.0
2005-09-01 17:01:23 +02:00
msvensson@neptunus.(none)
61be2a143d
Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
...
into neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
2005-09-01 12:53:23 +02:00
msvensson@neptunus.(none)
8c0f7f82d9
Bug #11286 yassl incompatible with "load data infile"
...
- Make sure that mysqltest always uses ssl when connecting to the server.
- Pass a i32-bit int variable as argument to FIONREAD ioctl.
2005-09-01 11:46:43 +02:00
msvensson@neptunus.(none)
72b08b7e57
Fix compiler warnings for mysqltest.c
2005-09-01 11:11:10 +02:00
msvensson@neptunus.(none)
ced32517c7
Bug #3131 mysqltest fails on $2=$1 assignment in test
2005-09-01 10:53:33 +02:00
msvensson@neptunus.(none)
906f7c4481
Bug #12471 mysqltest, --error within loop affects wrong statement
...
- Move clearing of expected errors
2005-09-01 09:34:40 +02:00
msvensson@neptunus.(none)
d692f0c045
Remove syntax !$<err_no> to set an expected error code
...
Use !<err_no> instead
2005-08-31 18:10:26 +02:00
msvensson@neptunus.(none)
2fc6ef3a40
BUG#11316: mysqltest, problems when assigning value with '#' to $variable
...
- Add stricter checking of syntax in mysqltest
2005-08-31 17:16:05 +02:00
msvensson@neptunus.(none)
9ed35f83fa
BUG#10267 mysqltest, wrong number of loops when a script is sourced within a loop
2005-08-16 17:10:52 +02:00
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
msvensson@neptunus.(none)
447a119407
BUG#11316 mysqltest, problems when assigning value with '#' to $variable
...
- Fixed problem, only detect comment if the # is on start of line AND starting line of the current command.
- Wrote tests for most of the mysqltest commands, added stricter checking of correct syntax.
2005-07-15 17:51:43 +02:00
jimw@mysql.com
bef1c77789
Make it possible to change reconnect setting with
...
mysql_options(..., MYSQL_OPT_RECONNECT, ...). (Bug #11787 )
2005-07-06 16:29:31 -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