Commit graph

33990 commits

Author SHA1 Message Date
unknown
fe7716dad9 BUG#19907 - simple_parser plugin cannot be installed
The problem was that simple_parser was compiled as static plugin, which
is intended to be linked into server, but not plugged.

This patch makes simple_parser to be compiled as dynamic plugin by adding
-DMYSQL_DYNAMIC_PLUGIN into CFLAGS.


plugin/fulltext/Makefile.am:
  Compile mypluglib as dynamic mysql plugin.
2006-05-19 17:46:34 +05:00
unknown
481ba7789b Merge april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1


mysql-test/r/heap.result:
  Auto merged
storage/heap/hp_create.c:
  Auto merged
2006-05-18 18:49:52 +05:00
unknown
0086d5abd9 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
2006-05-18 16:13:32 +05:00
unknown
7937b3e6a2 fix results after merge 2006-05-12 11:49:35 -07:00
unknown
93c397f9fa manual merge bug#10952
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
2006-05-12 08:50:31 -07:00
unknown
a8c13c34a1 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/sql_acl.cc:
  Auto merged
2006-05-12 11:51:04 +02:00
unknown
74e7b09c70 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.1-bug19728_regex_win
2006-05-12 12:40:56 +03:00
unknown
e005a5b348 Bug#19728: Test mysqldump failure
regex is fixed for windows.


mysql-test/t/mysqldump.test:
  Windows' suffix is accounted.
2006-05-12 12:32:44 +03:00
unknown
e1827da7fb Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-md
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-12 11:19:37 +02:00
unknown
e8a5d25bea Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
unknown
144c7622c7 Fix after merge 5.0->5.1
client/mysqlimport.c:
  Variable name changed mysql_connection -> mysql
include/violite.h:
  Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd
vio/viosslfactories.c:
  Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd
2006-05-12 09:10:04 +02:00
unknown
16d46c9cba Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/std_data/cacert.pem:
  Auto merged
mysql-test/std_data/client-cert.pem:
  Auto merged
mysql-test/std_data/client-key.pem:
  Auto merged
mysql-test/std_data/server-cert.pem:
  Auto merged
mysql-test/std_data/server-key.pem:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
client/client_priv.h:
  Merge 5.0 -> 5.1
include/violite.h:
  Merge 5.0 -> 5.1
mysql-test/Makefile.am:
  Merge 5.0 -> 5.1
mysql-test/t/disabled.def:
  Merge 5.0 -> 5.1
sql/mysqld.cc:
  Merge 5.0 -> 5.1
vio/viossl.c:
  Merge 5.0 -> 5.1
vio/viosslfactories.c:
  Merge 5.0 -> 5.1
2006-05-12 08:45:22 +02:00
unknown
0e33ad1fb0 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/mysql-5.1-19509.19509
2006-05-12 06:37:50 +02:00
unknown
77dedc31e9 removed handlerton-win.cc (again)
BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df:
  Delete: sql/handlerton-win.cc
2006-05-11 14:46:11 -05:00
unknown
e7c70398e7 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/mysql-5.1-19509
2006-05-11 21:46:10 +02:00
unknown
c58ca1a852 Merge linux.site:/home/reggie/work/mysql-5.1
into  linux.site:/home/reggie/work/mysql-5.1-test
2006-05-11 14:46:10 -05:00
unknown
060454516c Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-merge6
2006-05-11 23:46:09 +04:00
unknown
9d64fc50bc Merge mysql.com:/home/psergey/tmp_merge3
into  mysql.com:/home/psergey/mysql-5.1-merge6


configure.in:
  Auto merged
2006-05-11 23:40:40 +04:00
unknown
1b2c75d426 Merge reggie@192.168.1.107:/home/reggie/work/mysql-5.1
into  big_geek.:C:/Work/mysql/mysql-5.1-test
2006-05-11 14:14:10 -05:00
unknown
816e07e894 Merge siva.hindu.god:/usr/home/tim/m/51/a
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
2006-05-11 13:14:10 -06:00
unknown
f6c4805fae Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-merge6
2006-05-11 23:14:09 +04:00
unknown
c00a564476 Merge mysql.com:/home/psergey/tmp_merge2
into  mysql.com:/home/psergey/mysql-5.1-merge6


mysql-test/r/rpl_user_variables.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-05-11 20:44:31 +04:00
unknown
704a69eb91 Bug#19136: Manual 5.0->5.1 merge
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-05-11 20:41:11 +04:00
unknown
2dce7ff6f1 performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.
This is being pushed to a private tree and tested before being sent to the mainline.


