Commit graph

7646 commits

Author SHA1 Message Date
igor@rurik.mysql.com
aade22bad2 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-01-06 23:26:20 -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
96ae7c2e78 Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-01-06 10:42:58 -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
knielsen@mysql.com
fdab131bac Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-06 12:42:30 +01:00
knielsen@mysql.com
17ec039433 Disabled mysqlslap test case was errorneously enabled in merge; disable again. 2006-01-06 12:40:32 +01:00
jmiller@mysql.com
d1aacfad69 Test case clean-up do to causing other test failures 2006-01-06 01:09:17 +01: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
jmiller@mysql.com
35a039ffc0 File needs to be removed 2006-01-06 00:06:04 +01: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
jmiller@mysql.com
5e45dc2738 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-05 22:18:43 +01:00
jmiller@mysql.com
a0c4cfd015 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/5.1-new2
2006-01-05 13:07:29 +01:00
jmiller@mysql.com
28dba4c690 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-05 04:08:55 +01:00
jmiller@mysql.com
32b19cd1ec New rbr blob test requested by Lars 2006-01-05 03:56:22 +01:00
konstantin@mysql.com
f4cc6c4d15 Merge mysql.com:/opt/local/work/mysql-5.0-merge
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-01-05 00:38:51 +03:00
knielsen@mysql.com
6f6480b064 BUG#14931: Temporarily add synchronization to avoid sporadic test failures until
the bug is fixed.
2006-01-04 15:25:51 +01: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
mats@mysql.com
c3d029bde5 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b15924-mysql-5.1-new
2006-01-04 14:05:50 +01:00
mats@mysql.com
e6bd8be4f3 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b15924-mysql-5.1-new
2006-01-04 14:00:35 +01:00
mats@mysql.com
d2277ec43d Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b15942-mysql-5.1-new
2006-01-04 13:57:02 +01:00
knielsen@mysql.com
a410de984a BUG#16167: Disable mysqlslap test case until bug is fixed. 2006-01-03 23:37:29 +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
mats@mysql.com
23e84337db Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/bkroot/mysql-5.1-new
2006-01-02 14:41:40 +01:00
mats@mysql.com
19d5515c44 Bug#13115 (CREATE TABLE t2 SELECT a inside SP is not replicated when using RBR):
Test passes. Bug was probably fixed in the implementation of WL#2867.
2006-01-02 13:20:17 +01:00
brian@zim.(none)
522a62446c Cleaned up memory allocation to be a little more staight forward (though I suspect someone will hate my sizeof() increment).
Nothing really to see here. Updated comments in code.

More comments are probably needed, but isn't that always the case?
2006-01-01 20:08:45 -08:00
brian@zim.(none)
d4a3fe6e68 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/slap-5.1
2006-01-01 16:47:03 -08:00
brian@zim.(none)
7ce1981bbd Now uses a single pass testing loop. Dual pass made no sense.
Now does averaging when running iterations. 
Realligned a bunch of code and continued to remove global variables.
Added CSV output along with printable.
Structures are now provided for print options so adding XML, HTML, ... should now be trivial.
2006-01-01 16:40:02 -08:00
bar@mysql.com
6ff211329f WL#1324 table name to file name encoding
- Encoding itself, implemented as a charset
  "filename". Originally planned to use '.'
  as an escape character, but now changed to '@'
  for two reasons: "ls" does not return
  file names starting with '.' considering them
  as a kind of hidden files; some platforms
  do not allow several dots in a file name.
- replacing many calls of my_snprintf() and
  strnxmov() to the new build_table_filename().
- Adding MY_APPEND_EXT mysys flag, to append
  an extention rather that replace it.
- Replacing all numeric constants in fn_format
  flag arguments to their mysys definitions, e.g.
  MY_UNPACK_FILENAME,
- Predictability in several function/methods:
  when a table name can appear with or withot .frm
  extension. Some functions/methods were changed
  so accept names strictly with .frm, other - strictly
  without .frm extensions. Several DBUG_ASSERTs were
  added to check whether an extension is passed.
Many files:
  table name to file name encoding
mysql_priv.h:
  Prototypes for new table name encoding tools.
ctype-utf8.c:
  Implementing "filename" charset for
  table name to file name encoding.
row0mysql.c:
  Fixing table name prefix.
mf_format.c:
  Adding MY_APPEND_EXT processing.
Many files:
  Fixing tests.
my_sys.h:
  Adding new flag to append rather than replace an extension.
m_ctype.h:
  Adding "filename" charset definition.
2005-12-31 09:01:26 +04:00
bar@mysql.com
83d8979ca2 backup.result, backup.test:
t4 was not dropped, which made the "backup" test fail
  if one of the previous tests using t4 (e.g. "archive") failed.
2005-12-30 14:55:56 +04:00
msvensson@devsrv-b.mysql.com
0583507f88 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2/my51-bug15775_part2
into  devsrv-b.mysql.com:/space/magnus/my51-bug15775_part2
2005-12-28 23:28:45 +01:00
evgen@moonbone.local
5a3ce237af Merge moonbone.local:/work/14583-bug-5.0-mysql
into moonbone.local:/work/14583-bug-5.1-new-mysql
2005-12-28 19:47:56 +03: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)
6717a17fe7 Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my51-bug15775_part2
2005-12-28 14:46:00 +01: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
stewart@mysql.com
cac298e07b Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
2005-12-28 13:55:59 +11: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
mats@mysql.com
3440170618 Bug#15942 (RBR ignored --binlog_ignore_db and tries to map table on slave for writes):
Added code to do the filtering (seems to have gone away).
2005-12-27 12:06:48 +01: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
ingo@mysql.com
864f575615 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug5390
2005-12-26 14:22:13 +01:00
sergefp@mysql.com
e6f3cb553d Merge newbox:mysql-5.1-ppruning-r4
into  mysql.com:/home/psergey/mysql-5.1-26dec-merge
2005-12-26 15:12:49 +03:00
sergefp@mysql.com
e597607cb8 Merge newbox:mysql-5.1-ppruning-r4
into  pylon.mylan:/home/psergey/mysql-5.1-26dec-merge
2005-12-26 14:56:15 +03:00
sergefp@mysql.com
b8d762031f add missing DROP TABLE [IF EXISTS] clauses 2005-12-26 10:16:36 +03:00
sergefp@mysql.com
2a3943dbec WL#2985 "Partition Pruning": post-review fixes:
- Added more comments.
- Added a RANGE_OPT_PARAM::remove_jump_scans flag that disables construction of index_merge
  SEL_TREEs that represent unusable conditions like "key1part1<c1 OR key2part2<c2"
- make prune_partitions() function handle the case where range analysis produces a list of 
  index_merge trees (it turned out that this is possible, appropriate test case added).
- Other small fixes.
2005-12-26 08:40:09 +03:00