Commit graph

19676 commits

Author SHA1 Message Date
unknown
53043f535a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-10 18:41:37 +03:00
unknown
dc06ac31d9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-10 08:22:24 +02:00
unknown
8c129f5012 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/12695-bug-4.1-mysql
2005-09-10 02:31:42 +04:00
unknown
fa13c29b2e insert_select.result, insert_select.test:
Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.


mysql-test/t/insert_select.test:
  Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.
mysql-test/r/insert_select.result:
  Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.
2005-09-10 02:30:26 +04:00
unknown
330aa99e5b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-09 21:02:24 +02:00
unknown
c1a3b5be0a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-09 21:30:03 +03:00
unknown
1e77e26359 Merge mysql.com:/home/alexi/mysql-4.1
into  mysql.com:/home/alexi/dev/mysql-4.1-12101
2005-09-09 21:02:13 +04:00
unknown
8a9d9e7950 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-09 19:02:13 +02:00
unknown
19fa54f04e Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field type
Added test case.
2005-09-09 20:02:13 +03:00
unknown
6c7f692d2c Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12594
2005-09-09 13:02:12 -04:00
unknown
26f8e9c933 BUG #12101: Additional fix.
sql/item_cmpfunc.cc:
  Modified Item_func_between::print(), Item_func_in::print().
  Item_func_between/in objects represent now [NOT]BETWEEN/IN expressions.
2005-09-09 19:06:15 +04:00
unknown
b1fab24ce2 ndb
new testprogram testSRBank


BitKeeper/etc/ignore:
  Added ndb/test/ndbapi/testSRBank to the ignore list
ndb/test/include/NDBT_Test.hpp:
  incProperty
ndb/test/ndbapi/Makefile.am:
  new test program
ndb/test/ndbapi/bank/Bank.cpp:
  remove endless wait until ready loop
  fix lots of retry loops to better handle error
ndb/test/ndbapi/bank/Bank.hpp:
  remove endless wait until ready loop
  fix lots of retry loops to better handle error
ndb/test/src/NDBT_Test.cpp:
  incProperty
ndb/test/src/UtilTransactions.cpp:
  close transaction if failed
ndb/test/ndbapi/testSRBank.cpp:
  New BitKeeper file ``ndb/test/ndbapi/testSRBank.cpp''
2005-09-09 12:39:06 +02:00
unknown
acf8d0f4d0 Bug#12817 SHOW STATUS now blob fields
This fix is cancellation of ChangeSet
   1.2329 05/07/12 08:35:30 reggie@linux.site +8 -0
   Bug 7142  Show Fields from fails using Borland's dbExpress interface
   The reason is we can't fix bug#7142 without
   breaking of existing applications/APIs that worked fine with earlier 4.1
   bug 7142 is fixed in 5.0




mysql-test/r/ps_1general.result:
  Bug #12817 SHOW STATUS now blob fields
mysql-test/r/ps_2myisam.result:
  Bug #12817 SHOW STATUS now blob fields
mysql-test/r/ps_3innodb.result:
  Bug #12817 SHOW STATUS now blob fields
mysql-test/r/ps_4heap.result:
  Bug #12817 SHOW STATUS now blob fields
mysql-test/r/ps_5merge.result:
  Bug #12817 SHOW STATUS now blob fields
sql/item.cc:
  Bug #12817 SHOW STATUS now blob fields
sql/sql_show.cc:
  Bug #12817 SHOW STATUS now blob fields
tests/mysql_client_test.c:
  Bug #12817 SHOW STATUS now blob fields
2005-09-09 13:22:16 +05:00
unknown
168f72db51 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12594
2005-09-08 19:28:19 -04:00
unknown
213fa9cbc2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-09-09 01:04:54 +02:00
unknown
5a49a63290 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_cmpfunc.h:
  Auto merged
2005-09-08 23:11:15 +02:00
unknown
afbdcd413a BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache 2005-09-08 22:57:27 +02:00
unknown
17ec83fc01 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-09-08 12:44:30 -07:00
unknown
da5a9926e1 When first creating the ARZ file for an archive table, use "wb" as the mode for
gzdopen() because the file itself was only opened for writing (and truncated),
and some libc implementations (like SCO) don't like to do a fdopen(..., "a") on
a fd that was not opened using O_APPEND.


sql/examples/ha_archive.cc:
  Use "wb" instead of "ab" since we just opened this file for writing
2005-09-08 21:40:59 +02:00
unknown
91d2150dd6 sql_select.cc:
Fixed bug #12885.
  Forced inheritence of the maybe_null flag for the expressions
  containing GROUP BY attributes in selects with ROLLUP.
olap.test, olap.result:
  Added test case for bug #12885.


mysql-test/r/olap.result:
  Added test case for bug #12885.
mysql-test/t/olap.test:
  Added test case for bug #12885.
sql/sql_select.cc:
  Fixed bug #12885.
  Forced inheritence of the maybe_null flag for the expressions
  containing GROUP BY attributes in selects with ROLLUP.
2005-09-08 12:37:16 -07:00
unknown
91d05c5234 SignalSender.cpp:
fixed compile error


ndb/src/ndbapi/SignalSender.cpp:
  fixed compile error
