bar@mysql.com
252ed3a24c
sp_head.cc:
...
Fix crash reported in bug 12849.
It doesn't fix the whole problem though.
Let Pem fix it later.
2005-09-02 10:35:51 +05:00
msvensson@neptunus.(none)
1026fa2fe3
Fix for spelling miss and eol junk
2005-09-01 20:02:08 +02:00
msvensson@neptunus.(none)
544273f9e8
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-01 17:29:49 +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)
9782004002
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-01 14:49:11 +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
kent@mysql.com
b6889a4e72
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-09-01 14:45:39 +02:00
kent@mysql.com
1a5f346bf9
mtr_process.pl:
...
Make sure mtr_kill_processes() is called with an array ref
Corrected error string for STDERR redirect
2005-09-01 14:32:42 +02:00
pekka@mysql.com
d78eee0376
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/export/space/pekka/ndb/version/my50
2005-09-01 14:23:46 +02:00
pekka@mysql.com
cf626c2000
ndb - fix ha_ndb crash on ordered index on nullable varchar
2005-09-01 14:12:48 +02:00
msvensson@neptunus.(none)
e6b282d9f8
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
2005-09-01 14:09:23 +02:00
msvensson@neptunus.(none)
6fb7881f06
Bug #12717 yassl: Crashes in "integer.cpp" when compiled with icc
...
- Temporary fix, disable x86 assembler.
2005-09-01 14:07:45 +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)
211b78b6ee
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-01 09:05:45 +02:00
msvensson@neptunus.(none)
4b5ca92631
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-01 09:01:15 +02:00
jimw@mysql.com
d6db387aea
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 19:12:16 -07:00
jimw@mysql.com
c3f4ecb544
Merge mysql.com:/home/jimw/my/mysql-4.1-7156
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-31 18:34:16 -07:00
jimw@mysql.com
0ebf1576dc
Merge mysql.com:/home/jimw/my/mysql-4.1-12325
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-31 18:32:45 -07:00
jimw@mysql.com
00b17c1c17
Fix handling of filenames that start the same as reserved filenames
...
on Windows. (Bug #12325 )
2005-08-31 18:32:15 -07:00
jimw@mysql.com
1d997477aa
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 15:24:06 -07:00
tomas@poseidon.ndb.mysql.com
e0f3c5c0fb
Bug #12043 , do not core on misconfig unless debug compiled
2005-09-01 00:13:01 +02:00
tomas@poseidon.ndb.mysql.com
29dc269678
Bug#12833 corrected parsing of CLUSTERLOG command in ndb_mgm
2005-08-31 23:56:02 +02:00
tomas@poseidon.ndb.mysql.com
f1b97218f1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-31 23:31:02 +02:00
tomas@poseidon.ndb.mysql.com
ce91c0f1c8
added make of ndb sys file printer
2005-08-31 23:24:50 +02:00
evgen@moonbone.local
c23c1dc314
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/12861-bug-4.1-mysql
2005-09-01 01:08:59 +04:00
tomas@poseidon.ndb.mysql.com
9a91368997
improved the ndb redo log reader
2005-08-31 23:08:58 +02:00
evgen@moonbone.local
41fc00641c
create.test, create.result, sql_select.cc, item.cc:
...
After merge fix for bug #12537
2005-08-31 22:06:34 +04:00
evgen@moonbone.local
f917803e0c
Manual merged
2005-08-31 21:24:25 +04:00
jimw@mysql.com
37bf8394ab
Add test for madvise() being declared in C++ code, because it is not
...
on Solaris even though it is available, and declare it ourselves in
that case. (Bug #7156 )
2005-08-31 10:08:55 -07:00
tomas@poseidon.ndb.mysql.com
298af8ccb9
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-31 18:50:33 +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
SergeyV@selena.
341eac5d25
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#11815-mysql-5.0
2005-08-31 18:44:02 +04:00
kent@mysql.com
16eecea22e
mtr_timer.pl, mtr_report.pl, mtr_process.pl, mysql-test-run.pl:
...
Backporting from 5.0
2005-08-31 16:28:47 +02:00
evgen@moonbone.local
f1fb30a15f
Fix bug #12861 client hang with group_concat insubquery FROM DUAL.
...
Item_func_group_concat::fix_fields() set maybe_null flag to 0, and set it to
1 only if some of it's arguments may be null. When used in subquery in tmp
table created field which can't be null. When no data retireved result field
have to be set to null and error mentioned in bug report occurs. Also this
bug can occur if selecting from not null field in empty table.
Function group_concat now marked maybe_null from the very beginning not only
if some of it's argument may be null.
2005-08-31 18:26:50 +04:00
tomas@poseidon.ndb.mysql.com
2b11fdba34
improved error message printing on filesystem refuse signals
2005-08-31 16:15:03 +02:00
heikki@hundin.mysql.fi
183feee465
ha_innodb.cc:
...
Fix bug #12410 : InnoDB was too permissive with LOCK TABLE ... READ LOCAL, and alowed new inserts to the table; we now make READ LOCAL equivalent to READ for InnoDB; note that this will cause slightly more locking in mysqldump, but makes the InnoDB table dumps consistent with MyISAM table dumps; note that the real code change patch was accidentally pushed with my another patch 5 minutes ago
2005-08-31 14:27:44 +03:00
heikki@hundin.mysql.fi
9aa5a86a80
ha_innodb.cc:
...
Fix bug #12852 : do not increment the open handle count to a table if the table does not have an .ibd file and InnoDB decides to return an error from the ::open() function; then the table can be dropped even if the user has tried to open it
2005-08-31 14:17:05 +03:00
tomas@poseidon.ndb.mysql.com
b9506c2324
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-31 13:10:35 +02:00
tomas@poseidon.ndb.mysql.com
6b4170ab10
corrected some erroneous ndb error messages
2005-08-31 13:09:18 +02:00
sergefp@mysql.com
04d75ab6e8
Fix group_min_max.test - myisam may return slightly row count estimate on amd64
2005-08-31 13:23:24 +04:00
ramil@mysql.com
a16da25e06
Merge mysql.com:/usr/home/ram/work/4.1.b9613
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-08-31 10:25:00 +05:00
kent@mysql.com
01f3a901a9
configure.in:
...
Changed back to 5.0.13-beta
2005-08-31 03:45:04 +02:00
kent@mysql.com
5f7ce18fb1
mysql-test-run.pl:
...
Put back unused old manager dummy arguments, some scripts use them
2005-08-31 03:38:33 +02:00