Commit graph

32114 commits

Author SHA1 Message Date
unknown
66f7f0869b Moved cmake scripts into the proper directories
sql/cmakelists.txt:
  Rename: sql/sql -> sql/cmakelists.txt
zlib/cmakelists.txt:
  Rename: win/cmakefiles/zlib -> zlib/cmakelists.txt
vio/cmakelists.txt:
  Rename: win/cmakefiles/vio -> vio/cmakelists.txt
regex/cmakelists.txt:
  Rename: win/cmakefiles/regex -> regex/cmakelists.txt
mysys/cmakelists.txt:
  Rename: win/cmakefiles/mysys -> mysys/cmakelists.txt
cmakelists.txt:
  Rename: win/cmakefiles/base -> cmakelists.txt
dbug/cmakelists.txt:
  Rename: win/cmakefiles/dbug -> dbug/cmakelists.txt
strings/cmakelists.txt:
  Rename: win/cmakefiles/strings -> strings/cmakelists.txt
libmysql/cmakelists.txt:
  Rename: win/cmakefiles/libmysql -> libmysql/cmakelists.txt
client/cmakelists.txt:
  Rename: win/cmakefiles/client -> client/cmakelists.txt
extra/cmakelists.txt:
  Rename: win/cmakefiles/extra -> extra/cmakelists.txt
tests/cmakelists.txt:
  Rename: win/cmakefiles/tests -> tests/cmakelists.txt
server-tools/instance-manager/cmakelists.txt:
  Rename: win/cmakefiles/im -> server-tools/instance-manager/cmakelists.txt
storage/heap/cmakelists.txt:
  Rename: win/cmakefiles/heap -> storage/heap/cmakelists.txt
storage/myisam/cmakelists.txt:
  Rename: win/cmakefiles/myisam -> storage/myisam/cmakelists.txt
storage/myisammrg/cmakelists.txt:
  Rename: win/cmakefiles/myisammrg -> storage/myisammrg/cmakelists.txt
storage/bdb/cmakelists.txt:
  Rename: win/cmakefiles/bdb -> storage/bdb/cmakelists.txt
storage/innobase/cmakelists.txt:
  Rename: win/cmakefiles/innobase -> storage/innobase/cmakelists.txt
extra/yassl/cmakelists.txt:
  Rename: win/cmakefiles/yassl -> extra/yassl/cmakelists.txt
extra/yassl/taocrypt/cmakelists.txt:
  Rename: win/cmakefiles/taocrypt -> extra/yassl/taocrypt/cmakelists.txt
BitKeeper/deleted/.del-deploy.bat~f6b42340:
  Delete: win/cmakefiles/deploy.bat
2006-03-15 10:22:12 -06:00
unknown
0a9146541d Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new
2006-03-15 16:59:54 +01:00
unknown
28036f38ef Bug#18208 SBR fails to replicate auto_increment values for Cluster
- Replication of tables with autoincrement not supported when maste and or slave uses storage engine "ndb"


mysql-test/t/disabled.def:
  Remove disabling of testscase
mysql-test/t/rpl_ndb_multi_update2.test:
  Only run this test when row based replication is available
2006-03-15 16:29:25 +01:00
unknown
1be89333f2 Changed storage engine to be ndb 2006-03-15 16:02:11 +01:00
unknown
eb5824d64b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  ibmlab.site:/home/my/bk/mysql-5.1-new
2006-03-15 14:08:59 +02:00
unknown
d38785aa6a Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  xgeek.:C:/work/mysql-5.1
2006-03-15 05:23:01 -06:00
unknown
f70aa02753 README:
new file
2006-03-15 05:20:27 -06:00
unknown
4a4b65772e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new/
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18171
2006-03-15 15:07:13 +04:00
unknown
afab172a1d Bug#18250 (Truncate table replicate both as statement and as individual
rows for SEs using injector):
Table truncation ("DELETE FROM t1" and "TRUNCATE t1") was logged as
a statement even when the storage engine deletes the rows individually
using the injector.


sql/sql_delete.cc:
  Don't log a truncate statement if the storage engine is using the injector.