2005-09-08 19:27:37 +02:00
unknown
e2178591a7 Merge mikael@ndb.mysql.com:/home/mikael/bug12594
into  mysql.com:/Users/mikron/mysql-4.1
2005-09-08 18:30:13 +02:00
unknown
d5028e2c5a Bug #12594: A few fixes
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Fixed a bug and an issue with the added debug code for finding
  redo log write mistakes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fixed a bug and an issue with the added debug code for finding
  redo log write mistakes
  Removed a number of unnecessary break's
ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Added printouts of new debug info in log page header
2005-09-08 18:24:42 +02:00
unknown
110230beec corrected typo 2005-09-08 16:47:27 +02:00
unknown
48e97a16c7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-09-08 16:44:54 +02:00
unknown
9c5dd6a233 corrected printouts in backup test
ndb/src/kernel/blocks/backup/Backup.hpp:
  missed this file in prev commit
ndb/test/src/NdbBackup.cpp:
  corrected printouts in backup test
2005-09-08 15:43:46 +02:00
unknown
ef0a284a4c corrected prev fix for bug #13054
so that _only_ backup master replies to API
2005-09-08 15:24:21 +02:00
unknown
e43ee1eabf Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/mysql-4.0


configure.in:
  Auto merged
2005-09-08 12:57:33 +02:00
unknown
f7b7ced602 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-09-08 12:26:20 +02:00
unknown
14b92d3054 Bug #12594:
Added debug info to all log page headers
2005-09-08 11:53:17 +02:00
unknown
e53871c38a Bug #13054 start backup command return may be interrpted 2005-09-08 11:34:55 +02:00
unknown
e93dc82938 Merge mysql.com:/M40/clone-4.0 into mysql.com:/M41/merge-4.1
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
2005-09-08 11:12:05 +02:00
unknown
796f5e0045 Merge mysql.com:/M40/clone-4.0 into mysql.com:/M40/upward-4.0
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
2005-09-08 11:04:43 +02:00
unknown
ad754b05e6 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  selena.:H:/MYSQL/src/#12517-mysql-4.1
2005-09-08 12:12:21 +04:00
unknown
34422f78c1 Modified test case for bug #12517 2005-09-08 12:09:30 +04:00
unknown
f5df855f3c Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11607
2005-09-08 15:06:01 +10:00
unknown
a12efb04dd configure.in:
Flag -DHAVE_DARWIN_THREADS not needed for darwin9


configure.in:
  Flag -DHAVE_DARWIN_THREADS not needed for darwin9
2005-09-08 03:06:49 +02:00
unknown
7d64ba092d Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
2005-09-07 16:33:12 -07:00
unknown
c0f44f8775 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-4.0
into  mysql.com:/home/hartmut/projects/mysql/dev/4.0
2005-09-08 01:08:02 +02:00
unknown
d8bb755f2a Merge mysql.com:/home/hartmut/projects/mysql/dev/4.0
into  mysql.com:/home/hartmut/projects/mysql/dev/4.1


client/mysqlimport.c:
  Auto merged
2005-09-08 00:50:03 +02:00
unknown
9f2b113a87 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/mysql-4.1
2005-09-07 23:39:49 +04:00
unknown
d65a24bb7c Port to SCO OpenServer 6. May require running ./configure with
--build=i686-unknown-sysv5SCO_SV6.0.0


include/my_pthread.h:
  Remove unnecessary define -- configure should define HAVE_NONPOSIX_SIGWAIT
configure.in:
  Update checks for SCO threading libraries to handle OpenServer 6
  Remove redundant OpenUNIX 8 checks
  Pass --build option through to bdb's configure
2005-09-07 20:23:07 +02:00
unknown
1ac26b4a6c Small tweak for random read performance (we shouldn't always tell the OS that we will be doing a linear scan).
sql/examples/ha_tina.cc:
  Small tweak for random read performance.
2005-09-07 10:30:06 -07:00
unknown
400573f1fc Merge mysql.com:/home/alexi/mysql-4.1
into  mysql.com:/home/alexi/dev/mysql-4.1-0


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
2005-09-07 18:55:33 +04:00
unknown
8b6a8cc561 BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn"
- Improved solution


mysql-test/r/mysqltest.result:
  Update test results
mysql-test/t/mysqltest.test:
  Fix test for failing "exec" and "system", by using the false command
2005-09-07 16:39:16 +02:00
unknown
29b77d49f1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-09-07 15:21:08 +02:00
unknown
43fb5cd358 ndb - bug#11623 - "ndb become inresponsive but did not really die"
block signals in threads making main process get all signals...
2005-09-07 14:04:36 +02:00
unknown
22b3e6f882 Fixes bug #5588. Additions after merge from 4.0.
sql-common/client.c:
  Fixes bug #5588. checks if operation was timed out.
vio/vio.c:
  Added vio_was_interrupted() function references to detect timed out
  operation properly on win32.
vio/vio_priv.h:
  Added vio_ssl_was_interrupted() function that detects timed out
  operation properly on win32.
vio/viosocket.c:
  Minor changes to follow up the coding standard.
vio/viossl.c:
  Added vio_ssl_was_interrupted() function that detects timed out
  operation properly on win32.
2005-09-07 15:57:14 +04:00
unknown
4fdf0ce380 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12611
2005-09-07 16:29:53 +05:00
unknown
c9b589defa Merge selena.:H:/MYSQL/src/#05588-mysql-4.0
into  selena.:H:/MYSQL/src/#05588-mysql-4.1


BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220:
  Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
include/violite.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
include/my_global.h:
  SCCS merged
2005-09-07 14:59:41 +04:00