Commits · b5d405923e4b6edefacd631a55f16569431f4dd6 · nexedi / MariaDB

09 Sep, 2005 30 commits

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

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

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

dcb3fe91

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

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

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.

202f1570

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

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

00cc5b59

BUG #12101: Additional fix. · 85faceb2

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.

85faceb2

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 101a38ac
unknown authored Sep 09, 2005
```
into mysql.com:/home/gluh/MySQL/Merge/5.0
```
101a38ac
after merge fix · 884f0531
unknown authored Sep 09, 2005

884f0531
Comment why lex->result is ignored if EXPLAIN · 0c32f9a2
unknown authored Sep 09, 2005

0c32f9a2
manual merge · 5ecfda5e
unknown authored Sep 09, 2005
```
tests/mysql_client_test.c:
  Auto merged
```
5ecfda5e
aftermerge · 15eaaeef
unknown authored Sep 09, 2005

15eaaeef
merged · 1f0a1b1e
unknown authored Sep 09, 2005

1f0a1b1e
aftermerge · 54ee8776
unknown authored Sep 09, 2005

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

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

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

a84269e5

Post-merge fixes · 4a5b7536
unknown authored Sep 09, 2005

4a5b7536

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

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

30092543

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

Bug#12817 SHOW STATUS now blob fields · 92414111

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

92414111

Post-merge fixes · 371ad56d

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

371ad56d

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

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


sql/sql_base.cc:
  Auto merged
```
0324ac25

Merge 4.1->5.0 · ccaf0317

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

ccaf0317

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

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

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

dd8a7c70

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 92844b08

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

92844b08

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1eea70b8

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

1eea70b8

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

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

b28e6de0

08 Sep, 2005 10 commits

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

olap.result, olap.test: · 3f451df6

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.

3f451df6

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

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


sql/item_cmpfunc.h:
  Auto merged
```
60dd90d1
BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache · 46ea3851
unknown authored Sep 08, 2005

46ea3851
Manual merge · 17415670
unknown authored Sep 08, 2005

17415670

Manual merge · 0f8b2ea0

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

0f8b2ea0

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

sql_select.cc: · f75e98c0

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.

f75e98c0