Commit graph

31745 commits

Author SHA1 Message Date
unknown
195e3f3ba4 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/bugs/mysql-5.0-merged


sql/sql_db.cc:
  Merge
2006-03-01 17:43:55 +03:00
unknown
fc46a9842a Bug#17728 tests that fails are: ndb_gis rpl_ndb_multi_update2
- Run ndb_gis only if we have binlog_format_row


mysql-test/t/ndb_gis.test:
  Run ndb_gis only if we have binlog_format_row
2006-03-01 15:41:28 +01:00
unknown
8ee791e41a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2006-03-01 15:29:38 +01:00
unknown
39c03f0dfa Bug #16385 Partitions: crash when updating a range partitioned NDB table
Bug #17806 Update on NDB table with list partition causes mysqld to core
- modified complemented_pk_read to be complemented_read, and handle also hidden key


mysql-test/r/ndb_partition_range.result:
  Bug #16385 Partitions: crash when updating a range partitioned NDB table
  Bug #17806 Update on NDB table with list partition causes mysqld to core
mysql-test/t/ndb_partition_range.test:
  Bug #16385 Partitions: crash when updating a range partitioned NDB table
  Bug #17806 Update on NDB table with list partition causes mysqld to core
sql/ha_ndbcluster.h:
  Bug #16385 Partitions: crash when updating a range partitioned NDB table
  Bug #17806 Update on NDB table with list partition causes mysqld to core
2006-03-01 15:24:46 +01:00
unknown
ab13e772d6 Dont' run the mysql_protocols on Windows 2006-03-01 15:22:47 +01:00
unknown
69012c7524 Bug#2845 client fails to reconnect if using TCP/IP
- Change to use non blocking read to empty channel in case of too large sd number
 - Don't check for too large socket number on Windows.


sql/net_serv.cc:
  Windows does not need protection from sd >= FD_SETSIZE, it uses an array to store the sd's it should read from.
  Change the handler for when "net_data_is_ready" returns -1 to perform nonblocking read to empty the net.
  Only include that handler if HAVE_POLL is not defined  and not windows
2006-03-01 15:21:03 +01:00
unknown
c64c108eda Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)
union.result, union.test:
  Adding test case.
item.cc:
  Allow safe character set conversion in UNION
  - string constant to column's charset
  - to unicode
  Thus, UNION now works the same with CONCAT (and other string functions)
  in respect of aggregating arguments with different character sets.


sql/item.cc:
  Allow character set conversion in UNION
  - string to column's charset
  - to unicode
  Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)
mysql-test/t/union.test:
  Adding test case.
mysql-test/r/union.result:
  Adding test case.
2006-03-01 17:58:01 +04:00
unknown
2281f754e2 Fixed BUG #16175: Memory leak in rpl_trigger.test
Allocating/freeing memory for the db member of THD
  is wholy managed by slave thread.
2006-03-01 16:21:01 +03:00
unknown
3437ad04ea Merge mysql.com:/M50/comment-5.0 into mysql.com:/M50/mysql-5.0 2006-03-01 13:35:32 +01:00
unknown
1f4e0b61b8 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-01 13:32:46 +01:00
unknown
eab8bb65fb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-01 13:32:45 +01:00
unknown
e39f229197 Bug #17805 Cluster_replication database should be renamed to just cluster 2006-03-01 13:31:21 +01:00
unknown
4ede8823b7 Manual merge of the added "--comment=<string>" option
to both the Shell and the Perl vaerion of "mysql-test-run"-


mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/mysql-test-run.sh:
  Manual merge
2006-03-01 13:29:37 +01:00
unknown
ca3dd7f01a mysql-test/mysql-test-run.pl : Add a "--comment=<string>" option (backport from 5.1).
mysql-test/mysql-test-run.pl:
  Add a "--comment=<string>" option (backport from 5.1).
  Its sole purpose is to get logged, so that test evaluation gets easier.
  See "Do-compile" for how it is called, and "gen-build-status-page" for its effect.
2006-03-01 13:15:37 +01:00
unknown
dfbbcd2767 Merge mysql.com:/M40/comment-4.0 into mysql.com:/M41/comment-4.1
mysql-test/mysql-test-run.sh:
  Auto merged
2006-03-01 13:10:59 +01:00
unknown
b17bb278f7 bug #9088 (bigint WHERE fails)
mysql-test/r/bigint.result:
  test result
