Commit graph

12489 commits

Author SHA1 Message Date
unknown
f8920dd59f Bug #24947: REPEAT function returns NULL when passed a field as the count parameter
Handling of large signed/unsigned values was not consistent, so some string functions could return bogus results.
The current fix is to simply patch up the val_str() methods for those string items.
It would be good clean this code up in general, to make similar problems much harder to make.  This is left as an exercise for the reader.


mysql-test/r/func_str.result:
  Update test results for bug #24947
mysql-test/t/func_str.test:
  Add test case for bug #24947
sql/item_strfunc.cc:
  Adjust some string function Items' val_str() methods to handle large signed/unsigned arguments properly
2006-12-19 15:54:12 -07:00
unknown
d0d7cc86fa bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: ALTER TABLE must specify STORAGE explicitely to change it, + post review changes 2006-12-19 23:20:43 +01:00
unknown
81e138e150 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/sql_class.h:
  Auto merged
2006-12-19 17:12:06 +01:00
unknown
1e10672496 bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: copy tablespace from old table in copying alter table 2006-12-19 15:53:46 +01:00
unknown
cc21a4822d Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl000015.test:
  SCCS merged
mysql-test/t/rpl000017.test:
  SCCS merged
2006-12-19 15:31:10 +01:00
unknown
2eeeb9b4d3 remove hard-coded socket paths from some tests
mysql-test/t/grant_cache.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/myisam.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/query_cache_notembedded.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/rpl000015.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/rpl000017.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/rpl_rotate_logs.test:
  replace hard-coded socket paths with variable containing the appropriate path
2006-12-19 15:10:15 +01:00
unknown
93e6d00d3b WL#2862 ndb_sp.test - removed unnecessary line
mysql-test/r/ndb_sp.result:
  WL#2862
mysql-test/t/ndb_sp.test:
  WL#2862
2006-12-19 16:17:57 +03:00
unknown
ce10e6ca13 Bug #23578: Corruption prevents Optimize table from working properly with a
spatial index
 While executing OPTIMIZE TABLE on MyISAM tables the server re-creates the
 index file(s) in order to sort them physically by the key. This cannot be 
 done for R-tree indexes as it makes no sense.
 The server was not checking the type of the index and was accessing an 
 R-tree index as if it was a B-tree.
 Fixed by preventing sorting the index file if it contains an R-tree index.  
 


myisam/mi_check.c:
  Bug #23578: Corruption prevents Optimize table from working properly with a
  spatial index
   - disable sorting the index file if it contains an R-tree index.
mysql-test/r/gis-rtree.result:
  Bug #23578: Corruption prevents Optimize table from working properly with a
  spatial index
   - test case
mysql-test/t/gis-rtree.test:
  Bug #23578: Corruption prevents Optimize table from working properly with a
  spatial index
   - test case
2006-12-19 15:04:26 +02:00
unknown
3e27508554 bug #22451 (Partitions: duplicating results with ENGINE=FEDERATED)
As presently PARTITIONS + FEDERATED just doesn't work i added error message
to inform user about that.
Should be enabled again after releted WL's completion.


storage/federated/ha_federated.cc:
  partitioning disabled in FEDERATED engine
mysql-test/r/partition_federated.result:
  result added
mysql-test/t/partition_federated.test:
  test added
2006-12-19 16:37:50 +04:00
unknown
b66ab7f80b Fix for BUG#24293: '\Z' token is not handled correctly in views.
If SELECT-part of CREATE VIEW statement contains '\Z',
it is not handled correctly.

The problem was in String::print().
Symbol with code 032 (26) is replaced with '\z',
which is not supported by the lexer.

The fix is to replace the symbol with '\Z'.


mysql-test/r/view.result:
  Update result file.
mysql-test/t/view.test:
  Add test case for BUG#24293.
sql/sql_string.cc:
  We should replace 032 with \Z, since lexer does not understand \z.
2006-12-19 15:32:02 +03:00
unknown
d6bc366f44 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg


configure.in:
  Auto merged
sql/sql_class.h:
  Auto merged
2006-12-19 12:41:39 +01:00
unknown
9166c711c2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2006-12-19 10:40:53 +01:00
unknown
2b0189b812 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
2006-12-18 17:57:34 +01:00
unknown
0dc0e52db3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-12-18 18:04:26 +03:00
unknown
e0a63c810e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2006-12-18 17:47:48 +03:00
unknown
c4c6ab23c6 Merge maint1.mysql.com:/data/localhome/msvensson/mysql-5.0-maint
into  maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-new-maint


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
include/my_pthread.h:
  Manual merge
