mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
28467 commits 2791 branches 343 tags 1.7 GiB
Commit graph

7458 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
fac966560a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-12 18:25:51 +01:00
msvensson@neptunus.(none)
0dffbdfb61 Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-12 18:23:44 +01:00
msvensson@neptunus.(none)
7f919f9ef7 Use "test ! -s" to check that file does not exist 2006-01-12 18:19:57 +01:00
bar@mysql.com
6301568290 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-12 16:07:06 +04:00
sergefp@mysql.com
40b7fab55d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug16166-r2
 2006-01-12 11:55:34 +03:00
sergefp@mysql.com
e40759e370 BUG#16166, "Can't use index_merge with FORCE INDEX": adjust the heurstics check to take into 
account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)
 2006-01-12 10:48:27 +03:00
bar@mysql.com
0e9c8395c7 Merge mysql.com:/usr/home/bar/mysql-4.1.b15581 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-12 11:38:09 +04:00
bar@mysql.com
45c84d0aa9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15581
 2006-01-12 11:13:34 +04:00
msvensson@neptunus.(none)
4b913614fc Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-11 11:24:57 +01:00
msvensson@neptunus.(none)
d42d399464 Disable code for "let" to assign each column from query to it's own variable 2006-01-11 00:24:57 +01:00
aivanov@mysql.com
cdf3e4c02e Post-merge changes 2006-01-10 21:03:02 +03:00
aivanov@mysql.com
2871e85f2e Merge mysql.com:/home/alexi/dev/mysql-4.1-15805 
into  mysql.com:/home/alexi/dev/mysql-5.0-15805
 2006-01-10 19:22:47 +03:00
aivanov@mysql.com
16004acce1 Commenting out testcases which cause type_time.test failure. 
To be uncommented after fixing bug 15805.
 2006-01-10 17:57:46 +03:00
aelkin@mysql.com
9f0b5092e3 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
 2006-01-10 14:40:05 +02:00
aelkin@mysql.com
d7eb02f439 BUG#9483 test was overworked to account reviews finally to leave only REVOKE check. 
There is a specific rpl_ignore_grant test case for GRANT.
 2006-01-10 13:44:08 +02:00
msvensson@neptunus.(none)
86e8958a4e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
 2006-01-10 09:57:59 +01:00
igor@rurik.mysql.com
32c7a0b62f Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-01-09 21:46:33 -08:00
igor@rurik.mysql.com
e4b1399b5a Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2006-01-09 15:20:01 -08:00
msvensson@neptunus.(none)
e0d3410a3e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
 2006-01-09 20:12:18 +01:00
msvensson@neptunus.(none)
33d5dc041d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
 2006-01-09 17:18:49 +01:00
msvensson@neptunus.(none)
4bcf141799 Bug #15598 Server crashes in specific case during setting new password 
- Comparing host string against NULL caused crash. 
- If host.hostname is NULL treat it as ""
 2006-01-09 17:12:26 +01:00
msvensson@neptunus.(none)
7bda1e9191 Merge neptunus.(none):/home/msvensson/mysql/bug15598/my41-bug15598 
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
 2006-01-09 11:16:29 +01:00
msvensson@devsrv-b.mysql.com
175a946e55 Merge msvensson@10.100.68.5:/home/msvensson/mysql/bug15598/my41-bug15598 
into  devsrv-b.mysql.com:/space/magnus/my41-bug15598
 2006-01-09 10:57:28 +01:00
msvensson@neptunus.(none)
2a05a6ba87 Bug #15598 Server crashes in specific case during setting new password 
- When acl_user->host.hostname is NULL compare it as ""
 2006-01-09 10:31:07 +01:00
igor@rurik.mysql.com
bf78fd5438 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-01-07 23:10:08 -08:00
igor@rurik.mysql.com
05947d9916 Fixed bug #14274: a query with a having clause containing only set function returned a wrong result set. 2006-01-07 23:00:06 -08:00
igor@rurik.mysql.com
d2cfad167b Fixed bug #16016: MIN/MAX optimization was not applied to views. 2006-01-06 22:28:26 -08:00
jimw@mysql.com
d8a4aafe33 Merge mysql.com:/home/jimw/my/mysql-5.0-14212 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-01-06 08:34:55 -08:00
monty@mysql.com
b0a5ea01ef Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-01-06 01:08:48 +02:00
monty@mysql.com
6e22e29de6 Review fixes of new pushed code 
- Fixed tests
- Optimized new code
- Fixed some unlikely core dumps
- Better bug fixes for:
  - #14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  - #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null
 2006-01-06 00:47:49 +02:00
knielsen@mysql.com
85575904fa BUG#14931: Temporarily add synchronization to avoid sporadic test failures until 
the bug is fixed.
 2006-01-04 15:25:32 +01:00
gluh@eagle.intranet.mysql.r18.ru
8ce6f3e6ca Fix for bug#15533 crash, information_schema, function, view 
enable view prepared mode during getting metedata for I_S table
 2006-01-03 14:25:19 +04:00
msvensson@neptunus.(none)
6de9519966 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2
 2005-12-29 09:19:25 +01:00
msvensson@devsrv-b.mysql.com
45864dbf4b Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2 
into  devsrv-b.mysql.com:/space/magnus/my50-bug15775_part2
 2005-12-28 17:37:28 +01:00
evgen@moonbone.local
45abf0dabd Manual merge 2005-12-28 17:23:08 +03:00
msvensson@neptunus.(none)
e1ef24e38c Bug #15775 "drop user" command does not refresh acl_check_hosts 
- Update patch for 5.0 
 - Added common function to be called when 'acl_users' has been modified
 2005-12-28 14:43:50 +01:00
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