client/CMakeLists.txt:
  Rename: client/cmakelists.txt.tmp -> client/CMakeLists.txt
libmysql/CMakeLists.txt:
  Rename: libmysql/cmakelists.txt.tmp -> libmysql/CMakeLists.txt
libmysqld/CMakeLists.txt:
  Rename: libmysqld/cmakelists.txt.tmp -> libmysqld/CMakeLists.txt
sql/CMakeLists.txt:
  Rename: sql/cmakelists.txt.tmp -> sql/CMakeLists.txt
zlib/CMakeLists.txt:
  Rename: zlib/cmakelists.txt.tmp -> zlib/CMakeLists.txt
extra/CMakeLists.txt:
  Rename: extra/cmakelists.txt.tmp -> extra/CMakeLists.txt
tests/CMakeLists.txt:
  Rename: tests/cmakelists.txt.tmp -> tests/CMakeLists.txt
extra/yassl/CMakeLists.txt:
  Rename: extra/yassl/cmakelists.txt.tmp -> extra/yassl/CMakeLists.txt
extra/yassl/taocrypt/CMakeLists.txt:
  Rename: extra/yassl/taocrypt/cmakelists.txt.tmp -> extra/yassl/taocrypt/CMakeLists.txt
storage/heap/CMakeLists.txt:
  Rename: storage/heap/cmakelists.txt.tmp -> storage/heap/CMakeLists.txt
storage/myisam/CMakeLists.txt:
  Rename: storage/myisam/cmakelists.txt.tmp -> storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt:
  Rename: storage/myisammrg/cmakelists.txt.tmp -> storage/myisammrg/CMakeLists.txt
storage/csv/CMakeLists.txt:
  Rename: storage/csv/cmakelists.txt.tmp -> storage/csv/CMakeLists.txt
storage/innobase/CMakeLists.txt:
  Rename: storage/innobase/cmakelists.txt.tmp -> storage/innobase/CMakeLists.txt
server-tools/instance-manager/CMakeLists.txt:
  Rename: server-tools/instance-manager/cmakelists.txt.tmp -> server-tools/instance-manager/CMakeLists.txt
libmysqld/examples/CMakeLists.txt:
  Rename: libmysqld/examples/cmakelists.txt.tmp -> libmysqld/examples/CMakeLists.txt
vio/CMakeLists.txt:
  Rename: vio/cmakelists.txt.tmp -> vio/CMakeLists.txt
dbug/CMakeLists.txt:
  Rename: dbug/cmakelists.txt.tmp -> dbug/CMakeLists.txt
strings/CMakeLists.txt:
  Rename: strings/cmakelists.txt.tmp -> strings/CMakeLists.txt
regex/CMakeLists.txt:
  Rename: regex/cmakelists.txt.tmp -> regex/CMakeLists.txt
mysys/CMakeLists.txt:
  Rename: mysys/cmakelists.txt.tmp -> mysys/CMakeLists.txt
storage/archive/CMakeLists.txt:
  Rename: storage/archive/cmakelists.txt.tmp -> storage/archive/CMakeLists.txt
storage/bdb/CMakeLists.txt:
  Rename: storage/bdb/cmakelists.txt.tmp -> storage/bdb/CMakeLists.txt
storage/blackhole/CMakeLists.txt:
  Rename: storage/blackhole/cmakelists.txt.tmp -> storage/blackhole/CMakeLists.txt
storage/example/CMakeLists.txt:
  Rename: storage/example/cmakelists.txt.tmp -> storage/example/CMakeLists.txt
CMakeLists.txt:
  Rename: cmakelists.txt.tmp -> CMakeLists.txt
2006-05-11 11:29:08 -05:00
unknown
a04f6024b0 bringing handlerton-win.cc back after incorrectly deleteing it. It is not needed for 5.1 or later but is used by 5.0
sql/handlerton-win.cc:
  Rename: BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df -> sql/handlerton-win.cc
2006-05-11 11:06:35 -05:00
unknown
ca42197d95 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-merge5
2006-05-11 20:06:34 +04:00
unknown
75066a6ab6 Merge mysql.com:/home/psergey/tmp_merge
into  mysql.com:/home/psergey/mysql-5.1-merge5


sql/sql_select.cc:
  Auto merged
2006-05-11 18:41:53 +04:00
unknown
a8cabd1876 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-11 13:46:43 +02:00
unknown
fb063522ee Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/mysql-5.1-19509


sql/sql_acl.cc:
  Auto merged