2006-12-18 14:27:51 +01:00
unknown
c6ac9185bc bug #24502 (reorganize partition closes connection)
when REORGANIZE creates new partition, no_subparts for that partition
isn't set right (call handler::set_partitions_defaults always returns 1)
Normally the number of subpartitions should be inherited from the
table.


mysql-test/r/partition.result:
  result fixed
mysql-test/t/partition.test:
  testcase
sql/sql_partition.cc:
  no_subparts is set for newly created partitions
2006-12-18 14:39:23 +04:00
unknown
71776740b6 fix for commit 1.2368 2006-12-18 12:52:59 +03:00
unknown
1aad903b71 Use MYSQLTEST_VARDIR variable 2006-12-18 10:22:48 +01:00
unknown
1b64ba4aea fix for commit 1.2368 2006-12-18 09:46:44 +03:00
unknown
185997ceaf WL#2862 2006-12-17 23:08:04 +03:00
unknown
7d2d6b8bf9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2006-12-16 03:17:50 +03:00
unknown
a6933a63c5 Bug#24997 warnings test case failure
- Move the specific test case to a separate file that is run only
   if we have a disabled handler.


mysql-test/r/warnings.result:
  Move the test for warning that table type is changed to separate file
  as it only occurs when engine is disabled.
mysql-test/t/warnings.test:
  Move the test for warning that table type is changed to separate file
  as it only occurs when engine is disabled.
mysql-test/r/warnings_engine_disabled.result:
  Move the test for warning that table type is changed to separate file
  as it only occurs when engine is disabled.
mysql-test/t/warnings_engine_disabled-master.opt:
  New BitKeeper file ``mysql-test/t/warnings_engine_disabled-master.opt''
mysql-test/t/warnings_engine_disabled.test:
  Move the test for warning that table type is changed to separate file
  as it only occurs when engine is disabled.
2006-12-15 15:05:50 +01:00
unknown
0a93477fb1 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-15 13:30:20 +01:00
unknown
e25d18d1b0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/t/rpl_openssl.test:
  Auto merged
2006-12-15 13:24:30 +01:00
unknown
acecd1caf6 Bug#19209 Test 'rpl_openssl' hangs on Windows
- Remove check not to run on windows. 


mysql-test/t/rpl_openssl.test:
  Remove check not to run on windows
2006-12-15 13:23:45 +01:00
unknown
36c0cc54b3 Merge polly.local:/tmp/maint/bug24117/my51-bug24117
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/typelib.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
2006-12-15 13:23:05 +03:00
unknown
42b630e1c7 Merge bk-internal:/home/bk/mysql-5.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


scripts/mysqld_safe.sh:
  Auto merged
2006-12-15 11:21:44 +01:00
unknown
3863e8d643 Merge polly.local:/tmp/maint/bug24117/my50-bug24117
into  polly.local:/tmp/maint/bug24117/my51-bug24117


mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
mysql-test/r/sp.result:
  Manual merge
2006-12-15 13:10:59 +03:00
unknown
acf0636e2e Bug #15439: UDF name case handling forces DELETE FROM mysql.func to remove
the UDF
When deleting a user defined function MySQL must remove it from both the
in-memory hash table and the mysql.proc system table.
Finding (and removal therefore) from the internal hash table is case 
insensitive (or whatever the default charset is), whereas finding and 
removal from the system table is case sensitive.
As a result if you supply a function name that is not in the same character
case to DROP FUNCTION the server will remove the function only from the
in-memory hash table and will keep the row in mysql.proc system table.
This will cause inconsistency between the two structures (that is fixed
only by restarting the server).
Fixed by using the name in the precise case (from the in-memory hash table)
to delete the row in the mysql.proc system table. 


mysql-test/r/udf.result:
  Bug #15439: UDF name case handling forces DELETE FROM mysql.func to remove
              the UDF
   - test case
mysql-test/t/udf.test:
  Bug #15439: UDF name case handling forces DELETE FROM mysql.func to remove
              the UDF
   - test case
sql/sql_udf.cc:
  Bug #15439: UDF name case handling forces DELETE FROM mysql.func to remove
              the UDF
   - use the exact function name in deleting from mysql.proc.
2006-12-15 11:38:30 +02:00
unknown
1747206729 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-15 09:59:26 +01:00
unknown
4d440ab0f7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
2006-12-15 09:06:15 +01:00
unknown
386b381788 bug#19956 Problems with VARCHAR primary key and BLOB fields:added test case 2006-12-15 09:03:21 +01:00
unknown
eedbe37a70 Merge siva.hindu.god:/usr/home/tim/m/bk/50
into  siva.hindu.god:/usr/home/tim/m/bk/51


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
mysql-test/r/myisam.result:
  Manual merge
