Commit graph

31745 commits

Author SHA1 Message Date
unknown
3ecf9f040a Fix for bug#14385 GRANT and mapping to correct user account problems
Check if the host of table hash record exactly matches host from GRANT command


mysql-test/r/grant.result:
  Fix for bug#14385 GRANT and mapping to correct user account problems
    test case
mysql-test/t/grant.test:
  Fix for bug#14385 GRANT and mapping to correct user account problems
    test case
2006-03-06 14:03:40 +04:00
unknown
e2f92ba5c5 ndb - enable rpl_ndb_charset Bug#17246 for test
mysql-test/t/disabled.def:
  enable rpl_ndb_charset Bug#17246 for test since I dont see any bug here
2006-03-06 10:57:57 +01:00
unknown
d5f8b5c6e6 Added test for Bug#17888 DD: ADD INDEX causes error 756 'Index on disk column is not supported 2006-03-06 10:55:44 +01:00
unknown
cda64c11d7 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-15229


mysql-test/r/join.result:
  Auto merged
mysql-test/t/join.test:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/sql_base.cc:
  SCCS merged
2006-03-06 11:41:19 +02:00
unknown
d9c43e28e0 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-06 10:30:36 +01:00
unknown
5465a14899 Fix for Bug#17888 DD: ADD INDEX causes error 756 'Index on disk column is not supported 2006-03-06 10:24:06 +01:00
unknown
bb453729b8 Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8
calculate Item_func_format::max_length using charset->mbmaxlen


mysql-test/r/func_math.result:
  Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8
    test case
mysql-test/t/func_math.test:
  Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8
    test case
2006-03-06 12:52:38 +04:00
unknown
572f03cb51 ndb - bug#17761 blob tables patch 3a [requires next patch 3b]
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  parse blob table name (temp hack)
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  parse blob table name (temp hack)
storage/ndb/src/ndbapi/DictCache.cpp:
  do not put blob tables in ndb api dict cache
  main table is cached and blob tables are owned by its blob columns
storage/ndb/src/ndbapi/Ndb.cpp:
  do not put blob tables in ndb api dict cache
  main table is cached and blob tables are owned by its blob columns
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  do not put blob tables in ndb api dict cache
  main table is cached and blob tables are owned by its blob columns
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  do not put blob tables in ndb api dict cache
  main table is cached and blob tables are owned by its blob columns
2006-03-05 22:49:38 +01:00
unknown
9c7ef53a65 bug #15745 (COUNT(DISTINCT CONCAT(x,y)) returns wrong result
mysql-test/r/distinct.result:
  result added
mysql-test/t/distinct.test:
  testcase
sql/item_sum.cc:
  MYSQL_TYPE_VARCHAR can't be 'binary' compared even when it is
  binary
2006-03-05 20:48:31 +04:00
unknown
2e81899948 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-root
2006-03-05 12:04:03 +03:00
unknown
3388a7632f Merge reggie@linux:/home/reggie/work/mysql-5.1
into  big_geek.:C:/Work/mysql/mysql-5.1-bug17720
2006-03-04 16:16:15 -06:00
unknown
74bbf4161f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/opt/local/work/mysql-5.0-root


libmysql/libmysql.c:
  Manual merge: use local.
tests/mysql_client_test.c:
  Manual merge: use local.
2006-03-05 01:11:24 +03:00
unknown
6bbc1cd40e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/t/heap.test:
  Auto merged
mysql-test/r/heap.result:
  SCCS merged
2006-03-05 00:59:43 +03:00
unknown
4391f93892 Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error":
it breaks binary compatibility. The patch will be left intact
in 5.1.


libmysql/libmysql.c:
  Revert the changeset for Bug#16144: it breaks binary compatibility.
tests/mysql_client_test.c:
  Revert the changeset for Bug#16144: it breaks binary compatibility.
2006-03-05 00:38:54 +03:00
unknown
fc969bbcf0 Merge mysql.com:/home/dlenev/src/mysql-5.0-bg17866-2
into  mysql.com:/home/dlenev/src/mysql-5.0-merges


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-03-04 23:58:48 +03:00
unknown
5f7059219f Bug #17720 Partition ALTER TABLE fails on rename of .MYI file
Fix this by passing the HA_EXTRA_PREPARE_FOR_DELETE onto the newly added or about to be dropped partitions
so they have an opportunity to close their OS file handle.


client/mysqltest.c:
  prevent positive find of pattern when pattern has zero length (this has nothing to do with this bug fix)
sql/ha_partition.cc:
  initialize m_new_file to NULL
  call new function prepare_for_delete for the HA_EXTRA_PREPARE_FOR_DELETE operation
  inside prepare_for_delete, loop over m_new_file and m_reorged_file if they are non-NULL
sql/ha_partition.h:
  added decl for new prepare_for_delete function
