Commit graph

19939 commits

Author SHA1 Message Date
unknown
6fb8a4e915 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-11-25 10:56:01 +01:00
unknown
e1af5e5dfd Updated expected error 2005-11-25 10:41:22 +01:00
unknown
44662d2c69 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14482-bug-4.1-mysql
2005-11-24 19:17:31 +03:00
unknown
3190b21f95 Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused
crash

resolve_const_item() substitutes item which will evaluate to constant with
equvalent constant item, basing on the item's result type. In this case
subselect was resolved as constant, and resolve_const_item() was substituting
it's result's Item_caches to Item_null. Later Item_cache's function was called
for Item_null object, which caused server crash.

resolve_const_item() now substitutes constants for items with 
result_type == ROW_RESULT only for Item_rows.


sql/item.cc:
  Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused
  crash
  
  resolve_const_item() now applies optimization for items with
  result_type == ROW_RESULT only to Item_rows.
mysql-test/t/select.test:
  Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash
mysql-test/r/select.result:
  Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash
2005-11-24 19:16:51 +03:00
unknown
c3423d0d91 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
2005-11-24 16:21:49 +01:00
unknown
102c0281fa Moved check of wrong schema version earlier 2005-11-24 16:21:07 +01:00
unknown
ddf89750ea Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-11-23 09:38:12 +01:00
unknown
6a6caf565d support-files/mysql.spec.sh
Fix a possible problem on RPM un-install. bug#15145


support-files/mysql.spec.sh:
  Extend the file existence check for "init.d/mysql" on un-install
  to also guard the call to "insserv"/"chkconfig".
  bug#15145, br#5369 / 5586, csc#7129
2005-11-22 19:58:58 +01:00
unknown
9f2a2b9a3b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-11-21 13:42:36 +01:00
unknown
31ea9f945d Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabled 2005-11-21 16:09:26 +04:00
unknown
749b747d2e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
2005-11-21 12:28:36 +01:00
unknown
95b92b4369 Bug #14514 Creating table with packed key fails silently
- Backport from 5.0


include/my_base.h:
  Rename HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE, ie. it's a bit in the table_options variable
mysql-test/r/ndb_basic.result:
  Add test result
mysql-test/t/ndb_basic.test:
  Add test case for bug14514
sql/ha_ndbcluster.cc:
  Use new bitmask for table_options to detect if create from engine
sql/handler.cc:
  Use new bit for create from engine
2005-11-21 12:27:58 +01:00
unknown
1dfaaba874 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-11-21 08:42:36 +01:00
unknown
83bbd30c48 configure.in:
Corrected "include/readline" link for "make distcheck"


configure.in:
  Corrected "include/readline" linke for "make distcheck"
2005-11-19 12:58:22 +01:00
unknown
34bbdf0613 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck


configure.in:
  Auto merged
2005-11-19 11:11:09 +01:00
unknown
bb8bee51e4 Disabled --ps-protocol during autodiscover test 2005-11-18 12:20:22 +01:00
unknown
dadce564f8 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-11-18 10:14:27 +01:00
unknown
421dadf74f Merge mysql.com:/home/jimw/my/mysql-4.1-14801
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-11-17 11:44:15 -08:00
unknown
58196d39d4 Merge mysql.com:/home/jimw/my/mysql-4.1-12640
into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
2005-11-17 10:59:21 -08:00
unknown
ab816dca91 Merge mysql.com:/home/jimw/my/mysql-4.1-11796
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-11-17 10:58:46 -08:00
unknown
3fd5759a74 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-4.1
2005-11-17 13:44:34 +01:00
unknown
a710414c87 Fixed incorrectly use if table with wrong schema version 2005-11-17 12:45:23 +01:00
unknown
d88df3a316 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
2005-11-16 21:18:13 -07:00
unknown
4d93df7914 fixed the race condition in the test case for BUG#7947 2005-11-16 21:17:38 -07:00
unknown
771478f209 Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-11-16 21:33:38 +01:00
unknown
2432bc8fee Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/export/space/pekka/ndb/version/my41-r1.2456.1.1
2005-11-16 13:28:54 +01:00
unknown
563e5c8d79 ndb - bug#14007 4.1 [re-commit for LenZ merge]
mysql-test/r/ndb_charset.result:
  bug#14007 test [re-commit]
mysql-test/t/ndb_charset.test:
  bug#14007 test [re-commit]
ndb/include/kernel/AttributeDescriptor.hpp:
  bug#14007 4.1 need getSizeInBytes [re-commit]
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  bug#14007 4.1 *** do not AUTOmerge to 5.0 *** [re-commit]
2005-11-16 11:52:09 +01:00
unknown
74ae82f5c4 WL#2779 ndb_size.pl
Add display of minimum requirements for various cluster parameters
e.g. DataMemory, IndexMemory, MaxNoOfTables, MaxNoOfAttributes etc

and the memory usage because of them.


ndb/tools/ndb_size.pl:
  Computer minimum parameter settings (MaxNoOfTables, Attributes, Indexes, Triggers) and the memory usage because of these settings.
ndb/tools/ndb_size.tmpl:
  display parameters
2005-11-16 19:47:03 +11:00
unknown
517967de1a WL#2779 ndb_size.pl
fix some small bugs, slightly improve output, add --help


ndb/tools/ndb_size.pl:
  Provide --help and --usage.
  
  Fix some bugs related to quoting table names.
ndb/tools/ndb_size.tmpl:
  A NAME and A HREF to tables from the main list
2005-11-16 18:26:30 +11:00
unknown
19809fab2d Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
2005-11-15 13:38:48 -07:00
unknown
4b1cb98888 merged in the test case for BUG#7947
BitKeeper/deleted/.del-rpl_bug7947.result~1b40af7545a6c692:
  Delete: mysql-test/r/rpl_bug7947.result
