Commits · bf0562f20d33c57d2b21e8214b5fe69d94ccc061 · Kirill Smelkov / mariadb

11 Sep, 2005 1 commit
- Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0 · bf0562f2
  unknown authored Sep 10, 2005
```
into  frost.snake.net:/private/tmp/merge-5.1


sql/sql_select.cc:
  Auto merged
```
  bf0562f2
10 Sep, 2005 7 commits

options.cc: · e85f42c5

unknown authored Sep 10, 2005

  Fix typo.


server-tools/instance-manager/options.cc:
  Fix typo.

e85f42c5

Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · 62646826
unknown authored Sep 10, 2005
```
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
```
62646826
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 · 72ad93a0
unknown authored Sep 10, 2005
```
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
```
72ad93a0

comp_err.c: · 7845a81a

unknown authored Sep 10, 2005

  Fix some comments.


extra/comp_err.c:
  Fix some comments.

7845a81a

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0fd4d20c
unknown authored Sep 10, 2005
```
into mysql.com:/home/psergey/mysql-5.0-merge
```
0fd4d20c
Fix a valgrind warning. · f4ca9acd
unknown authored Sep 10, 2005

f4ca9acd

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3bd9f42c

unknown authored Sep 10, 2005

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


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged

3bd9f42c

09 Sep, 2005 32 commits

BUG #12597 after merge, needed to produce results · b5622d49

unknown authored Sep 10, 2005


mysql-test/r/mysqldump.result:
  BUG #12597 - new results file because of merge of test and results file

b5622d49

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · cb03cbae

unknown authored Sep 10, 2005

into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  resolving conflicts in order to push for bug #12597
mysql-test/t/mysqldump.test:
  resolving conflicts for pushing to bug #12597

cb03cbae

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · fbfb8ed6
unknown authored Sep 10, 2005
```
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
```
fbfb8ed6
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 86ded90d
unknown authored Sep 09, 2005
```
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
```
86ded90d

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

unknown authored Sep 09, 2005

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


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

11fef784

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1e6f12c0
unknown authored Sep 09, 2005
```
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
```
1e6f12c0
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · af2d38f0
unknown authored Sep 09, 2005
```
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
```
af2d38f0

SignalSender.cpp: · bbc293fd

unknown authored Sep 09, 2005

Rename: ndb/src/ndbapi/SignalSender.cpp -> storage/ndb/src/ndbapi/SignalSender.cpp
SignalSender.hpp:
Rename: ndb/src/ndbapi/SignalSender.hpp -> storage/ndb/src/ndbapi/SignalSender.hpp

storage/ndb/src/ndbapi/SignalSender.hpp:
Rename: ndb/src/ndbapi/SignalSender.hpp -> storage/ndb/src/ndbapi/SignalSender.hpp
storage/ndb/src/ndbapi/SignalSender.cpp:
Rename: ndb/src/ndbapi/SignalSender.cpp -> storage/ndb/src/ndbapi/SignalSender.cpp

bbc293fd

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6c7f692d
unknown authored Sep 09, 2005
```
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12594
```
6c7f692d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · c34922c7
unknown authored Sep 09, 2005
```
into mysql.com:/home/psergey/mysql-5.0-merge
```
c34922c7
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 14959270
unknown authored Sep 09, 2005
```
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
```
14959270

Merge mysql.com:/home/alexi/mysql-5.0 · d3837c79

unknown authored Sep 09, 2005

into  mysql.com:/home/alexi/dev/mysql-5.0-12101


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

d3837c79

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9ff63ae1
unknown authored Sep 09, 2005
```
into mysql.com:/home/psergey/mysql-5.0-merge
```
9ff63ae1

Fix for valgrind warning/crashes: When executing SP statement, If we set · 9f0a79cb

unknown authored Sep 09, 2005

thd->user_var_events_alloc (and so get binlog events to be allocated on its pool), 
clean the binlog events after the execution of this SP statement is finished.

9f0a79cb

Merge mysql.com:/home/alexi/dev/mysql-4.1-12101 · c7386a19

unknown authored Sep 09, 2005

into  mysql.com:/home/alexi/dev/mysql-5.0-12101


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

c7386a19

BUG #12101: Additional fix. · 26f8e9c9

unknown authored Sep 09, 2005


sql/item_cmpfunc.cc:
  Modified Item_func_between::print(), Item_func_in::print().
  Item_func_between/in objects represent now [NOT]BETWEEN/IN expressions.

26f8e9c9

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