mysql-test/t/bigint.test:
  testcase
sql/item.h:
  unsigned_arg is a separate parameter now
sql/item_cmpfunc.cc:
  we can get unsigned field from the signed Item - from string
  like '1234'
2006-03-01 15:50:15 +04:00
unknown
2ad62445ec Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-01 12:40:18 +01:00
unknown
a5518ba652 Merge dmituzas@bk-internal:/home/bk/mysql-5.1-new
into  flute.local:/Users/midom/Development/mysql-5.1-new
2006-03-01 13:23:02 +02:00
unknown
6e0d2e41cc mysql-test/mysql-test-run.sh : Add a "--comment=<string>" option, to get it logged when the test is run.
mysql-test/mysql-test-run.sh:
  Add a "--comment=<string>" option, to get it logged when the test is run.
  The purpose is to allow a better analysis when generating the status page 
  ("gen-build-status-page").
  See "Do-compile" for how it is used.
2006-03-01 12:21:44 +01:00
unknown
a44a924a40 Fix for BUG#16266: Definer is not fully qualified error during replication.
The idea of the fix is to extend support of non-SUID triggers for backward
compatibility. Formerly non-SUID triggers were appeared when "new" server
is being started against "old" database. Now, they are also created when
"new" slave receives updates from "old" master.


mysql-test/r/rpl_trigger.result:
  Updated the result file with the results of the test for BUG#16266.
mysql-test/t/rpl_trigger.test:
  Added the test case for BUG#16266.
sql/mysql_priv.h:
  Added an utility operation to be used from sql_yacc.yy.
sql/sql_parse.cc:
  Add a utility operation to be used from sql_yacc.yy.
sql/sql_trigger.cc:
  Extend support of non-SUID triggers.
sql/sql_view.cc:
  Initialize LEX::definer if DEFINER-clause is missing.
sql/sql_yacc.yy:
  Extended support of non-SUID triggers.
mysql-test/std_data/bug16266.000001:
  A new binlog file for testing a patch for BUG#16266.
