Commit graph

7969 commits

Author SHA1 Message Date
evgen@moonbone.local
535b23bec5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14583-bug-4.1-mysql
2005-12-28 16:00:10 +03:00
msvensson@neptunus.(none)
cdd1f5c6fc Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2
into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
2005-12-28 09:31:40 +01:00
msvensson@neptunus.(none)
2fb6cb5a5a BUG#15775 "drop user" command does not refresh acl_check_hosts
- DROP USER command didn't reload the acl_check_hosts cache causing subsequent 
     connect's via TCP to fail randomly.
   - 4.1 version
2005-12-28 09:23:27 +01:00
ingo@mysql.com
bd1b724bbf Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-27 19:25:54 +01:00
evgen@moonbone.local
d91cbf34ff Fix bug#14583
When InnoDB compares varchar field in ucs2 with given key using bin collation,
it calls my_strnncollsp_ucs2_bin() to perform comparison.
Because field length was lesser than length of key field should be padded
with trailing spaces in order to get correct result. 
Because  my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
doesn't pads field, wrong comparison result was returned. This results in
wrong result set.

my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
but using binary collation.
2005-12-27 20:16:59 +03:00
stewart@mysql.com
efbdf7b225 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-12-28 00:57:18 +11:00
ingo@mysql.com
44ef4989bb Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-bug5390
2005-12-27 10:36:19 +01:00
ingo@mysql.com
ef52a59418 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-27 10:31:00 +01:00
bar@mysql.com
7f843ffe87 ctype_uca.result, ctype_uca.test:
Adding test case.
charset-def.c:
  Initialize new collation.
ctype-uca.c:
  Adding simplified Hungarian collation.
2005-12-23 14:20:00 +04:00
dlenev@mysql.com
74ca27b305 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg14836
2005-12-21 15:02:34 +03:00
ingo@mysql.com
b0e84cb999 BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.0.
Extended the unique table check by a check of lock data.
Merge sub-tables cannot be detected by doing name checks only.
2005-12-20 16:35:05 +01:00
msvensson@neptunus.(none)
90bbcc9b4d Store the each column from a multi column result set into a separate variable. 2005-12-20 15:34:58 +01:00
gluh@eagle.intranet.mysql.r18.ru
f9ef0df0d3 Fix for bug#14271 I_S: columns has no size for (var)binary columns
set character_octet_length, character_maximum_length for
  binary and varbinary field types
2005-12-19 16:21:02 +04:00
bar@mysql.com
f206a123a1 Bug#15581: COALESCE function truncates mutli-byte TINYTEXT values
field.cc:
  BLOB variations have number-in-bytes limit,
  unlike CHAR/VARCHAR which have number-of-characters limits.
  A tinyblob column can store up to 255 bytes.
  In the case of basic Latin letters (which use 1 byte per character)
  we can store up to 255 characters in a tinyblob column.
  When passing an utf8 tinyblob column as an argument into
  a function (e.g. COALESCE) we need to reserve 3*255 bytes.
  I.e. multiply length in bytes to mbcharlen for the character set.
  Although in reality a tinyblob column can never be 3*255 bytes long,
  we need to set max_length to multiply to make fix_length_and_dec()
  of the function-caller (e.g. COALESCE) calculate the correct max_length
  for the column being created.

ctype_utf8.result, ctype_utf8.test:
  Adding test case.
2005-12-19 15:52:10 +04:00
gluh@eagle.intranet.mysql.r18.ru
f4b052844f Fix for bug#14861 aliased column names are not preserved.
Create tmp table filed using original item name when it's necessary
2005-12-19 15:36:03 +04:00
gluh@eagle.intranet.mysql.r18.ru
c8631b414b Bug#12770 DESC cannot display the info. about temporary table
Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
Bug#15224 SHOW INDEX from temporary table doesn't work.
  Restore thd->temporary_tables to be able to process
  temporary tables(only for 'show index' & 'show columns').
  This should be changed when processing of temporary tables for
  I_S tables will be done.
2005-12-19 14:46:54 +04:00
kent@mysql.com
63b4ce720a Merge 2005-12-18 15:26:37 +01:00
serg@serg.mylan
c23612247c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-12-18 13:31:43 +01:00
serg@serg.mylan
297d80dc11 BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
for uca collation isalnum and strnncollsp don't agree on whether
0xC2A0 is a space (strnncollsp is right, isalnum is wrong).