2006-03-15 11:21:36 +01:00
unknown
5cb93cc314 Bug #17722 Test 'partition_02myisam' hangs on Windows
The problem where is that Visual Studio 8 includes new security features to help write more secure code.  One of these features is parameter validation.  Many of the CRT functions, including lseek, assert on illegal parameter values in debug builds.  They also call parameter validation callback routines that can be registered.  We solve this problem by defaulting the error value to -1 and then only calling lseek if the fd != -1.

my_seek.c:
  Only call lseek if the fd is not -1 on Windows


mysys/my_seek.c:
  Only call lseek if the fd is not -1 on Windows
2006-03-15 10:25:42 +01:00
unknown
adf82864a9 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  ibmlab.site:/home/my/bk/mysql-5.1-new
2006-03-15 10:19:24 +02:00
unknown
03e84028d7 sql:
removed double entries for sql_yacc.* and added -p MYSQL define to call to bison


win/cmakefiles/sql:
  removed double entries for sql_yacc.* and added -p MYSQL define to call to bison
2006-03-15 02:16:16 -06:00
unknown
4b4a13a150 Extended test case to check that binary column
actually adds zeroes, not spaces at the end.
2006-03-15 10:14:35 +02:00
unknown
1dc87feb20 xml.result, xml.test:
Adding test.
item_xmlfunc.cc:
  Bug #18171 XML: ExtractValue: the XPath position() function crashes the server!
  Disallowing use of position() and last() without context.


sql/item_xmlfunc.cc:
  Bug #18171 XML: ExtractValue: the XPath position() function crashes the server!
  Disallowing use of position() and last() without context.
mysql-test/t/xml.test:
  Adding test.
mysql-test/r/xml.result:
  Adding test.
2006-03-15 11:57:37 +04:00
unknown
8ba02d7270 Added a test case for Bug#18038 MySQL server corrupts binary columns data 2006-03-15 09:40:30 +02:00
unknown
3d831d342f 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-15 08:25:46 +01:00
unknown
d4df3f23ea Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  ibmlab.site:/home/my/bk/mysql-5.1-new
2006-03-15 09:02:21 +02:00
unknown
d15c797900 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
into  kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0-r1.2084
2006-03-14 13:32:48 -06:00
unknown
4ac5afa3b9 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0-r1.2084
into  kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.1


sql/mysqld.cc:
  Auto merged
2006-03-14 13:28:24 -06:00
unknown
232dec09d9 mysqld.cc:
Backport option description change from 5.1 to 5.0.


sql/mysqld.cc:
  Backport option description change from 5.1 to 5.0.
2006-03-14 13:26:28 -06:00
unknown
07487439b0 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug16370
2006-03-14 09:41:14 -08:00
unknown
ac4219fad8 Fixing test cases 2006-03-14 09:37:29 -08:00
unknown
5da3a478a1 sql_select.cc:
Afterfix for bug#17366: Unchecked Item_int results in server crash


sql/sql_select.cc:
  Afterfix for bug#17366: Unchecked Item_int results in server crash
2006-03-14 18:49:37 +03:00
unknown
efa4f8a8ba Re commit of previous fix as the bk tree was broken. 2006-03-14 17:46:25 +02:00
unknown
3d4ab61c3c 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-14 16:20:56 +01:00
unknown
3210272858 Fixed typo in debug printout 2006-03-14 15:43:28 +01:00
unknown
4a553ed64d Fix for bug#17899 Partitions: crash, NDB, Select .. ORDER BY 2006-03-14 15:27:38 +01:00
unknown
bff2fc2210 Bug#18195 MySQL on Windows not built with YaSSL correctly
- Add HAVE_OPENSSL and HAVE_YASSL to config-win.h


include/config-win.h:
  Define HAVE_OPENSSL and HAVE_YASSL to make the server and client enable SSL support
2006-03-14 14:51:48 +01:00
unknown
890eca7504 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new
2006-03-14 14:23:41 +01:00
unknown
a25060978f Re-enabling rpl_rbr_to_sbr.test as BUG#18108 was fixed
(nothing to document, this bug was not released).



mysql-test/t/disabled.def:
  bug is fixed, enabling test case
mysql-test/t/rpl_rbr_to_sbr.test:
  making test portable
mysql-test/r/rpl_rbr_to_sbr.result:
  result update
