Commit graph

31463 commits

Author SHA1 Message Date
unknown
3388a7632f Merge reggie@linux:/home/reggie/work/mysql-5.1
into  big_geek.:C:/Work/mysql/mysql-5.1-bug17720
2006-03-04 16:16:15 -06:00
unknown
5f7059219f Bug #17720 Partition ALTER TABLE fails on rename of .MYI file
Fix this by passing the HA_EXTRA_PREPARE_FOR_DELETE onto the newly added or about to be dropped partitions
so they have an opportunity to close their OS file handle.


client/mysqltest.c:
  prevent positive find of pattern when pattern has zero length (this has nothing to do with this bug fix)
sql/ha_partition.cc:
  initialize m_new_file to NULL
  call new function prepare_for_delete for the HA_EXTRA_PREPARE_FOR_DELETE operation
  inside prepare_for_delete, loop over m_new_file and m_reorged_file if they are non-NULL
sql/ha_partition.h:
  added decl for new prepare_for_delete function
2006-03-04 14:21:27 -06:00
unknown
85d59f4c88 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/sql_partition.cc:
  Auto merged
2006-03-03 08:44:03 -06:00
unknown
405177f1cd Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-03 15:44:02 +01:00
unknown
6ef92d62ca Merge mysql.com:/extern/mysql/bk/mysql-5.1-new
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 15:02:37 +01:00
unknown
73e4c47403 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16316
2006-03-03 17:00:03 +04:00
unknown
d9773c1371 Merge mysql.com:/extern/mysql/bk/mysql-5.1-new
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 13:25:02 +01:00
unknown
5a78cd7a72 Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/skip_grants.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
VC++Files/mysql.sln:
  Manual merge (use local).
configure.in:
  Manual merge.
sql/table.cc:
  Manual merge.
2006-03-03 12:03:27 +01:00
unknown
7464c9f379 ndb - blob tables vs dict cache : patch 2 - bug#17761 (maybe)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  by-pass dict cache when creating blob event op
  does get event using table stored under main event op
  in preparation to remove blob tables from dict cache
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  by-pass dict cache when creating blob event op
  does get event using table stored under main event op
  in preparation to remove blob tables from dict cache
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  by-pass dict cache when creating blob event op
  does get event using table stored under main event op
  in preparation to remove blob tables from dict cache
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  by-pass dict cache when creating blob event op
  does get event using table stored under main event op
  in preparation to remove blob tables from dict cache
2006-03-03 11:16:56 +01:00
unknown
026fd2700b Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-03 09:08:44 +01:00
unknown
e2ba74b825 Expanding a binary field should result in 0x00-filled positions, not 0x20
(ASCII space).  For Bug#16857.


sql/field_conv.cc:
  Bug#16857:  Do not expand BINARY fields as if they are strings (which 
  presumably /should/ be filled with spaces).  Instead, fill BINARY fields
  with 0x00 bytes.
2006-03-02 19:59:49 -05:00
unknown
104b9e789a update test
mysql-test/r/events_logs_tests.result:
  update result
2006-03-02 23:40:51 +01:00
unknown
8d7f44388b mysql-test-run.pl:
Try find in order 'mysqld-nt', 'mysqld', 'mysqld-debug' and 'mysqld-max'
mysqld_safe.sh:
  Don't try 'mysqld-max' before 'mysqld' if no server given, bug#17861


scripts/mysqld_safe.sh:
  Don't try 'mysqld-max' before 'mysqld' if no server given, bug#17861
mysql-test/mysql-test-run.pl:
  Try find in order 'mysqld-nt', 'mysqld', 'mysqld-debug' and 'mysqld-max'
2006-03-02 22:53:38 +01:00
unknown
f3f39d2b35 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug17494


sql/event_timed.cc:
  Auto merged
2006-03-02 21:02:00 +01:00
unknown
44c175b7ef Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/#17595-mysql-5.0
2006-03-02 20:52:58 +03:00
unknown
af1f9939d9 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-03-02 18:48:25 +01:00
unknown
ffd4bf5849 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
2006-03-02 16:39:43 +01:00
unknown
833e4075f0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug17494
2006-03-02 16:25:05 +01:00
unknown
cb46f3a3ea Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/bugs/mysql-5.1-merged


sql/sql_db.cc:
  Auto merged
2006-03-02 18:25:04 +03:00
unknown
15515ac5e0 Merge mysql.com:/home/alexi/bugs/mysql-5.0-16175
into  mysql.com:/home/alexi/bugs/mysql-5.1-16175


sql/sql_db.cc:
  Auto merged
2006-03-02 18:16:07 +03:00
unknown
7865ce6188 Fixed BUG#17476: Stored procedure not returning data when it is called first
time per connection
  Removed const_string() method from Item_string (it was only used in one
  place, in a bad way). Defer possible SP variable, and access data directly
  instead, in date_format item.