2006-03-04 14:21:27 -06:00
unknown
2fe8095662 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/opt/local/work/mysql-4.1-root


mysql-test/r/heap.result:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
2006-03-04 22:33:19 +03:00
unknown
350475fae4 Fix for bug #17866 "Problem with renaming table with triggers with fully
qualified subject table" which was introduced during work on bug #13525
"Rename table does not keep info of triggers".

The bug was caused by the fact that during reconstruction of CREATE TRIGGER
statement stored in .TRG file which happened during RENAME TABLE we damaged
trigger definition in case when it contained fully qualified name of subject
table (see comment for sql_yacc.yy for more info).


mysql-test/r/trigger.result:
  Added test for bug #17866 "Problem with renaming table with triggers with fully
  qualified subject table".
mysql-test/t/trigger.test:
  Added test for bug #17866 "Problem with renaming table with triggers with fully
  qualified subject table".
sql/sql_trigger.cc:
  Table_triggers_list::change_table_name_in_triggers():
    Instead of trying to use pointer to the end of subject table identifier
    we use pointer to the beginning of FOR lexeme now, so during reconstruction
    of CREATE TRIGGER statement in this function we need to add extra space
    before part which begins with FOR to get nice trigger definition.
sql/sql_yacc.yy:
  trigger_tail:
    In this rule we can't rely on using remember_end token after table_ident token,
    since value returned depends on whether table name is fully qualified or not.
    So instead of trying to get pointer to the end of table identifier we use
    pointer to the beginning of FOR lexeme.
2006-03-04 16:55:06 +03:00
unknown
93b7fe4d7d Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-bug11527
2006-03-04 14:06:52 +01:00
unknown
f8862a056b Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug11527
2006-03-04 11:40:54 +01:00
unknown
baa7cf94e1 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-cleanup


sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
2006-03-04 11:52:02 +03:00
unknown
422d11c218 Remove unused thd->options's flag -- OPTION_UPDATE_LOG
The update log itself was removed back in 5.0. Recommit
with post-review fixes.


sql/log.cc:
  OPTION_UPDATE_LOG was set in all threads but replication ones.
  So, it seems that the check filtered out slow log records from
  replication threads. Now we do it with explicit check.
sql/mysql_priv.h:
  remove unused define
sql/mysqld.cc:
  Do not set OPTION_UPDATE_LOG. It is not used anymore.
sql/set_var.cc:
  We never check for OPTION_UPDATE_LOG. So, we should not bother setting it.
2006-03-04 11:20:56 +03:00
unknown
f2de9e820e Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  big_geek.:C:/Work/mysql/mysql-5.1
2006-03-03 22:09:20 -06:00
unknown
8f84c9f99e Some cmake script fixes
win/cmakefiles/client:
  fix dependencies
win/cmakefiles/libmysql:
  fix dependencies
win/cmakefiles/regex:
  removed definitions defined here.  They are defined globally
win/cmakefiles/strings:
  removed definitions defined here.  They are defined globally
win/cmakefiles/tests:
  fixed dependencies
win/cmakefiles/vio:
  removed definitions defined here.  They are defined globally
win/cmakefiles/zlib:
  removed definitions defined here.  They are defined globally
2006-03-03 22:05:40 -06:00
unknown
40f38a2d3e Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
2006-03-03 16:27:43 -05:00
unknown
21d6e172f5 Bug#16859 involves truncating column data at NUL characters. Instead, the
client will now substitute spaces for NULs, so that the grid isn't messed up
due to silently consumed NULs and that the full field is shown.


client/mysql.cc:
  For non-numbers, print each character at a time, instead of using the 
  fprintf() facility, which interprets an array of chars as a C string, which 
  is necessarily NUL terminated.  We mustn't terminate on NULs, and since we 
  know the length of the data, we needn't.
mysql-test/r/mysql.result:
  Add a test.
mysql-test/t/mysql.test:
  Add a test.
2006-03-03 16:26:38 -05:00
unknown
4a793fb6b7 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-03 14:59:29 -06:00
unknown
82840877e9 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
2006-03-03 14:50:41 -06:00
unknown
40b55ac62f Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1-clone


client/mysqltest.c:
  Auto merged
2006-03-03 14:41:55 -06:00
unknown
91b3447c2d Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-clone
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone


client/mysqltest.c:
  Auto merged
2006-03-03 14:37:43 -06:00
unknown
d8af174ae3 mysqltest.c:
Typos.


client/mysqltest.c:
  Typos.
2006-03-03 14:34:30 -06:00
unknown
3d997647aa mysqltest.c:
Better fix for do_sleep().


client/mysqltest.c:
  Better fix for do_sleep().
2006-03-03 13:57:49 -06:00
unknown
0dcd02587d mysql.spec.sh:
Use installed libz.a to avoid hard to solve static linking problems


support-files/mysql.spec.sh:
  Use installed libz.a to avoid hard to solve static linking problems
