Commits · 7e557d0ee79a433f6e522c9379115b9ea8f48403 · nexedi / MariaDB

12 May, 2005 3 commits

unknown authored May 12, 2005


mysql-test/r/information_schema_db.result:
  Fix uppercase error in testcase

7e557d0e

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 3e6b7f2b

unknown authored May 12, 2005

into mysql.com:/Users/mikron/wl1682


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_bitmap.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

3e6b7f2b

Many fixes · 5985904e
unknown authored May 12, 2005

5985904e

10 May, 2005 13 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0de78e66

unknown authored May 10, 2005

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


storage/ndb/src/cw/cpcd/Process.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/Makefile.am:
  Auto merged
storage/ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

0de78e66

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · edcdc57b
unknown authored May 10, 2005
```
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
```
edcdc57b
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 525f5847
unknown authored May 10, 2005
```
into mysql.com:/home/gluh/MySQL/Devel/mysql-5.0


sql/sql_show.cc:
  Auto merged
```
525f5847
Bug#10018: use INFORMATION_SCHEMA works, but show tables in it returns error · 4653d7e1
unknown authored May 10, 2005
```
  additional fix after review
```
4653d7e1

comment change (post-review of "replication of triggers"). Btw date_formats... · ba7cf8ca

unknown authored May 10, 2005

comment change (post-review of "replication of triggers"). Btw date_formats segfaults with --ps-protocol - not caused by my changes though; I'll file a bug report.

sql/sql_trigger.h:
changing comment

ba7cf8ca

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · d3697c75
unknown authored May 10, 2005
```
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
```
d3697c75
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 68768185
unknown authored May 10, 2005
```
into ibmlab.site:/home/my/bk/mysql-5.0
```
68768185

Merge · a3f07269

unknown authored May 10, 2005


BitKeeper/etc/logging_ok:
  auto-union
include/my_global.h:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  SCCS merged

a3f07269

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 387bc8b5
unknown authored May 10, 2005
```
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
```
387bc8b5

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · b69cd35a

unknown authored May 10, 2005

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/t/range.test:
  Auto merged
sql/item_strfunc.h:
  Auto merged

b69cd35a

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · d7e49743
unknown authored May 10, 2005
```
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
d7e49743
Remove testcode · 31d79228
unknown authored May 10, 2005
```
sql/item_strfunc.h:
  Remove the testcode
```
31d79228

Fixed Bug#10232: update with subquery, precision math, · 6037cd17

unknown authored May 10, 2005

another column gets rotten value.


mysql-test/r/type_newdecimal.result:
  Added a test case for Bug#10232: update with subquery, precision math,
  another column gets rotten value.
mysql-test/t/type_newdecimal.test:
  Added a test case for Bug#10232: update with subquery, precision math,
  another column gets rotten value.

6037cd17

09 May, 2005 24 commits

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

unknown authored May 10, 2005

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


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/mysql_priv.h:
  Auto merged
storage/ndb/src/cw/cpcd/APIService.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/CPCD.hpp:
  Auto merged
storage/ndb/src/cw/cpcd/Process.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/include/CpcClient.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/Makefile.am:
  Auto merged
storage/ndb/test/run-test/main.cpp:
  Auto merged
storage/ndb/test/run-test/make-config.sh:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/test/run-test/run-test.hpp:
  Auto merged
storage/ndb/test/src/CpcClient.cpp:
  Auto merged

beaedea1

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1fb790d3
unknown authored May 10, 2005
```
into mysql.com:/home/psergey/mysql-4.1-bug10095


mysql-test/t/range.test:
  Auto merged
```
1fb790d3
Fix for BUG#10070: Make the test not to produce warnings if InnoDB is not available · 4a1b6c01
unknown authored May 10, 2005

4a1b6c01

Merge mysql.com:/home/hf/work/mysql-4.1.ssj · 3db2d3d8

unknown authored May 10, 2005

into mysql.com:/home/hf/work/mysql-5.0.clean


BitKeeper/etc/logging_ok:
  auto-union
strings/ctype-sjis.c:
  Auto merged

3db2d3d8

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 163b8bdc
unknown authored May 10, 2005
```
into mysql.com:/home/hf/work/mysql-4.1.ssj
```
163b8bdc

Fix for bug #10493 (SJIS fields are not correctly saved) · 5cc6f2ed

unknown authored May 10, 2005


strings/ctype-sjis.c:
  pos should be decreased
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

5cc6f2ed

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e16c5284
unknown authored May 09, 2005
```
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
e16c5284
Add compiler settings for Pentium M · d03e4637
unknown authored May 09, 2005
```
BUILD/check-cpu:
  Pentium M
```
d03e4637

Merge · c90b0ab5

unknown authored May 09, 2005


include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
configure.in:
  Ignore 4.1 version change
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge 4.1
ndb/src/ndbapi/ClusterMgr.cpp:
  merge
ndb/test/run-test/Makefile.am:
  merge
sql/mysql_priv.h:
  merge from 4.1
sql/table.cc:
  Merge from 4.1

c90b0ab5

merge · 6748f7f4

unknown authored May 09, 2005


include/my_global.h:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged

6748f7f4

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

unknown authored May 09, 2005

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


sql/ha_ndbcluster.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged

df96db63

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 438eeda6
unknown authored May 09, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
438eeda6
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9a71e2db
unknown authored May 09, 2005
```
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
```
9a71e2db
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 08cea5f8
unknown authored May 09, 2005
```
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
```
08cea5f8
after merge fix · d775e4ec
unknown authored May 09, 2005

d775e4ec

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · afbb97ba

unknown authored May 09, 2005

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


BitKeeper/etc/logging_ok:
  auto-union
sql/item.cc:
  Auto merged

afbb97ba

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7ba252b9
unknown authored May 09, 2005
```
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
```
7ba252b9
Merge mysql.com:/home/bkroot/mysql-5.1 into mysql.com:/home/bk/mysql-5.1 · d3d956c0
unknown authored May 09, 2005
```
sql/ha_ndbcluster.cc:
  Auto merged
```
d3d956c0
manual merge · 910f9909
unknown authored May 09, 2005

910f9909

Fix for bug #9404: information_schema: Weird error messages with SELECT SUM() ... GROUP BY queries · 37dc7c80

unknown authored May 09, 2005


heap/hp_hash.c:
  Fix for bug #9404: information_schema: Weird error messages with SELECT SUM() ... GROUP BY queries 
      use length in symbols instead of length in bytes
      to calculate record length and key length

37dc7c80

configure.in: · 8815d6cf

unknown authored May 09, 2005

  Bumped up version number to indicate 4.1.12 was branched off


configure.in:
  Bumped up version number to indicate 4.1.12 was branched off

8815d6cf

SUBSTR with negative argument didn't work · 66446b31
unknown authored May 09, 2005
```
with multi-byte strings, length() instead
of numchars() where used in a mistake.
```
66446b31
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 50a051bb
unknown authored May 09, 2005
```
into mysql.com:/home/jonas/src/mysql-4.1
```
50a051bb
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8eb32a2a
unknown authored May 09, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
8eb32a2a