mysql-test/t/myisam.test:
  Manual merge
2006-12-14 17:03:44 -07:00
unknown
3a5064205f Merge siva.hindu.god:/usr/home/tim/m/bk/41
into  siva.hindu.god:/usr/home/tim/m/bk/50


mysql-test/r/myisam.result:
  Manual merge.
mysql-test/r/symlink.result:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
mysql-test/t/symlink.test:
  Manual merge.
2006-12-14 16:51:12 -07:00
unknown
a6f4c958ca myisam.result: a test was moved from the .test file, but the results were not updated.
mysql-test/r/myisam.result:
  Fix results file - a test was moved from the .test file, but the results were not updated.
mysql-test/r/symlink.result:
  echo End of 4.1 tests while I'm here
mysql-test/t/myisam.test:
  echo End of 4.1 tests while I'm here
mysql-test/t/symlink.test:
  echo End of 4.1 tests while I'm here
2006-12-14 16:23:54 -07:00
unknown
a70b46279d Merge bk-internal:/home/bk/mysql-5.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/t/archive.test:
  SCCS merged
2006-12-15 00:14:49 +01:00
unknown
eb3b8c3cb7 Add support for loading example plugin and add plugin.test
mysql-test/r/have_dynamic_loading.require:
  Rename: mysql-test/r/have_udf.require -> mysql-test/r/have_dynamic_loading.require
mysql-test/include/have_udf.inc:
  Rename have_udf.require to hqave_dynamic_loading.require
mysql-test/mysql-test-run.pl:
  Add support for ha_example plugin
mysql-test/include/have_example_plugin.inc:
  New BitKeeper file ``mysql-test/include/have_example_plugin.inc''
mysql-test/r/have_example_plugin.require:
  New BitKeeper file ``mysql-test/r/have_example_plugin.require''
mysql-test/r/plugin.result:
  New BitKeeper file ``mysql-test/r/plugin.result''
mysql-test/t/plugin.test:
  New BitKeeper file ``mysql-test/t/plugin.test''
2006-12-15 00:09:56 +01:00
unknown
cdaa91f78e Merge siva.hindu.god:/usr/home/tim/m/bk/50
into  siva.hindu.god:/usr/home/tim/m/bk/51


client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/instance.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
include/my_pthread.h:
  Manual merge.
mysql-test/r/archive.result:
  Manual merge.
mysql-test/t/archive.test:
  Manual merge.
2006-12-14 12:56:57 -07:00
unknown
32e6771601 Merge bk-internal:/home/bk/mysql-5.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-14 19:32:17 +01:00
unknown
db1a2d2d80 Merge polly.local:/tmp/maint/bug24117/my50-bug24117
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


mysys/typelib.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
2006-12-14 21:24:52 +03:00
unknown
5b71281467 Fix for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache"
Problem:
When creating a temporary field for a temporary table in create_tmp_field_from_field(), a resulting field is created as an exact copy of an original one (in Field::new_field()). However, Field_enum and Field_set contain a pointer (typelib) to memory allocated in the parent table's MEM_ROOT, which under some circumstances may be deallocated later by the time a temporary table is used.

Solution:
Override the new_field() method for Field_enum and Field_set and create a separate copy of the typelib structure in there.


include/typelib.h:
  Added copy_typelib() declaration
mysql-test/r/sp.result:
  Added a testcase for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache"
mysql-test/t/sp.test:
  Added a testcase for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache"
mysys/typelib.c:
  Added copy_typelib() definition
sql/field.cc:
  Create a copy of the internal 'typelib' structure when copying Field_enum of Field_set objects.
sql/field.h:
  Override new_field method in Field_enum (and Field_set) to copy the typelib structure.
2006-12-14 20:58:07 +03:00
unknown
833b235b18 Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2006-12-14 16:09:15 +01:00
unknown
f05a59ec32 BUG #25074
mysql_upgrade test gives inconsitent results
2006-12-14 10:07:17 -05:00
unknown
931dcc8a83 Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-12-14 16:04:07 +01:00
unknown
e21242fef8 Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
into  naruto.:C:/cpp/mysql-4.1-maint
2006-12-14 16:02:43 +01:00
unknown
2772d72a93 Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
into  naruto.:C:/cpp/mysql-5.0-maint
2006-12-14 15:52:06 +01:00
unknown
c4b2bee9a1 Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint


mysql-test/t/myisam.test:
  SCCS merged
2006-12-14 15:30:00 +01:00
unknown
8359968b51 Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-12-14 14:50:08 +01:00
unknown
6d310813ba After merge fix for Bug N22645 2006-12-14 17:48:32 +04:00