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
msvensson@neptunus.(none)
1026fa2fe3
Fix for spelling miss and eol junk
2005-09-01 20:02:08 +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
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
patg@radha.local
8d671d7bca
Applied and tested this patch successfully (bug 10431) to a clean
...
tree on brian's amd 64 box (which was already approved).
[patg@zim mysql-5.0]$ bk changes
ChangeSet@1.1882 , 2005-07-21 18:43:55+05:00, gluh@eagle.intranet.mysql.r18.ru
merge fix
Was the changeset level I applied this patch to.
Master shutdown finished
Slave shutdown finished
All 326 tests were successful.
[patg@zim mysql-5.0]$
2005-07-22 04:11:45 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
0f7639ba15
Added some missing casts and changed a define for alloca().
2005-07-20 13:27:57 +03: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
monty@mishka.local
2278e0319c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc
Cleanups during review
...
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
2005-07-18 15:33:18 +03: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
kent@mysql.com
ca420edc21
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-07-06 00:15:55 +02:00
kent@mysql.com
8e3b393d5c
Merge
2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a
Makefile.am:
...
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
mats@mysql.com
0449ee1ca8
Merging 4.1 into 5.0
2005-07-05 16:02:03 +02:00
monty@mysql.com
86d7b02199
Merge with 4.1
2005-07-03 14:17:52 +03:00
lars@mysql.com
02d0fdf470
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b11678-mysql-4.1
2005-07-01 16:13:05 +02: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
lars@mysql.com
4120003926
BUG#11678: mysqldump --master-data should fail if master binlog disabled
2005-07-01 12:01:00 +02:00