Commit graph

1370 commits

Author SHA1 Message Date
patg@radha.local
f41aa04b59 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
2005-09-10 01:50:38 +02:00
patg@radha.local
15bbf4d215 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
2005-09-09 21:03:11 +02:00
patg@radha.local
06d1582b98 BUG #12597 This is a complete patch (2nd) containing fixes per Serg's review 2005-09-09 00:03:07 +02:00
patg@radha.local
4171c7435a Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
2005-09-08 22:29:13 +02:00
patg@radha.local
4cb63e6b8b BUG #9056 Changes to patch #2 per Serg's review 2005-09-08 19:45:25 +02:00
hartmut@mysql.com
052e9262ee Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-09-08 00:57:02 +02:00
hartmut@mysql.com
1e1872464b Merge mysql.com:/home/hartmut/projects/mysql/dev/4.0
into  mysql.com:/home/hartmut/projects/mysql/dev/4.1
2005-09-08 00:50:03 +02: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
patg@radha.local
953dda0673 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
2005-09-04 01:37:52 +02:00
patg@radha.local
03183c70c0 BUG #9056 Added --routines flag to mysqldump to enable mysqldump to be able
to dump PROCEDURES and FUNCTIONS.
2005-09-04 01:34:58 +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
hartmut@mysql.com
14485e71c2 fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX 2005-09-02 22:52:52 +02: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)
68778715ae Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug11286/my50-bug11286
2005-09-01 14:47:06 +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
jimw@mysql.com
25adba36b1 Merge mysql.com:/home/jimw/my/mysql-5.0-11523
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-29 10:02:23 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6 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-08-26 15:56:52 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 12:08:26 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0 Several fixes for Netware. 2005-08-24 22:03:34 +03: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
serg@sergbook.mysql.com
2870638ef2 client/mysql.cc
mysql default port cleanup (it's set in libmysql.c, NOT in my_getopt)
configure.in
    autoconf 2.52 is enough to build mysql-5.0
2005-08-14 14:06:47 +02:00
bar@mysql.com
1b50f35ab2 Merge mysql.com:/usr/home/bar/mysql-4.1.b12351
into  mysql.com:/usr/home/bar/mysql-5.0
2005-08-12 17:10:00 +05: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
patg@radha.local
8c83f14b76 BUG #12253. Fixed logic the prevented repair when "--fast" was included
in invoking mysqlcheck.
2005-08-10 23:37:17 +02:00
jimw@mysql.com
397cef9413 Fix 'source' command in mysql client to handle delimiter command
in sourced file properly. (Bug #11523)
2005-08-09 12:17:28 -07:00
monty@mysql.com
7b1aed3fba Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2005-08-09 00:15:27 +03:00
patg@krsna.patg.net
74c7168992 BUG #12119
Removed unnecessary error message from mysql.cc (client program)
2005-08-08 13:50:10 -07:00
konstantin@mysql.com
85e9801651 Fix gcc -ansi -pedantic compilation failure. 2005-08-05 11:10:51 +04: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
7f845036c0 After merge fixes
Review of new pushed code
2005-07-31 22:56:24 +03:00
monty@mishka.local
e73d6c25fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-07-31 12:56:02 +03: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
bell@sanja.is.com.ua
36f250a240 Added sql_mode saving to mysql_dump (BUG#5891, part 2) 2005-07-29 23:39:08 +03:00
monty@mysql.com
987edeaa9b Fixed compiler warnings 2005-07-28 21:25:05 +03:00