Commits · 36aeee3682fa975df244f44fb34e1c05f3263551 · Kirill Smelkov / mariadb

09 Sep, 2005 25 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 36aeee36

unknown authored Sep 09, 2005

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NodeFailRep.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/ndbapi/Makefile.am:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/src/NdbBackup.cpp:
  Auto merged

36aeee36

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 057855a3
unknown authored Sep 09, 2005
```
into mysql.com:/home/gluh/MySQL/Merge/5.0
```
057855a3
after merge fix · 27eeeab8
unknown authored Sep 09, 2005

27eeeab8
Comment why lex->result is ignored if EXPLAIN · 42a43385
unknown authored Sep 09, 2005

42a43385
manual merge · a3209971
unknown authored Sep 09, 2005
```
tests/mysql_client_test.c:
  Auto merged
```
a3209971
aftermerge · 708553e0
unknown authored Sep 09, 2005

708553e0
merged · 1a331350
unknown authored Sep 09, 2005

1a331350
aftermerge · ec16a3d6
unknown authored Sep 09, 2005

ec16a3d6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7d512b15
unknown authored Sep 09, 2005
```
into lmy004.:/work/mysql-5.0-bug12651
```
7d512b15

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · d44ed347

unknown authored Sep 09, 2005

into mysql.com:/home/psergey/mysql-5.0-merge


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged

d44ed347

Post-merge fixes · fa3c6c76
unknown authored Sep 09, 2005

fa3c6c76

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · cc17a69a

unknown authored Sep 09, 2005

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

cc17a69a

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · be71e4e9
unknown authored Sep 09, 2005
```
into lmy004.:/work/mysql-5.0-bug12651
```
be71e4e9

Bug#12817 SHOW STATUS now blob fields · acf8d0f4

unknown authored Sep 09, 2005

   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

acf8d0f4

Post-merge fixes · 0ef988ad

unknown authored Sep 09, 2005


client/mysqlimport.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

0ef988ad

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 89e95985
unknown authored Sep 09, 2005
```
into lmy004.:/work/mysql-5.0-bug12651
```
89e95985
merged · 5facb898
unknown authored Sep 09, 2005
```
sql/item_cmpfunc.h:
  Auto merged
```
5facb898
Post-merge fixes. Call sp_cache_clear in THD::cleanup. · f32088a9
unknown authored Sep 09, 2005

f32088a9
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · d3f2e6af
unknown authored Sep 09, 2005
```
into lmy004.:/work/mysql-5.0-bug12651


sql/sql_base.cc:
  Auto merged
```
d3f2e6af

Merge 4.1->5.0 · 20994fec

unknown authored Sep 09, 2005


client/mysqlimport.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

20994fec

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ee7f4192
unknown authored Sep 09, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
```
ee7f4192

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5ed7e973

unknown authored Sep 09, 2005

into mysql.com:/home/psergey/mysql-5.0-bug12943


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

5ed7e973

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 65ba93fd

unknown authored Sep 08, 2005

into rurik.mysql.com:/home/igor/mysql-5.0


mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_class.cc:
  Auto merged

65ba93fd

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1266ccc8

unknown authored Sep 09, 2005

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


ndb/src/ndbapi/SignalSender.cpp:
  Merge

1266ccc8

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · a49e23ad

unknown authored Sep 08, 2005

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_class.cc:
  SCCS merged

a49e23ad

08 Sep, 2005 15 commits

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 213fa9cb
unknown authored Sep 09, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
213fa9cb

olap.result, olap.test: · 2eaee052

unknown authored Sep 08, 2005

  Added a test case with VIEW for bug #12885.


mysql-test/t/olap.test:
  Added a test case with VIEW for bug #12885.
mysql-test/r/olap.result:
  Added a test case with VIEW for bug #12885.

2eaee052

Merge bk-internal:/home/bk/mysql-5.0 · 1d003c52
unknown authored Sep 08, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
1d003c52
Fix -ansi -pedantic compilation failure. · 2b17f750
unknown authored Sep 09, 2005

2b17f750
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 5a49a632
unknown authored Sep 08, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_cmpfunc.h:
  Auto merged
```
5a49a632
BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache · afbdcd41
unknown authored Sep 08, 2005

afbdcd41
Manual merge · 1e506970
unknown authored Sep 08, 2005

1e506970

Manual merge · 10349b11

unknown authored Sep 08, 2005


mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged

10349b11

Merge rurik.mysql.com:/home/igor/mysql-4.1 · 17ec83fc
unknown authored Sep 08, 2005
```
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
```
17ec83fc

sql_select.cc: · 91d2150d

unknown authored Sep 08, 2005

  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.

91d2150d

Merge mysql.com:/home/jimw/my/mysql-5.0-12550 · cd4d340b
unknown authored Sep 08, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
cd4d340b

fix for bug #12651 (item of a prepared query allocated on non-permanent · f2571638

unknown authored Sep 08, 2005

are thus dangling later)


mysql-test/r/ps.result:
  test for bug #12651
  (data allocated on thd's arena but not on permanent arena)
mysql-test/t/ps.test:
  test for bug #12651
  (data allocated on thd's arena but not on permanent arena)
sql/sql_base.cc:
  if there is tree transformation then backup the current arena
  and use permanent one (for PS) otherwise the data will be deallocated
  after the prepare process is finished.
  this bug was introduced with the recent natural join patch

f2571638

Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 5ae2ca21
unknown authored Sep 08, 2005
```
into  mysql.com:/home/timka/mysql/src/5.0-2486
```
5ae2ca21

errmsg.txt: · de82d9ee

unknown authored Sep 08, 2005

  Add hyphen, says flupps.
  Tag Swedish message as "swe", not "eng"


sql/share/errmsg.txt:
  Add hyphen, says flupps.

de82d9ee

SignalSender.cpp: · 91d05c52

unknown authored Sep 08, 2005

  fixed compile error


ndb/src/ndbapi/SignalSender.cpp:
  fixed compile error

91d05c52