Commit graph

32034 commits

Author SHA1 Message Date
unknown
ae7974b112 Bug#11835 CREATE FUNCTION crashes server
- Update for 5.1
 - Add "have_dlopen"
 - Remove requirement to load udf's only in "opt_plugin_dir" 


include/my_global.h:
  Remove duplicate defines
mysql-test/include/have_udf.inc:
  Use "have_dlopen" to check if we "have udf"
mysql-test/r/have_udf.require:
  Use "have_dlopen" to check if we "have udf"
mysql-test/r/udf.result:
  Update for new error message "function"->"symbol"
sql/item_func.cc:
  Remove "evil" dbug printour that checks args[0] even if arg_count is 0
sql/mysql_priv.h:
  Add "have_dlopen"
sql/mysqld.cc:
  Add "have_dlopen"
  Move HAVE_DLOPEN defined to only surround "udf_free" and "udf_init"
sql/set_var.cc:
  Add "have_dlopen"
sql/sql_plugin.cc:
  Surround 'dlclose' with HAVE_DLOPEN
sql/sql_udf.cc:
  Remove the requirement to load udf's only from "opt_plugin_dir".
  Fix spelling error
2006-03-21 10:54:26 +01:00
unknown
b16a2fef98 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
2006-03-20 22:57:18 +01:00
unknown
d8c04a6f6c Fix compilation failure when compiling without partitioning, introduced
by previous push.
2006-03-20 21:57:23 +01:00
unknown
c7f8c632eb Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
2006-03-20 21:41:27 +01:00
unknown
b1aacfac72 Merge neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/Makefile.am:
  Merge
sql/share/errmsg.txt:
  Merge
sql/sql_udf.cc:
  Merge
2006-03-20 20:16:53 +01:00
unknown
680ba0b7d9 Don't look for "dlopen" if server linked with -static or -all-static flag. Update after review
configure.in:
  Don't look for "dlopen" if server linked with -static or -all-static flag
2006-03-20 19:55:38 +01:00
unknown
60bc9ad712 merging 2006-03-20 19:37:44 +04:00
unknown
6315e46af2 merging
sql/sql_partition.cc:
  Auto merged
2006-03-20 19:22:56 +04:00
unknown
91eac0bdc3 Fix for bug#15336 Partitions: crash if create table as select
added HA_EXTRA_WRITE_CACHE case to ha_partition::extra()


mysql-test/r/partition.result:
  Fix for bug#15336 Partitions: crash if create table as select
    test case
mysql-test/t/partition.test:
  Fix for bug#15336 Partitions: crash if create table as select
    test case
2006-03-20 18:58:21 +04:00
unknown
851f4fb954 Code #ifdef-ed
sql/sql_class.h:
  line #ifdef-ed
2006-03-20 18:46:13 +04:00
unknown
de26416468 Bug#14367 Partitions: crash if utf8 column
use part_info->item_free_list instead of thd->free_list during partition function parsing


mysql-test/r/partition.result:
  Bug#14367 Partitions: crash if utf8 column
    test case
mysql-test/t/partition.test:
  Bug#14367 Partitions: crash if utf8 column
    test case
sql/item.cc:
  Bug#14367 Partitions: crash if utf8 column
    create copy of string in current mem_root to avoid memory leak
2006-03-20 17:41:45 +04:00
unknown
afe397ff66 bug #17290 (sp with delete, create and rollback causes MySQLD core)
additional fixes


mysql-test/r/partition.result:
  result fixed
mysql-test/t/partition.test:
  testcase
sql/sql_parse.cc:
  part_info cloning moved here
sql/sql_partition.cc:
  fixes
sql/sql_table.cc:
  part_info cloning removed
2006-03-20 17:30:01 +04:00
unknown
723c3a504f Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.clean
2006-03-20 15:24:14 +04:00
unknown
f9dd31ca8e Fix HPUX compilation.
sql/ha_ndbcluster.h:
  Fix HPUX compilation (copy-paste error I think).