2006-03-01 14:13:07 +03:00
unknown
1abdd4f93a fixed BINLOG crashes in case of badly formed statement (Bug #17457)
sql/sql_binlog.cc:
  Initialize event pointer to nil,
  'ev' is used in end: section, thus initialization blocks were skipped
2006-03-01 12:45:13 +02:00
unknown
cc5056c514 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-01 10:48:15 +01:00
unknown
4c3b3eae6a Merge error
sql/field.h:
  Remove multiple definition of "cmp_binary_offset"
2006-03-01 10:16:14 +01:00
unknown
3f480fcb9f Bug#16315 XML: extractvalue() handles self badly
xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  Adding a special function to handle "self" axis.
  Previously "child" and "self" were handled the same.


sql/item_xmlfunc.cc:
  Bug#16315 XML: extractvalue() handles self badly
  Adding a special function to handle "self" axis.
  Previously "child" and "self" were handled the same.
mysql-test/t/xml.test:
  Adding test case.
mysql-test/r/xml.result:
  Adding test case.
2006-03-01 13:16:12 +04:00
unknown
6bdf9d27b4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1


sql/field.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2006-03-01 10:07:14 +01:00
unknown
409f02299f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
sql/sql_partition.cc:
  Auto merged
2006-03-01 09:57:36 +01:00
unknown
b7ac9271b8 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-01 09:46:38 +01:00
unknown
ee9930bfa4 Fix for bug#14363 Partitions: failure if create in stored procedure
store copy of partition function string


mysql-test/r/partition.result:
  Fix for bug#14363 Partitions: failure if create in stored procedure
    test case
mysql-test/t/partition.test:
  Fix for bug#14363 Partitions: failure if create in stored procedure
    test case
2006-03-01 12:42:33 +04:00
unknown
19fea97f93 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
sql/sql_acl.cc:
  Auto merged
2006-03-01 09:33:34 +01:00
unknown
10cb6fa65b Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-01 08:58:58 +01:00
unknown
0466a90944 Bug#16320 XML: extractvalue() won't accept names containing underscores
added '_' to allowed tag body symbols


mysql-test/r/xml.result:
  Bug#16320 XML: extractvalue() won't accept names containing underscores
    test case
mysql-test/t/xml.test:
  Bug#16320 XML: extractvalue() won't accept names containing underscores
    test case
2006-03-01 10:36:22 +04:00
unknown
e6ef97c484 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Bugs/5.1.17568
2006-03-01 10:07:19 +04:00
unknown
8b7728bdcf Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.17602
2006-03-01 09:18:03 +04:00
unknown
4296774f92 save the modified value and compare it every time. the memory address
is not that reliable (re #17815). Not perfect solution but will work
till #17815 is fixed.
2006-03-01 04:22:05 +01:00
unknown
f92ec21f02 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug17494
2006-03-01 03:50:56 +01:00
unknown
b22706e437 fix for bug #16426, post fixes
mysql-test/r/events_slow_query.result:
  fix result
mysql-test/t/events_slow_query.test:
  create different event because the executor is buggy and won't catch the difference if
  the memory address does not change (will be reported as bug separately)
sql/sp_head.cc:
  this was an error which passed code review. thd->enable_slow_log could be
  changed and it should not be relied
2006-03-01 03:49:31 +01:00
unknown
4018511829 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


sql/sql_parse.cc:
  Auto merged
2006-03-01 03:18:59 +01:00
unknown
3c8432a7b8 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug17494
2006-03-01 02:36:15 +01:00
unknown
d576ca1815 fix for bug #16426
Events: Event-caused statements don't appear in the slow query log
WL#1034


sql/event_executor.cc:
  enable slow logging
sql/event_timed.cc:
  enable slow logging for the anonymous SP
sql/sp_head.cc:
  allow thd->enable_slow_log to be TRUE if only
  m_flags & sp_head::LOG_SLOW_STATEMENTS
  Because usually enable_slow_log is 1 in user mode, this second
  check is needed backup the mode otherwise.
sql/sp_head.h:
  add a new constant for slow queries. SP by default does not log slow queries in the
  body just the whole CALL could be considered as slow if taking too much time and
  called directly from the user
sql/sql_parse.cc:
  let us see in the the trace log
2006-03-01 02:34:22 +01:00
unknown
d8bd689d2d fix problem
Error: Freeing unallocated data at line 900, 'sql_db.cc'
(
 DROP DATABASE frees thd->db for everything but thd->slave_thread=1
 however we are not slave thread and more bugs could appear if we 
 pretend to be, then we will be good boys and just strdup the value.
 If not DROP DATABASE then THD::~THD() will free the value.
)


sql/event_timed.cc:
  fix problem 
  Error: Freeing unallocated data at line 900, 'sql_db.cc'
  (
   DROP DATABASE frees thd->db for everything but thd->slave_thread=1
   however we are not slave thread and more bugs could appear if we 
   pretend to be, then we will be good boys and just strdup the value.
   If not DROP DATABASE then THD::~THD() will free the value.
  )
  - fix also a bad message
2006-03-01 02:11:58 +01:00
unknown
3aeea1bb9b Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-28 18:51:09 -06:00
unknown
48019050a3 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 18:48:58 -06:00
unknown
6bf042f594 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


mysql-test/t/mysqltest.test:
  Auto merged
2006-02-28 18:12:29 -06:00
unknown
ebcf6ec672 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


mysql-test/t/mysqltest.test:
  Auto merged
2006-02-28 17:54:50 -06:00
unknown
bf912125a3 mysqltest.test:
Add real_sleep tests.


mysql-test/t/mysqltest.test:
  Add real_sleep tests.
2006-02-28 17:54:11 -06:00
unknown
3addd306a6 Merge
configure.in:
  Auto merged
client/mysqlimport.c:
  Auto merged
include/config-win.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  SCCS merged
2006-02-28 23:29:58 +01:00
unknown
560f40b69f Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
2006-02-28 15:14:31 -06:00
unknown
618bd0a5e5 mysqltest.c:
expand tab


client/mysqltest.c:
  expand tab
2006-02-28 15:11:44 -06:00
unknown
74ee3a125c Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
2006-02-28 15:09:45 -06:00
unknown
8d5f0fcddc mysql-test-run.sh:
Fix URLs.
README:
  Fix URL.
mysqltest.result:
  Update test result for real_sleep error message.
mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.


client/mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.
mysql-test/r/mysqltest.result:
  Update test result for real_sleep error message.
mysql-test/README:
  Fix URL.
mysql-test/mysql-test-run.sh:
  Fix URLs.
2006-02-28 15:08:16 -06:00