Commit graph

19459 commits

Author SHA1 Message Date
unknown
e98e15db9b ps_6bdb, ps_7ndb tests failure fix 2005-09-12 14:21:38 +05:00
unknown
e6f860aad0 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-11 10:31:55 +03:00
unknown
e6560c0da0 Removed redundant reset_one_shot_variables calls
sql/sql_parse.cc:
  Optimization, this reset is executed below anyway
2005-09-11 00:57:31 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
d699db0043 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-09-07 12:55:53 +02:00
unknown
e6438062db Modified ndb log message on startup failure 2005-09-07 12:49:11 +02:00
unknown
44e289b451 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12829


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 13:12:29 +05:00
unknown
745181ce20 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-07 08:32:38 +02:00
unknown
d877cdf3e7 func_gconcat.result, func_gconcat.test:
Added test cases for bug #12863.
item_sum.cc, item_sum.h:
  Fixed bug #12863.
  Added a flag to Item_func_group_concat set to FALSE after
  concatenation of the first element of a group.


sql/item_sum.h:
  Fixed bug #12863.
  Added a flag to Item_func_group_concat set to FALSE after
  concatenation of the first element of a group.
sql/item_sum.cc:
  Fixed bug #12863.
  Added a flag to Item_func_group_concat set to FALSE after
  concatenation of the first element of a group.
mysql-test/t/func_gconcat.test:
  Added test cases for bug #12863.
mysql-test/r/func_gconcat.result:
  Added test cases for bug #12863.
2005-09-06 22:20:11 -07:00
unknown
a353608359 Backport fixes for mysqltest.test from 5.0
client/mysqltest.c:
  Backport from 5.0
mysql-test/t/mysqltest.test:
  Remove the extra ;
2005-09-06 22:03:12 +02:00
unknown
291d59d4bf Merge eherman@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/eric/bktmp/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2005-09-06 11:38:52 -07:00
unknown
981e5226bb postmerge fix 2005-09-06 21:18:44 +03:00
unknown
f1cc504981 item_cmpfunc.h:
Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions.
   The classes Item_func_between, Item_func_if, Item_func_in are modified.
   Item_func_between/in objects can represent now [NOT]BETWEEN/IN expressions.
   The class Item_func_opt_neg is added to factor out the functionality
   common for the modified classes Item_func_between and Item_func_in.
item_cmpfunc.cc:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions.
   Added Item_func_between::fix_fields(), Item_func_if::fix_fields(),
   Item_func_in::fix_fields(). They correct generic calculation of
   the not_null_tables attribute when it is needed.
   Modified Item_func_between::val_int(), Item_func_in::val_int().
opt_range.cc:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions.
   The function get_mm_tree() is modified. There cannot be NOT before
   BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
   now [NOT]BETWEEN/IN expressions.
sql_yacc.yy:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions.
   Item_func_between/in objects can represent now [NOT]BETWEEN/IN expresions.
join_outer.result:
  Fixed some testcases results (bugs #12101, #12102)
join_outer.test:
  Added testcases for bugs #12101, #12102


mysql-test/t/join_outer.test:
  Added testcases for bugs #12101, #12102
mysql-test/r/join_outer.result:
  Fixed some testcases results (bugs #12101, #12102)
sql/sql_yacc.yy:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions.
   Item_func_between/in objects can represent now [NOT]BETWEEN/IN expresions.
sql/opt_range.cc:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions.
   The function get_mm_tree() is modified. There cannot be NOT before
   BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
   now [NOT]BETWEEN/IN expressions.
sql/item_cmpfunc.cc:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions.
   Added Item_func_between::fix_fields(), Item_func_if::fix_fields(),
   Item_func_in::fix_fields(). They correct generic calculation of
   the not_null_tables attribute when it is needed.
   Modified Item_func_between::val_int(), Item_func_in::val_int().
sql/item_cmpfunc.h:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions.
   The classes Item_func_between, Item_func_if, Item_func_in are modified.
   Item_func_between/in objects can represent now [NOT]BETWEEN/IN expressions.
   The class Item_func_opt_neg is added to factor out the functionality
   common for the modified classes Item_func_between and Item_func_in.
2005-09-06 18:03:08 +04:00
unknown
9d14671fc9 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-09-06 17:01:23 +03:00
unknown
61a5fac1cc Bug #6172 RAND(a) should only accept constant values as arguments(2nd version)
Argument of RAND function can be constant value only
2005-09-06 16:19:59 +05:00