BitKeeper/deleted/.del-rpl_bug7947.test~20613cfdc560a16c:
  Delete: mysql-test/t/rpl_bug7947.test
2005-11-15 13:38:06 -07:00
unknown
faaf53d966 Merge mysql.com:/home/mydev/mysql-4.0-4000
into  mysql.com:/home/mydev/mysql-4.1-4100


mysql-test/r/handler.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/t/handler.test:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_handler.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_table.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
2005-11-15 18:09:40 +01:00
unknown
675226728c Bug#14616 - Freshly imported table returns error 124 when using LIMIT
After merge fix.
2005-11-15 18:01:30 +01:00
unknown
69fae29c58 Test suite for BUG#13673 (the bug was fixed in the bugfix for BUG#14138)
mysql-test/r/analyze.result:
  Test suite for BUG#13673
mysql-test/t/analyze.test:
  Test suite for BUG#13673
2005-11-15 18:14:53 +02:00
unknown
15062e97e9 Merge mysql.com:/home/mydev/mysql-4.0-bug14397
into  mysql.com:/home/mydev/mysql-4.0-4000
2005-11-15 16:47:15 +01:00
unknown
b0a5184d80 Merge mysql.com:/home/mydev/mysql-4.0-bug14616
into  mysql.com:/home/mydev/mysql-4.1-4100


mysql-test/r/myisam.result:
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  Manual merge.
mysql-test/t/myisam.test:
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  Manual merge.
sql/sql_select.cc:
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  Manual merge.
2005-11-15 16:07:05 +01:00
unknown
dc44851352 Fix for BUG#5686 - #1034 - Incorrect key file for table - only utf8
myisam/ft_parser.c:
  word->len calculation correction.
mysql-test/r/fulltext.result:
  Test case for bug#5686.
mysql-test/t/fulltext.test:
  Test case for bug#5686.
2005-11-12 11:25:14 +04:00
unknown
26eb2ecc1d Update out-of-date URLs in 'help' text of mysql client. (Bug #14801)
client/mysql.cc:
  Update text, URLs in mysql client 'help' text
2005-11-11 15:23:04 -08:00
unknown
cde1be69d6 Merge mysql.com:/home/jimw/my/mysql-4.1-14469
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-11-10 11:23:52 -08:00
unknown
599a6f1f18 Merge mysql.com:/home/mysql_src/mysql-4.1-gca
into  mysql.com:/home/mysql_src/mysql-4.1
2005-11-10 15:14:17 +01:00
unknown
6e56f7e0a9 Declaring some class members public for BUG#12377:
"Item_date_add_interval needs to have the int_type member as Public".
As explained in the bug report, this change is is to help http://search.cpan.org/~philips/DBIx-MyParse-0.20/
So please keep those members public.


sql/item_func.h:
  declaring some class members public for BUG#12377
sql/item_strfunc.h:
  declaring some class members public for BUG#12377
sql/item_timefunc.h:
  declaring some class members public for BUG#12377
2005-11-10 15:12:22 +01:00
unknown
f76ff56512 BUG#14480: post-fix: use the default field value from CREATE list too. 2005-11-09 09:34:46 +03:00
unknown
232652e9d6 changed select release_lock() to do release_lock() to avoid having to compare the
non-deterministic result in the test case for BUG#7947
the bug fix for BUG#7947 now fixed the result of mix_innodb_myisam_binlog test, which
in the past was missing DO RELEASE_LOCK() in the output of SHOW BINLOG EVENTS


mysql-test/r/mix_innodb_myisam_binlog.result:
  DO RELEASE_LOCK() was supposed to be there from the very start
mysql-test/r/rpl_bug7947.result:
  changed select release_lock() to do release_lock() to avoid having to compare the 
  non-deterministic result
mysql-test/t/rpl_bug7947.test:
  changed select release_lock() to do release_lock() to avoid having to compare the 
  non-deterministic result
2005-11-07 20:51:30 -07:00
unknown
224e85536e Merge mysql.com:/home/psergey/mysql-4.1-bug13814
into mysql.com:/home/psergey/mysql-4.1-nov08-push
2005-11-08 05:36:25 +03:00
unknown
3a528ddfe2 Merge mysql.com:/home/psergey/mysql-4.1-bug14480
into mysql.com:/home/psergey/mysql-4.1-nov08-push
2005-11-08 05:34:56 +03:00
unknown
ee84f5c728 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947


sql/item_func.cc:
  Auto merged
2005-11-07 15:10:48 -07:00
unknown
3004c8de2d fix for BUG#7947 - failure to log DO RELEASE_LOCK() if we disconnect in the middle of
transaction while holding the lock. Also test to make sure other binlogging issues
reported in the bug have been addressed.


sql/item_func.cc:
  fix for BUG#7947
mysql-test/r/rpl_bug7947.result:
  New BitKeeper file ``mysql-test/r/rpl_bug7947.result''
mysql-test/t/rpl_bug7947.test:
  New BitKeeper file ``mysql-test/t/rpl_bug7947.test''
2005-11-07 15:09:35 -07:00
unknown
01cad6395e Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/cps/mysql/trees/mysql-4.1
2005-11-08 01:00:15 +03:00
unknown
2e7c367519 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-07 13:39:03 +01:00
unknown
5412ee4f29 Bug#14616 - Freshly imported table returns error 124 when using LIMIT
Initialized usable_keys from table->keys_in_use instead of ~0
in test_if_skip_sort_order(). It was possible that a disabled
index was used for sorting.


mysql-test/r/myisam.result:
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  The test result.
mysql-test/t/myisam.test:
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  The test case.
2005-11-07 12:16:49 +01:00