Commit graph

19922 commits

Author SHA1 Message Date
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
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
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
unknown
467deb4cb7 BUG#14480, attempt2: In CREATE ... SELECT ..., don't count the same field twice
when calculating table->null_fields.


mysql-test/r/create.result:
  Testcase for BUG#14480
mysql-test/t/create.test:
  Testcase for BUG#14480
sql/sql_table.cc:
  BUG#14480: For CREATE ... SELECT ... a field list passed to mysql_prepare_table() contains
  instances of create_field for both create-list and select-list. mysql_prepare_table() 
  matches elements that refer to the same field, and joins them together. When the "join"  
  is performed, both of create_field structures has already been counted in "null_fields". 
  
  This fix makes sure that "null_fields" contains the correct value after two create_field 
  structures have been joined.
2005-11-07 09:23:43 +03:00
unknown
b0829011b8 Fix Bug#14672 Bug in deletion
mysql-test/r/csv.result:
  correct result file
mysql-test/t/csv.test:
  Add test for a bug
sql/examples/ha_tina.cc:
  Add O_APPEND flag to my_open. We should always add rows to the end of file
2005-11-06 02:11:12 +03:00
unknown
1b65c70413 Fix Bug#13894 Server crashes on update of CSV table
mysql-test/r/csv.result:
  update result file
mysql-test/t/csv.test:
  Add test for a bug
sql/examples/ha_tina.cc:
  sort function should return reverted values for chains to be sorted in
  the right orded. don't do a strange memmove
2005-11-05 15:08:15 +03:00
unknown
0e878d7e54 mysql.spec.sh:
Always use bundled zlib


support-files/mysql.spec.sh:
  Always use bundled zlib
2005-11-05 01:44:35 +01:00
unknown
57923440f3 fix --ansi --pedantic compilation failure 2005-11-04 16:17:43 +03:00
unknown
b0701a5c3b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck


Makefile.am:
  Auto merged
configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
2005-11-04 01:15:35 +01:00
unknown
7d183320b0 Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
Version for 4.0.
It fixes two problems:
1. The cause of the bug was that we did not check the table version for
   the HANDLER ... READ commands. We did not notice when a table was
   replaced by a new one. This can happen during ALTER TABLE, REPAIR
   TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
   for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
   Though the function comment clearly said it must.
   I changed the code so that the locking is done when required. I call
   the fix for this problem "the secondary fix".


mysql-test/r/handler.result:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  The test result.
mysql-test/t/handler.test:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  The test case.
sql/mysql_priv.h:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Changed a definition for the secondary fix.
sql/sql_base.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Changed function calls for the secondary fix.
sql/sql_class.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Changed a function call for the secondary fix.
sql/sql_handler.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  The first two diffs make the primary bug fix.
  The rest is for the secondary fix.
sql/sql_table.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Changed function calls for the secondary fix.
2005-11-03 18:24:12 +01:00
unknown
1484d54821 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


Makefile.am:
  Merged from 4.0
mysql-test/mysql-test-run.sh:
  Merged from 4.0
2005-11-03 13:02:05 +02:00
unknown
fb4c949f57 Added test-force to Makefile. 2005-11-03 11:47:54 +02:00
unknown
9a71442067 Added new build script for pentium64. 2005-11-03 11:19:06 +02:00
unknown
1fb1802e71 Changed mysql-test-run to correspond to the one in 5.0 tree. 2005-11-03 11:05:52 +02:00
unknown
1f37efa0ad Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.14183
2005-11-03 12:50:28 +04:00
unknown
8355bce658 Don't add optimization flags to CFLAGS if the user specified their
own CFLAGS (ditto for CXXFLAGS). (Bug #12640)


configure.in:
  Only add optimization flags when no CFLAGS (and/or CXXFLAGS) were specified.
2005-11-02 18:29:06 -08:00
unknown
a2370730b3 Avoid possible race condition in accessing slave statistics
during shutdown. (Bug #11796)


sql/sql_show.cc:
  Check that active_mi is not NULL before accessing its members.
2005-11-01 11:48:55 -08:00
unknown
75c45caf2e Merge mysql.com:/home/jimw/my/mysql-4.1-13774
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-11-01 09:38:41 -08:00
unknown
fc0769619f Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/data0/mysqldev/lenz/mysql-4.1
2005-11-01 17:46:00 +01:00
unknown
03ed0d1d24 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14186-bug-4.1-mysql


sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
2005-11-01 17:34:19 +03:00