2006-03-03 20:30:28 +01:00
unknown
942ba22ee3 Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0


sql/sql_yacc.yy:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
2006-03-03 19:18:17 +01:00
unknown
f31783ccce mysql-stress-test.pl, README.stress:
Revise stress-test README


mysql-test/README.stress:
  Revise stress-test README
mysql-test/mysql-stress-test.pl:
  Revise stress-test README
2006-03-03 12:15:01 -06:00
unknown
12e04a4c30 Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-release


sql/sql_yacc.yy:
  Auto merged
mysql-test/r/sp.result:
  SCCS merged
mysql-test/t/sp.test:
  SCCS merged
2006-03-03 18:51:13 +01:00
unknown
6dcecacf62 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug11527
2006-03-03 16:29:42 +01:00
unknown
e6b31aced6 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-03 15:44:38 +01:00
unknown
85d59f4c88 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/sql_partition.cc:
  Auto merged
2006-03-03 08:44:03 -06:00
unknown
405177f1cd Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-03 15:44:02 +01:00
unknown
a5694ba4cf Bug#16318: XML: extractvalue() incorrectly returns last() = 1
xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  - adding "size" member into MY_XPATH_FLT struct,
  to pass parent's context size when iterating
  in a predicate. Previously, temporaty context
  size was calculated instead, which is always 1.
  As a result, things like last() and count() 
  didn't work fine.
  - adding iteration into Item_func_xpath_elementbyindex:
  similar to Item_func_xpath_predicate.
  This is to make things like last() and count()
  work inside square brackets.


sql/item_xmlfunc.cc:
  Bug#16318: XML: extractvalue() incorrectly returns last() = 1
  - adding "size" member into MY_XPATH_FLT struct,
  to pass parent's context size when iterating
  in a predicate. Previously, temporaty context
  size was calculated instead, which is always 1.
  As a result, things like last() and count() 
  didn't work fine.
  - adding iteration into Item_func_xpath_elementbyindex:
  similar to Item_func_xpath_predicate.
  This is to make things like last() and count()
  work inside square brackets.
mysql-test/t/xml.test:
  Adding test case.
mysql-test/r/xml.result:
  Adding test case.
2006-03-03 18:36:14 +04:00
unknown
fa1775b6b0 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
2006-03-03 15:13:10 +01:00
unknown
fc94e58072 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-03 15:02:46 +01:00
unknown
6ef92d62ca Merge mysql.com:/extern/mysql/bk/mysql-5.1-new
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 15:02:37 +01:00
unknown
bb60631b5f Windows fixes
- Use pipes "|"
 - Improved system command, create a temporary .sh faile that is executed  with cygwins sh(bash)
   This makes the Windows version behave exactly as the Lunix version(well almost...) 
 - Give unix path to DBUG, trace files is no produced if running ./mysql-test-run.pl --debug"


client/mysqltest.c:
  Add new function "my_system" that run the <command> a she script using cygwin bash on windows.
mysql-test/lib/mtr_misc.pl:
  Return all paths to executables in windows format "c:\src\.." when run on windows.
  This makes it possible to use the pipes "|" to pipöe the output form exeample "mysqlbinlog" into "mysql"
mysql-test/mysql-test-run.pl:
  DBUG want's a unix format strings for where it should put the tracefile(don't ask me why but it works)
  Just chop of the first "c:" from the "c:/src/.." string and DBUG will be happy
2006-03-03 14:55:05 +01:00
unknown
9f2d21f695 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/mysql-5.0
2006-03-03 17:22:20 +04:00
unknown
cc7a75e6fd Fixed bug#17726: Not checked empty list caused endless loop
When the Item_cond::fix_fields() function reduces cond tree, it in loop
scans it's own list and when it founds Item_cond with same function (AND
or OR) it does next things: 1) replaces that item with item's list. 2)
empties item's list. Due to this operation is done twice - for update and
for view, at the update phase cond's list of lower view is already empty.
Empty list returns ref to itself, thus making endless loop by replacing
list with itself, emptying, replacing again and so on. This results in
server hung up.

To the Item_cond::fix_fields() function added check that ensures that
list being replaced with isn't empty.


mysql-test/t/view.test:
  Added test for bug#17726: Not checked empty list caused endless loop
mysql-test/r/view.result:
  Added test for bug#17726: Not checked empty list caused endless loop
sql/item_cmpfunc.cc:
  Fixed bug#17726: Not checked empty list caused endless loop
  To the Item_cond::fix_fields() function added check that ensures that
  list being replaced with isn't empty.
2006-03-03 16:19:57 +03:00
unknown
73e4c47403 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16316
2006-03-03 17:00:03 +04:00
unknown
2fdee0a180 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
2006-03-03 13:33:01 +01:00
unknown
d9773c1371 Merge mysql.com:/extern/mysql/bk/mysql-5.1-new
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 13:25:02 +01:00