2006-03-20 09:35:56 +01:00
unknown
0d446106c6 Merge mysql.com:/home/hartmut/projects/mysql/bk-clean/5.1
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1/gcc41
2006-03-18 18:21:48 +01:00
unknown
2fac3346e2 gcc 4.1.0 compile fix (Bug #18332) 2006-03-18 18:12:47 +01:00
unknown
d985e76516 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new
2006-03-18 17:18:52 +01:00
unknown
99d34d28fa Bug#18326 (Do not lock tables for writing during prepare of statement):
Fixing tests to get the test suite passing. This does not hide the bug
since it's a matter of performance, not correctness.


mysql-test/t/binlog_row_blackhole.test:
  Disabling ps-protocol for the test.
mysql-test/t/binlog_row_insert_select.test:
  Disabling ps-protocol for the test.
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  Disabling ps-protocol for the test.
mysql-test/t/rpl_row_create_table.test:
  Disabling ps-protocol for the test.
mysql-test/t/rpl_row_flsh_tbls.test:
  Disabling ps-protocol for the test.
2006-03-18 17:15:53 +01:00
unknown
1c45dcc1d5 Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.clean


sql/sql_partition.cc:
  Auto merged
2006-03-18 18:51:17 +04:00
unknown
6a421c56cc bug 17290 and bug 14350
added THD::work_part_info member where we now store modified
partition_info structure.
It allows no solve problem when different parts of the part_info get
into different mem_roots


sql/partition_info.cc:
  get_clone implementation
sql/partition_info.h:
  get_clone() declared
sql/sql_class.h:
  THD::work_part_info added
sql/sql_partition.cc:
  thd->work_part_info instead of lex->part_info
sql/sql_table.cc:
  thd->work_part_info instad of lex->part_info
sql/unireg.cc:
  thd->work_part_info instad of lex->part_info
2006-03-18 18:48:21 +04:00
unknown
58443d61fd Post-review fixes for bug#17899 Partitions: crash, NDB, Select .. ORDER BY 2006-03-18 10:04:39 +01:00
unknown
69aa271da5 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-18 08:31:28 +01:00
unknown
5e042add5a Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new
2006-03-18 00:36:12 +01:00
unknown
03a96c0651 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new


sql/sql_parse.cc:
  Auto merged
2006-03-17 18:19:10 +01:00
unknown
604e0535d7 Bug#18280 (RBR: Extreneous maps when writing to general_log and slow_log):
Filter out replication general_log and slow_log entirely from binary
log. Caching result of table share-specific tests.


mysql-test/r/binlog_row_drop_tmp_tbl.result:
  Result change
mysql-test/r/rpl_row_log.result:
  Result change
mysql-test/r/rpl_row_log_innodb.result:
  Result change
mysql-test/r/rpl_row_max_relay_size.result:
  Result change
sql/handler.cc:
  Refactoring code to support filtering many tables.
  Filtering out mysql.general_log and mysql.slow_log from binary log.
  Caching result from table share-specific tests.
sql/sql_class.cc:
  Correcting comment
sql/sql_parse.cc:
  Using binlog_query() instead of constructing Query_log_events
sql/table.cc:
  Adding variable to cache table check parts for row-based logging.
sql/table.h:
  Adding variable to cache table check parts for row-based logging.
2006-03-17 18:11:07 +01:00
unknown
07fc972997 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-17 17:25:00 +01:00
unknown
a4cf3861da Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  ibmlab.site:/home/my/bk/mysql-5.1-new
2006-03-17 15:56:27 +02:00
unknown
bf3501a5ef Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  production.mysql.com:/usersnfs/rburnett/mysql-5.1
2006-03-17 14:56:25 +01:00
unknown
647eefca2c fix after manual merge of fix for bug #16396: Events: Distant-future dates become past dates.
mysql-test/r/events.result:
  update result
mysql-test/r/events_bugs.result:
  update result after manual merge
mysql-test/t/events.test:
  move from error number to a constant
mysql-test/t/events_bugs.test:
  update error codes
2006-03-17 11:01:45 +01:00
unknown
a9e6af8ddf manual merge
sql/event_timed.cc:
  Auto merged
2006-03-17 09:40:48 +01:00
unknown
be423af414 Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
2006-03-16 22:19:09 +01:00
unknown
6dbb6cf199 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  ibmlab.site:/home/my/bk/mysql-5.1-new
2006-03-16 19:43:45 +02:00
unknown
8caf2f0ccf Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-root


sql/sql_lex.h:
  Auto merged
2006-03-16 20:43:44 +03:00
unknown
b49283c6d6 Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
2006-03-16 17:00:31 +01:00
unknown
511f3b7a6d Fix Windows CMake compilation after merge of Magnuses ssl patch. 2006-03-16 16:57:24 +01:00
unknown
9b9d75c360 Fixed depedency problem with the following test.
Without resetting, the next test will not pass.
2006-03-16 17:44:27 +02:00
unknown
0fa77764f6 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  ibmlab.site:/home/my/bk/mysql-5.1-new
2006-03-16 17:44:26 +02:00
unknown
74866578b2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-16 16:44:25 +01:00
unknown
617053a40b Fix example storage engine build on Windows. 2006-03-16 16:25:16 +01:00
unknown
cb761d3aa8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-16 16:05:27 +01:00
unknown
e087df2fa3 Remove disabling of rpl_ndb_multi_update2 2006-03-16 16:03:39 +01:00
unknown
fca352168f Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
2006-03-16 15:45:43 +01:00
unknown
40eb9b875c CMake Windows comp_error dependency fix after last push.
extra/cmakelists.txt:
  Another attempt at fixing the comp_err/GenError dependency problem.
sql/cmakelists.txt:
  Another attempt at fixing the comp_err/GenError dependency problem.
client/cmakelists.txt:
  Another attempt at fixing the comp_err/GenError dependency problem.
libmysql/cmakelists.txt:
  Another attempt at fixing the comp_err/GenError dependency problem.
server-tools/instance-manager/cmakelists.txt:
  Another attempt at fixing the comp_err/GenError dependency problem.
2006-03-16 15:42:48 +01:00
unknown
27978ba2aa Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug14356
2006-03-16 14:38:20 +01:00
unknown
8e5df556af Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1


include/config-win.h:
  Auto merged
2006-03-16 14:28:23 +01:00
unknown
816bd99b27 Merge acurtis@bk-internal:/home/bk/mysql-5.1-new
into  xiphis.org:/home/antony/work2/p1-bug14575.1-mrg2
2006-03-16 05:02:45 -08:00
unknown
0e2fabd29b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-16 13:42:46 +01:00
unknown
5c9359c31e Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
2006-03-16 13:34:33 +01:00
unknown
6091d5c7a0 Fix Windows CMake dependency problem.
client/cmakelists.txt:
  Fix dependency problem with the old GenError target.
extra/cmakelists.txt:
  Fix dependency problem with the old GenError target.
libmysql/cmakelists.txt:
  Fix dependency problem with the old GenError target.
server-tools/instance-manager/cmakelists.txt:
  Fix dependency problem with the old GenError target.
sql/cmakelists.txt:
  Fix dependency problem with the old GenError target.
win/README:
  Fix dependency problem with the old GenError target.
2006-03-16 13:30:59 +01:00
unknown
9d233a1782 Merge xiphis.org:/home/antony/work2/p1-bug14575.1
into  xiphis.org:/home/antony/work2/p1-bug14575.1-mrg2


include/config-win.h:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/mysql_priv.h:
  merge bug#14575 forwards
sql/mysqld.cc:
  merge bug#14575 forwards
2006-03-16 04:29:59 -08:00