Commit graph

19525 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
6582ed64f0 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
tomas@poseidon.ndb.mysql.com
78eaeb6d81 Modified ndb log message on startup failure 2005-09-07 12:49:11 +02:00
bar@mysql.com
2ff61bd697 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12829
2005-09-07 13:12:29 +05:00
msvensson@neptunus.(none)
5fa2cea16f 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
igor@rurik.mysql.com
af9740d0fd 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.
2005-09-06 22:20:11 -07:00
msvensson@neptunus.(none)
5c8d457ec8 Backport fixes for mysqltest.test from 5.0 2005-09-06 22:03:12 +02:00
SergeyV@selena.
72d3e0ca1b Fixes a problem with patch 1.2140, that prevented libmysqld
to be built successfully.
2005-09-06 22:56:16 +04:00
eric@mysql.com
81948e621a Merge eherman@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/eric/bktmp/mysql-4.1
2005-09-06 11:38:52 -07:00
bell@sanja.is.com.ua
167bc61f37 postmerge fix 2005-09-06 21:18:44 +03:00
SergeyV@selena.
68dee5cd27 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.0
into  selena.:H:/MYSQL/src/#05588-mysql-4.0
2005-09-06 19:46:11 +04:00
aivanov@mysql.com
fa51afedeb 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
2005-09-06 18:03:08 +04:00
bell@sanja.is.com.ua
40956861b5 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
lars@mysql.com
06dd104491 Added synchronization to rpl_slave_status.test 2005-09-06 15:39:20 +02:00
gluh@eagle.intranet.mysql.r18.ru
a5bd5e9af2 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
bar@mysql.com
d40278e041 func_like.result, func_like.test:
adding test case.
item_cmpfunc.cc:
  Bug#12611
  ESCAPE + LIKE do not work when the escape char is a multibyte one
  Additional fix for 8bit character sets:
  escape character must be converted into
  operation character set.
2005-09-06 16:16:10 +05:00
bar@mysql.com
cdf89955d9 item_cmpfunc.h:
Bug 12611 : ESCAPE + LIKE do not work when the escape char is a multibyte one
  Forgot to commit this file in the previous changeset,
  together with other files.
2005-09-06 14:48:18 +05:00
bell@sanja.is.com.ua
1bff548cb3 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-09-06 12:18:23 +03:00
bell@sanja.is.com.ua
5a97e646d2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2005-09-06 11:18:03 +03:00
bell@sanja.is.com.ua
10c0ef69e7 support of concurent query cache resizing (BUG#12848) 2005-09-06 11:16:53 +03:00
msvensson@neptunus.(none)
7f91ddcd88 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-06 10:12:21 +02:00
msvensson@neptunus.(none)
4cfd08d1ab BUG#12959 mysqltest crashes if testcase passed with -x option
- Update test cases
2005-09-06 09:40:42 +02:00
msvensson@neptunus.(none)
466ea56376 BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn" 2005-09-05 22:40:13 +02:00
msvensson@neptunus.(none)
a329002a11 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-05 17:12:25 +02:00
bar@mysql.com
6a5f00702d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b9948
2005-09-05 20:05:32 +05:00
msvensson@neptunus.(none)
7f848c1784 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
2005-09-05 17:01:15 +02:00
bar@mysql.com
0eafb9572a mysqld.cc, mysql_priv.h, sql_parse.cc:
bug#9948
  changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  after review fixes
2005-09-05 20:00:11 +05:00
tulin@dl145b.mysql.com
32a3dd850b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/mysql-4.1
2005-09-05 16:54:44 +02:00
msvensson@neptunus.(none)
72228ea825 Bug#12959 mysqltest crashes if testcase passed with -x option 2005-09-05 16:50:32 +02:00
tulin@dl145b.mysql.com
d5d360b180 added --core-file option to ndb executables
added parseable printout in ndb_restore
2005-09-05 16:33:40 +02:00
evgen@moonbone.local
7493f615d8 func_gconcat.test, func_gconcat.result:
Test case for bug #12859 group_concat in subquery cause incorrect not null.
2005-09-05 17:58:29 +04:00
tulin@dl145b.mysql.com
7573d04323 Bug #12992 Cluster StopOnError = Y restarts ndbd indefinitly 2005-09-05 15:14:44 +02:00
ramil@mysql.com
0f34207606 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b4214
2005-09-05 16:41:01 +05:00
ramil@mysql.com
1fb4441782 a fix (bug #4214: Table corruption with myisampack and large BLOB objects). 2005-09-05 16:31:42 +05:00
msvensson@neptunus.(none)
6f8e870ca6 Remove extra ; 2005-09-05 12:33:25 +02:00
joerg@mysql.com
f12663ec79 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2005-09-05 09:58:34 +02:00
tulin@dl145b.mysql.com
c83eedc829 added timestamp to shutdown messages in ndbd 2005-09-05 09:29:28 +02:00
tulin@dl145b.mysql.com
3c6ec2a98e fixed small bug in ndb redolog printer
+ added option to dumpe rest of page after exnd of data
2005-09-05 09:13:28 +02:00
jonas@eel.(none)
613258e0b4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-03 07:58:43 +02:00
eric@mysql.com
5a8af4cb9e Backport of JimW's localhost patch to 4.1 tree.
Handle systems like default FC4 where 127.0.0.1 doesn't always map to 'localhost' first. 
(Bug #11822)
2005-09-02 17:07:05 -07:00
hartmut@mysql.com
14485e71c2 fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX 2005-09-02 22:52:52 +02:00
jimw@mysql.com
9dc0da7c46 Merge mysql.com:/home/jimw/my/mysql-4.1-11280
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-02 12:12:36 -07:00
joerg@mysql.com
ed093d581a Compile error fix. 2005-09-02 20:07:08 +02:00
jonas@eel.(none)
03f7901193 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-02 12:06:43 +02:00
jonas@eel.(none)
4b80ed1bde ndb - fix printout related to bug#10987 2005-09-02 11:55:41 +02:00
jonas@eel.(none)
b267176708 ndb - bug#12608
Always abort if node failure occured between startTransaction and commit
  (can later be improved by wl#2610)
2005-09-02 11:50:50 +02:00
jonas@eel.(none)
3a555b999c ndb - bug #10987
make sure not to cut log to early 
  (specificly not use LCP with maxGciStarted that has not yet completed)
2005-09-02 11:47:24 +02:00
msvensson@neptunus.(none)
375dc1531c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-02 11:21:59 +02:00
msvensson@neptunus.(none)
78f32604ac mysqltest.test: Remove output from shells in result file 2005-09-02 11:14:47 +02:00
kent@mysql.com
5b65d8fb03 my_global.h:
Back port of QNX work around for rint()
2005-09-02 11:11:29 +02:00
stewart@mysql.com
bfd4b626a1 BUG#11607 Incorrect error code returned on deletion
Save error on first failure.
    
At end of execute, if the current error is 4350 (transaction already aborted), restore
the original error (if there was one).
2005-09-02 19:09:20 +10:00