mysql-test/r/sp.result:
  Updated results for new test (BUG#17476).
mysql-test/t/sp.test:
  New test case (BUG#17476)
sql/item.h:
  Removed const_string() from Item_string.
  It was only used in one place, and we can just use str_value in Item directly.
sql/item_timefunc.cc:
  Must defer a (possible) local SP variable to use max_length and str_value
  in Item_func_date_format::fix_length_and_dec(), and refer to str_value
  directly without the const_string() method (now removed); the cast didn't
  work in all cases anyway.
2006-03-02 14:54:04 +01:00
unknown
2ec1d015a9 configure.in:
cloned


configure.in:
  cloned
2006-03-02 12:24:07 +01:00
unknown
7968f05873 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0 2006-03-02 11:09:16 +01:00
unknown
b65b476727 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2006-03-02 11:07:48 +01:00
unknown
c76459aca9 Bug#16316: XML: extractvalue() is case-sensitive with contains()
xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  Fixed that Item_nodeset_func derived classes
  didn't take into account charset of the XML value
  and always worked using "binary" charset.


sql/item_xmlfunc.cc:
  Bug#16316: XML: extractvalue() is case-sensitive with contains()
  Fixed that Item_nodeset_func derived classes
  didn't take into account charset of the XML value
  and always worked using "binary" charset.
mysql-test/t/xml.test:
  Adding test case.
mysql-test/r/xml.result:
  Adding test case.
2006-03-02 14:05:38 +04:00
unknown
a7edc0c637 Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0
mysql-test/mysql-test-run.sh:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
2006-03-02 11:04:05 +01:00
unknown
d5a27fd86f Bug#17279 user with no global privs and with create priv in db can create
database
 - Fix test case for systems with "lowercase names"


mysql-test/r/grant2.result:
  Fix for system with "lowercase names", allow error 1007 to be returned
mysql-test/t/grant2.test:
  Fix for system with "lowercase names", allow error 1007 to be returned
2006-03-02 11:01:58 +01:00
unknown
92ead72dc7 Make the define start at "start of line" 2006-03-02 10:55:55 +01:00
unknown
4116a4445d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-03-02 10:53:01 +01:00
unknown
da383890ae crazy - for the last week mysqlslap.test was generating 400 sigsegvs
per run, failing ALL mysql_real_connect() calls - nobody noticed,
the test always appeared to "pass".
2006-03-02 10:48:54 +01:00
unknown
b7ca534215 Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1
scripts/make_binary_distribution.sh:
  Auto merged
2006-03-02 10:48:46 +01:00
unknown
c325142448 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b14527
2006-03-02 13:43:26 +04:00
unknown
d2df7f5dac Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
2006-03-02 10:31:42 +01:00
unknown
5513aaa37c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug17494
2006-03-02 10:05:24 +01:00
unknown
24052d674a Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406


sql/event_timed.cc:
  Auto merged
2006-03-02 10:03:48 +01:00
unknown
c46518086b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.mrg
2006-03-02 12:36:56 +04:00
unknown
cc3358cfef Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9088
2006-03-02 12:35:42 +04:00
unknown
306621137a Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.9088
2006-03-02 12:34:05 +04:00
unknown
38657e1bfc Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-02 09:33:05 +01:00
unknown
3d96d86695 Bug#14527: Partitions: table unreadable if partition name = c-cedilla
sql_partition.cc:
  Changeing THD charset to utf8 when parsing a frm file.
partition_charset.test, partition_charset.result:
  new file


sql/sql_partition.cc:
  Bug#14527: Partitions: table unreadable if partition name = c-cedilla
  Changering THD charset to utf8 when parsing
  a frm file.
2006-03-02 12:25:02 +04:00
unknown
7e2a9aa459 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.16315
2006-03-02 11:44:12 +04:00
unknown
e371dcb675 fixed order by in test 2006-03-02 08:44:11 +01:00
unknown
843e9e6551 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-02 08:34:21 +01:00
unknown
526d28f36a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.16315


sql/item_xmlfunc.cc:
  Auto merged
mysql-test/r/xml.result:
  After merge fix
mysql-test/t/xml.test:
  After merge fix
2006-03-02 10:42:08 +04:00
unknown
6513ddab4d Merge mysql.com:/home/hf/work/mysql-5.0.9088
into mysql.com:/home/hf/work/mysql-5.1.mrg


mysql-test/r/bigint.result:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
2006-03-02 09:17:11 +04:00
unknown
ffa7f9439a Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  SCCS merged
2006-03-01 18:51:33 -06:00
unknown
35bb42d315 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
2006-03-01 18:44:44 -06:00
unknown
564c1d64f6 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-01 18:39:18 -06:00
unknown
5f95aa48d9 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  Auto merged
2006-03-01 18:38:19 -06:00
unknown
aa9a497d7a README:
revise README.


mysql-test/README:
  revise README.
2006-03-01 18:37:41 -06:00