2006-03-14 14:21:28 +01:00
unknown
09f54a2e5e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into sunlight.local:/work_local/17336-bug-5.0-mysql


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
2006-03-14 15:33:13 +03:00
unknown
86293ca6fd Manual merge 2006-03-14 03:46:12 -08:00
unknown
d99924098f Merge zim.(none):/home/mikael/bug17127
into  zim.(none):/home/mikael/bug16370


sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
2006-03-14 02:50:29 -08:00
unknown
9d651ab13e Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug16370


sql/sql_yacc.yy:
  Auto merged
2006-03-14 02:39:24 -08:00
unknown
b08527fb1b Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug17127


sql/sql_yacc.yy:
  Auto merged
2006-03-14 02:37:24 -08:00
unknown
69275d40e3 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug17127


sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
2006-03-14 02:32:46 -08:00
unknown
b34f450021 Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0
into  mysql.com:/home/hartmut/projects/mysql/bk-clean/5.1


mysql-test/mysql-test-run.pl:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
2006-03-14 11:25:15 +01:00
unknown
07919a4d13 relying on loop counter variables being local to the loop body if
declared in the 'for' statement is not portable, some compilers
still don't implement this ANSI C++ specification (Bug #14995)
2006-03-14 11:13:41 +01:00
unknown
c71dd8c145 Manual merge 2006-03-14 01:39:27 -08:00
unknown
06dde3aae8 Merge zim.(none):/home/mikael/bug15961
into  zim.(none):/home/mikael/bug16370


sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
2006-03-14 01:24:06 -08:00
unknown
9fd99c1b64 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug16370


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
sql/sql_partition.cc:
  manual merge
2006-03-14 01:07:29 -08:00
unknown
4ee001c5f1 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug15961


sql/share/errmsg.txt:
  Auto merged
sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
2006-03-14 00:51:44 -08:00
unknown
60d5f457c8 BUG#15961: After review fixes
New error message


sql/share/errmsg.txt:
  New error message
sql/sql_partition.cc:
  New error message
2006-03-14 00:39:06 -08:00
unknown
0430352bdb Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new
2006-03-14 09:00:45 +01:00
unknown
6048eb31ae Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-03-13 10:59:42 -08:00
unknown
628e86df11 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  production.mysql.com:/usersnfs/gbichot/mysql-5.1-new
2006-03-13 19:59:27 +01:00
unknown
8ba5a687ed Fixed bug#17366: Unchecked Item_int results in server crash
When there is conjunction of conds, the substitute_for_best_equal_field()
will call the eliminate_item_equal() function in loop to build final
expression. But if eliminate_item_equal() finds that some cond will always
evaluate to 0, then that cond will be substituted by Item_int with value ==
0. In this case on the next iteration eliminate_item_equal() will get that 
Item_int and treat it as Item_cond. This is leads to memory corruption and
server crash on cleanup phase.

To the eliminate_item_equal() function was added DBUG_ASSERT for checking
that all items treaten as Item_cond are really Item_cond.
The substitute_for_best_equal_field() now checks that if
eliminate_item_equal() returns Item_int and it's value is 0 then this 
value is returned as the result of whole conjunction.


mysql-test/t/subselect.test:
  Added test for bug#17366: Unchecked Item_int results in server crash
mysql-test/r/subselect.result:
   Added test for bug#17366: Unchecked Item_int results in server crash
sql/sql_select.cc:
  Fixed bug#17366: Unchecked Item_int results in server crash
   
  To the eliminate_item_equal() function was added DBUG_ASSERT for checking
  that all items treaten as Item_cond are really Item_cond.
  The substitute_for_best_equal_field() now checks that if
  eliminate_item_equal() returns something other than Item_cond and if it is
  then this value is returned as the result of whole conjunction.
2006-03-13 21:11:15 +03:00
unknown
ed0442b0a1 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug16370


sql/sql_yacc.yy:
  Auto merged
2006-03-13 09:59:07 -08:00
unknown
d0b16b6ee5 mysqld.cc:
Revise option description. And let's put it in the proper
  lexical order within the option list.


sql/mysqld.cc:
  Revise option description. And let's put it in the proper
  lexical order within the option list.
2006-03-13 11:58:36 -06:00
unknown
c472bdbafa BUG #16810: Error on coalesce partition
New test case (bug was already fixed)


mysql-test/r/ndb_partition_key.result:
  New test case
mysql-test/t/ndb_partition_key.test:
  New test case
2006-03-13 09:09:25 -08:00