Commit graph

33024 commits

Author SHA1 Message Date
unknown
2ccae984d1 Merge mysql.com:/home/jimw/my/mysql-5.0-13601
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-10 11:23:30 -07:00
unknown
e10f0d9b98 Make line endings consistent, use Unix format 2006-04-10 20:04:36 +02:00
unknown
42d7e8c087 BUG#18750: Various problems with partition names, quotation marks
mysql-test/r/partition.result:
  Added new test cases
mysql-test/t/partition.test:
  Added new test cases
sql/partition_info.cc:
  Check partition names that they don't have trailing spaces
sql/share/errmsg.txt:
  Added error code for wrong partition names
sql/sql_partition.cc:
  New method to add partition name strings, ignore OPTION_SHOW_QUOTE_CREATE
sql/sql_show.cc:
  require_quotes had a bug with identifiers that consisted of only digits,
  these are allowed identifiers but must be quoted and require_quote didn't
  tell this.
sql/sql_yacc.yy:
  Partition names should identifers and not ident_or_text
2006-04-10 13:48:58 -04:00
unknown
1b0211921b Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17946
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug15561
2006-04-10 13:12:28 -04:00
unknown
4e1682ab15 BUG*#17946: New test case for already fixed bug (Problem with LIKE searches for partitioned tables)
Added new test case for bug 17946


mysql-test/r/partition_pruning.result:
  Added new test case for bug 17946
mysql-test/t/partition_pruning.test:
  Added new test case for bug 17946
2006-04-10 13:07:50 -04:00
unknown
070f757cb0 Update readme file with instructions for VCExpress and Platform SDK 2006-04-10 18:44:55 +02:00
unknown
f8970214f7 Remove unused variables and label
libmysqld/lib_sql.cc:
  Remove unused variable and unused label
server-tools/instance-manager/guardian.cc:
  Remove unused variable
server-tools/instance-manager/mysql_connection.cc:
  Add cast to avoid warning
sql/ha_partition.cc:
  Remove unused variable(s) and an unused label
2006-04-10 18:34:18 +02:00
unknown
748b6043f6 Add CSV storage engine to cmake files 2006-04-10 18:18:29 +02:00
unknown
9f64974891 Step 1 in removing mysql-test-run.sh from 5.1 and up
Makefile.am:
  Change make test, make test-full, make test-force and make test-force-full to use mysql-test-run.pl
mysql-test/mysql-test-run.sh:
  Add nag message to mysql-test-run.sh taht indicates it will soon be removed.
2006-04-10 18:08:54 +02:00
unknown
3931b4f3f2 Merge mysql.com:/usr/local/mysql/mysql-5.0-fixcast
into  mysql.com:/usr/local/mysql/mysql-5.0-tmp
2006-04-10 17:58:22 +02:00
unknown
35d9a7b874 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2006-04-10 17:58:21 +02:00
unknown
69cf432673 Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfix
into  mysql.com:/usr/local/mysql/mysql-5.0-tmp


mysql-test/mysql-test-run.pl:
  Manual merge
2006-04-10 17:58:21 +02:00
unknown
45945b84e7 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/bugs/mysql-5.0-15868
2006-04-10 19:58:20 +04:00
unknown
eaba4f754f Merge perch.ndb.mysql.com:/home/jonas/src/51-jonas
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-10 17:54:44 +02:00
unknown
41b7ffd880 WL#2645 (mysql_upgrade tool)
client/mysql_upgrade.c:
  code fixed after the discussion
2006-04-10 20:54:43 +05:00
unknown
db916d908a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
2006-04-10 17:54:43 +02:00
unknown
475acacb83 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-10 17:54:42 +02:00
unknown
b04dd7e248 Fix for bug#18753 Partitions: auto_increment fails
Current auto increment value is placed in partition in which latest
record was saved. So to get auto_increment they have to scan
all partitions and return max value.


mysql-test/r/partition.result:
  Fix for bug#18753 Partitions: auto_increment fails
  test case
mysql-test/t/partition.test:
  Fix for bug#18753 Partitions: auto_increment fails
  test case