they still don't, the bug was fixed by avoiding strnncollsp
2005-12-18 13:30:01 +01:00
aivanov@mysql.com
e6b08a5ea9 Merge mysql.com:/home/alexi/dev/mysql-4.1-12440
into  mysql.com:/home/alexi/dev/mysql-5.0-12440
2005-12-15 18:59:40 +03:00
aivanov@mysql.com
ea4c3481f2 Fixed BUG #12440: "Incorrect processing of time values containing
long fraction and/or large exponent part".
2005-12-15 18:48:08 +03:00
pem@mysql.com
cdfe77e2ec Fixed BUG#14834: Server denies to execute Stored Procedure
The problem was that databases with '_' in the name did not match a
  correct ACL with a literal '_' (i.e. '\_') in the db name, only identical
  strings matched. The fix makes this work, and also ACLs with wildcards in
  the db name work.
2005-12-15 15:23:16 +01:00
ramil@mysql.com
04cff0d055 Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX
and bug #15668: Test 'sp-error' crashes server on Mac OS X.
2005-12-14 21:42:08 +04:00
kent@mysql.com
8e5b353598 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 16:50:28 +01:00
mskold@mysql.com
138ec21cc9 Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable 2005-12-14 16:29:56 +01:00
jonas@perch.ndb.mysql.com
2059a6c174 bug#15682 - ndb
incorrect handling of varchar in position/rnd_pos

  Commit for 5.0.17 release clone
2005-12-14 15:09:12 +01:00
mskold@mysql.com
0663f81acd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-12-14 14:49:59 +01:00
mskold@mysql.com
973dedbf08 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-12-14 14:48:42 +01:00
mskold@mysql.com
c08ee431bd Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-12-14 14:46:24 +01:00
mskold@mysql.com
b0500f54c8 Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable 2005-12-14 14:45:13 +01:00
kent@mysql.com
c11b35d9bf Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 13:18:24 +01:00
jonas@perch.ndb.mysql.com
6a02895276 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-12-14 11:34:08 +01:00
jonas@perch.ndb.mysql.com
1864165ff3 bug#15682 - ndb - invalid handling of varchar in position/rnd_pos 2005-12-14 10:57:09 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
4ac4020f6d Fixed test case. 2005-12-14 00:23:46 +02:00
evgen@moonbone.local
012933ce39 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/15268-bug-5.0-mysql
2005-12-13 23:26:35 +03:00
aivanov@mysql.com
2e499986aa Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting for
table' lockup".
 Changes from the innodb-5.0-ss92 snapshot.
 Do not call os_file_create_tmpfile() at runtime. Instead, create
 all tempfiles at startup and guard access to them with mutexes.
2005-12-13 21:35:24 +03:00
msvensson@neptunus.(none)
b38a183d62 Remove confusing printouts from expected to fail "system" commands 2005-12-13 18:47:34 +01:00
msvensson@neptunus.(none)
36c86a4df6 Fix tests after merge
Straighten out and comment behaviour for --require and --result in run_query
2005-12-13 18:07:13 +01:00
msvensson@neptunus.(none)
2dbb3bc2ef Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2005-12-13 15:14:18 +01:00
pem@mysql.com
9945144499 Fixed BUG#15231: Stored procedure bug with not found condition handler
Make the distinction between "exception conditions" and "completion
  conditions" (warning and "no data") as defined by the standard. The latter
  should not terminate a routine if no handler is found in the lexical scope.
2005-12-13 13:12:42 +01:00
aivanov@mysql.com
75af3821d7 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss11
2005-12-12 22:46:49 +03:00
jimw@mysql.com
90befc0a0e Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 11:39:33 -08:00
jimw@mysql.com
e18679c7ff Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 10:11:56 -08:00
joerg@mysql.com
2a3d35fa02 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-12-12 19:11:21 +01:00
aivanov@mysql.com
7ae2d46903 Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for
table' lockup".
 Changes from the innodb-4.1-ss11 snapshot.
 Do not call os_file-create_tmpfile() at runtime. Instead, create
 a tempfile at startup and guard access to it with a mutex.
 Also, fix bugs:
 10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE";
 13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN
 KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that
 datatypes between foreign key references are compatible.
 Also, added test cases (also for bug 9802).
2005-12-12 21:06:59 +03:00
joerg@mysql.com
a86cb213f2 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/bug12429 2005-12-12 19:04:47 +01:00
joerg@mysql.com
99cf03b295 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
into mysql.com:/M50/clone-5.0
2005-12-12 19:00:08 +01:00
joerg@mysql.com
36655f9a1e Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/bug12429 2005-12-12 18:54:35 +01:00
joerg@mysql.com
62d726582e rpl_until.test + rpl_until.result Fix (completion) for bug#12429
Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
2005-12-12 18:00:37 +01:00
joerg@mysql.com
8dfe471426 rpl_until.test + rpl_until.result
Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
The value is not important, and it depends on timing. Mask it.

Backport and extension of a fix made by Matthias in 5.0, originally it was
1.1976 05/12/05 17:57:48 mleich@mysql.com
2005-12-12 17:51:56 +01:00