2006-05-11 12:33:43 +02:00
unknown
4db329fb98 Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.1-merge


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-05-11 11:28:56 +04:00
unknown
a2fe772b11 Merge siva.hindu.god:/usr/home/tim/m/51/a
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
2006-05-10 18:10:17 -06:00
unknown
7c11c31196 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-11 01:41:39 +02:00
unknown
f82ae1c556 rpl_log.test:
Remove comments not needed


mysql-test/extra/rpl_tests/rpl_log.test:
  Remove comments not needed
2006-05-11 00:59:34 +02:00
unknown
c4c0e1edd5 rpl_log.test:
Correct fix for test bug #19158


mysql-test/extra/rpl_tests/rpl_log.test:
  Correct fix for test bug #19158
2006-05-11 00:58:13 +02:00
unknown
bd4841911e Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
2006-05-10 21:44:11 +02:00
unknown
ad97a0d0ab Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
2006-05-10 21:38:48 +02:00
unknown
fad18fe995 Add missing drop table 2006-05-10 21:35:05 +02:00
unknown
1f5189294a Update test results for 5.1 2006-05-10 20:39:26 +02:00
unknown
25770e364e Merge siva.hindu.god:/usr/home/tim/m/51/a
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
2006-05-10 12:05:33 -06:00
unknown
10a0474e9a Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-10 20:01:35 +02:00
unknown
741c257f48 apparently "sinclude" is consireded by aclocal (up to 1.9.5)
by a dirty word, and it complains about it, even in a comment.
2006-05-10 13:57:58 -04:00
unknown
3c0ca0ce2d Bug #6061 mysql-log-rotate script - error logging doesn't use new file
- Fix mysqld_safe so that it always passes correct --log-error argument to mysqld
- A few other minor clean-ups to mysqld_safe


scripts/mysqld_safe.sh:
  Bug #6061 mysql-log-rotate script - error logging doesn't use new file
  
  - Change mysqld_safe to pass --log-error to mysqld in all cases.  The old behavior was to usually "swallow" the --log-error=file.name argument, which caused mysqld to write to stderr and not be able to flush the error log file.  Ironically, passing --log-error (with no file name) seemed to work fine, because mysqld_safe didn't recognize it and passed it on to mysqld as an unknown option.
  - Ensure that the error log file matches what mysqld uses; in particular, add ".err" if given a --log-error argument with no extension, and add "$DATADIR" to the front of a relative path
  - Various other mysqld_safe clean-ups while there - quote arguments properly, remove some redundant code
2006-05-10 11:33:36 -06:00
unknown
2eeab0b0d8 BUG#18233 - Memory tables INDEX USING HASH (a,b) returns 1 row on
SELECT WHERE a= AND b=

Selecting data from memory table with varchar column and hash index over it
returns only first row matched.

Problem was that key length calculation for varchar columns didn't include
number of bytes to store length.

Fixed key length for varchar fields to include number of bytes to store length.


heap/hp_create.c:
  Fixed key length for varchar fields to include number of bytes to store length.
mysql-test/r/heap.result:
  Testcase for BUG#18233.
mysql-test/t/heap.test:
  Testcase for BUG#18233.
2006-05-10 21:50:04 +05:00
unknown
4adabc64d9 Merge mysql.com:/M51/unittest-5.1 into mysql.com:/M51/mysql-5.1 2006-05-10 18:10:50 +02:00
unknown
4b1d0f9ff6 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2006-05-10 18:08:50 +02:00
unknown
80f7d16408 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
2006-05-10 11:45:40 -04:00
unknown
f543e65564 Several "unittest" files : Ensure that the configure result is used when compiling them.
unittest/examples/no_plan.t.c:
  Ensure that the "configure" result is used when compiling this module.
unittest/examples/skip_all.t.c:
  Ensure that the configure result is used when compiling this module.
unittest/examples/todo.t.c:
  Ensure that the configure result is used when compiling this module.
unittest/mytap/t/basic.t.c:
  Ensure that the configure result is used when compiling this module.
2006-05-10 17:29:28 +02:00
unknown
bf6524db26 a workaround for aclocal-1.8 bug 2006-05-10 11:27:38 -04:00
unknown
e95a7e88b7 Update results to 5.1 format 2006-05-10 16:58:44 +02:00
unknown
5aab9f40f9 Merge 5.0 to 5.1
sql/sql_show.cc:
  Add the variable "limited_mysql_mode" to function 'store_create_info'
2006-05-10 15:54:51 +02:00