2006-04-10 20:54:42 +05:00
unknown
8a8d6853ae Updated disable.def file with BUG numbers, time of disable and disabler 2006-04-10 17:54:42 +02:00
unknown
5b8147062e Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-04-10 17:54:42 +02:00
unknown
339bc7214e Merging 2006-04-10 20:54:42 +05:00
unknown
e0a19fd904 Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868-work
into  mysql.com:/home/alexi/bugs/mysql-5.1-15868
 Null-merge


sql/mysqld.cc:
  Null-merge.
2006-04-10 19:54:41 +04:00
unknown
e9ea296127 Fixed BUG#15868: InnoDB hangs under 200 threads making INSERTs: 'thread thrashing'.
Applied changes due Heikki Tuuri.


sql/mysqld.cc:
  Set innodb_thread_concurrency default value to 8 (Bug#15868).
   Changes due to Heikki Tuuri.
2006-04-10 19:47:41 +04:00
unknown
97ba7d512d Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-10 17:07:32 +02:00
unknown
f1fde80ad0 ndb -
fix all valgrind warnings in t/ndb_dd (except replication related)


sql/ha_ndbcluster.cc:
  Fix memleak
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Fix valgrind warning
storage/ndb/include/kernel/signaldata/DropFilegroup.hpp:
  Fix valgrind warning
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Fix valgrind warning
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix valgrind warning
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Fix valgrind warning
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix valgrind warning
storage/ndb/src/ndbapi/ndberror.c:
  Fix valgrind warning
2006-04-10 17:06:33 +02:00
unknown
4f99f11e9c WL#3206 (Adding unit tests):
Added 'test' target to build and run tests. Added documentation.
Added README.txt files. Fixing problem with initialization of
the Test::Harness::Straps replacement. Added code to filter out non-
test directories.


unittest/Makefile.am:
  Adding 'test' target to build and run tests.
unittest/examples/skip.t.c:
  Changing text for skip reason.
unittest/examples/skip_all.t.c:
  Changing text for skip reason.
unittest/mytap/tap.c:
  Adding copyright. Adding documentation. Minor code changes.
unittest/mytap/tap.h:
  Adding copyright. Adding documentation.
unittest/unit.pl:
  Initializing replacement Test::Harness::Straps properly.
  Adding code to filter non-test directories from default directories
  to use.
unittest/README.txt:
  New BitKeeper file ``unittest/README.txt''
2006-04-10 17:06:12 +02:00
unknown
6658c6d30f Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug15561
2006-04-10 10:52:25 -04:00
unknown
b6fa5bb047 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18423
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug15561
2006-04-10 10:51:21 -04:00
unknown
8a43d4afee BUG#18423: Added test case for this bug that was already fixed (was issue with hash partitions not showing all rows in BETWEEN range
Added test case for bug 18423


mysql-test/r/partition_hash.result:
  Added test case for bug 18423
mysql-test/t/partition_hash.test:
  Added test case for bug 18423
2006-04-10 10:44:47 -04:00
unknown
41fa40e8c2 BUG#18752: Added test case for SHOW CREATE TABLE not showing NULL values properly in bug already fixed
Added new test case for bug 18752 (bug already fixed by previous patch)


mysql-test/r/partition.result:
  Added new test case for bug 18752 (bug already fixed by previous patch)
mysql-test/t/partition.test:
  Added new test case for bug 18752 (bug already fixed by previous patch)
2006-04-10 10:18:57 -04:00
unknown
7c45e6156d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
2006-04-10 16:10:19 +02:00
unknown
4618e6eccd Bug #18932: Cluster binlog mysqld accepts updating although binlog not setup
sql/ha_ndbcluster.cc:
  Bug #18932: Cluster binlog mysqld accepts updating although binlog not setup
  - put ndb tables in read only until binlog is setup properly
sql/ha_ndbcluster_binlog.cc:
  Bug #18932: Cluster binlog mysqld accepts updating although binlog not setup
  - put ndb tables in read only until binlog is setup properly
2006-04-10 16:08:40 +02:00
unknown
ebf409a8be perform sync slave with master in rpl_ndb_blob2 to ensure that tables get properly dropped on slave...
- has been causing failed later tests e.g. rpl_ndb_trig004
2006-04-10 16:06:28 +02:00
unknown
8386cfd73e BUG#15561: Possible to strange things with partitions defined although no partition support compiled in
Added an #ifdef to ensure we get syntax error when using partitioned synytax and no partition support is compiled in.


sql/lex.h:
  Added an #ifdef to ensure we get syntax error when using partitioned synytax and no partition support is compiled in.
2006-04-10 10:00:08 -04:00
unknown
f7af64abda Merge 192.168.0.20:mysql/bug15069/my51-bug15069
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


libmysql/Makefile.shared:
  Auto merged
mysys/Makefile.am:
  Auto merged
2006-04-10 15:14:47 +02:00
unknown
c458f5ae93 Merge 192.168.0.20:mysql/bug15069/my50-bug15069
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


libmysql/Makefile.shared:
  Auto merged
2006-04-10 15:13:30 +02:00
unknown
7672a2264a Merge shellback.(none):/home/msvensson/mysql/bug15069/my50-bug15069
into  shellback.(none):/home/msvensson/mysql/bug15069/my51-bug15069


mysys/Makefile.am:
  Auto merged
mysys/default.c:
  Auto merged
2006-04-10 15:13:11 +02:00
unknown
f2ff24bd62 Bug#15069 [patch] my_print_defaults does'nt care --sysconfdir
- Grab the path from "configure --sysconfdir=<path>" and set it as
   the first place to look for my.cnf files
   Do this both in Makefiles for libmysql and mysys
 - Patch provided by Francesco Riosa. Thank you!


libmysql/Makefile.shared:
  Grab the path from "--sysconfdir=<path>" into the defined variable DEFAULT_SYSYCONFDIR
mysys/Makefile.am:
  Grab the path from "--sysconfdir=<path>" into the defined variable DEFAULT_SYSYCONFDIR
mysys/default.c:
  Use DEFAULT_SYSCONFDIR as first place to look for my.cnf file if "--sysconfdir=<path>" been specified as argument to configure
2006-04-10 15:11:37 +02:00
unknown
ff343a415e mysql-test-run.pl:
Added --ndbcluster_port for backward compatibility
make_win_src_distribution.sh:
  Updated to reflect 5.1 changes


scripts/make_win_src_distribution.sh:
  Updated to reflect 5.1 changes
mysql-test/mysql-test-run.pl:
  Added --ndbcluster_port for backward compatibility
2006-04-10 14:15:02 +02:00
unknown
d94f4a42a1 ndb -
still some valgrind varnings


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  still some valgrind varnings
2006-04-10 14:14:28 +02:00
unknown
07bc8d8b37 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-04-10 14:06:06 +02:00
unknown
7844160c23 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  merge
2006-04-10 14:04:15 +02:00
unknown
10ff221539 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-04-10 14:03:00 +02:00
unknown
5c4eb337b0 ndb - bug#17607
5.0->5.1 merge


storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  merge
2006-04-10 14:02:13 +02:00
unknown
5bdf4ce46a ndb - bug#17607
4.1->5.0 merge


ndb/src/kernel/blocks/backup/Backup.cpp:
  post merge fix
2006-04-10 13:51:43 +02:00
unknown
07a477fa2e Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/backup/BackupInit.cpp:
  merge
2006-04-10 13:48:26 +02:00
unknown
6187359960 ndb - bug#17607
fix correct frag count in Backup block


ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Fix correct no of fragment records
2006-04-10 13:45:33 +02:00
unknown
c4c9d4fb8c Update implementation of new function 'mysql_get_ssl_cipher' after review
client/mysql.cc:
  Only call mysql_get_ssl_cipher once, save the result in variable "status"
libmysql/libmysql.def:
  Add new function mysql_get_ssl_cipher to exported functions in dll
sql-common/client.c:
  Add missing return(DBUG_RETURN)
2006-04-10 12:23:20 +02:00
unknown
a67450b741 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-10 09:56:57 +02:00
unknown
c48ded66d3 Fix test case 'cast' on Windows, different floating point output format. 2006-04-10 09:31:46 +02:00