Commits · b78dad065899f522c87520b95289333791a1a1c3 · nexedi / MariaDB

21 Mar, 2007 3 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 · b78dad06
  unknown authored Mar 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701


BUILD/check-cpu:
  Auto merged
```
  b78dad06
- fix shell script · 8db5e504
  unknown authored Mar 21, 2007
```
BUILD/check-cpu:
  make comparison a little more compatible with less exotic shells
```
  8db5e504
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 · f3000157
  unknown authored Mar 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701


BUILD/check-cpu:
  Auto merged
```
  f3000157
19 Mar, 2007 1 commit
- Modify BUG#26701 patch and a different location to also use the correct arguments for GCC 5 and 6. · 035e7399
  unknown authored Mar 19, 2007
```
BUILD/check-cpu:
  case -> if ... -lt
```
  035e7399
01 Mar, 2007 2 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 · a1e0b96c
  unknown authored Mar 01, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701


BUILD/check-cpu:
  Auto merged
```
  a1e0b96c
- BUG#26701 check-cpu compile flags in x86-64 doesn't support gcc < 3.4, · 51fae924
  unknown authored Mar 01, 2007
```
apply suggestion from jocelyn fournier
```
  51fae924
28 Feb, 2007 17 commits
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 372f8331
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


Docs/Makefile.am:
  Auto merged
```
  372f8331
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 976d2fb2
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


Docs/Makefile.am:
  Auto merged
```
  976d2fb2
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 · 3658b34b
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
```
  3658b34b
- Makefile.am: · 787495ca
  unknown authored Feb 28, 2007
```
  EXCEPTIONS-CLIENT is now static part of repository


Docs/Makefile.am:
  EXCEPTIONS-CLIENT is now static part of repository
```
  787495ca
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 66718949
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


Docs/Makefile.am:
  Auto merged
```
  66718949
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · bcf7affe
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


Docs/Makefile.am:
  Auto merged
```
  bcf7affe
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 · 50310cd6
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build


Docs/Makefile.am:
  SCCS merged
```
  50310cd6
- Makefile.am: · d10a5622
  unknown authored Feb 28, 2007
```
  EXCEPTIONS-CLIENT is now static part of repository
EXCEPTIONS-CLIENT:
  BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT


EXCEPTIONS-CLIENT:
  BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT
Docs/Makefile.am:
  EXCEPTIONS-CLIENT is now static part of repository
```
  d10a5622
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 23c4e3c3
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


configure.in:
  SCCS merged
```
  23c4e3c3
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · c268fc20
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  c268fc20
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 8460154e
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


configure.in:
  SCCS merged
```
  8460154e
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 · 388720bf
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
```
  388720bf
- added initialization of 'cmp_type' variable(to remove compiler warning) · df5ba0fb
  unknown authored Feb 28, 2007
  
  df5ba0fb
- Merge trift2.:/MySQL/M50/mysql-5.0 · 3acf5aec
  unknown authored Feb 28, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  3acf5aec
- A binary package should also contain the "mysqld-debug" server (backport from 5.1). · fecef751
  unknown authored Feb 28, 2007
  
  fecef751
- Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 6b74fcd7
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  6b74fcd7
- valgrind error fix · b3d290d3
  unknown authored Feb 28, 2007
  
  b3d290d3
27 Feb, 2007 9 commits

Merge mysql.com:/home/kent/bk/mysql-5.1.16-release · cd981a8d

unknown authored Feb 27, 2007

into  mysql.com:/home/kent/bk/mysql-5.1.16-build


client/sql_string.h:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

cd981a8d

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 399011bb
unknown authored Feb 27, 2007
```
into  mysql.com:/home/psergey/mysql-5.1-bug26117
```
399011bb

BUG#26117 "index_merge sort-union over partitioned table crashes" · 6c8c9d3b

unknown authored Feb 27, 2007

Before the fix: 
  ha_partition objects had ha_partition::m_part_info==NULL and that caused
  crash
After: 
- The new ha_partition::clone() function makes the clones use parent's
  m_part_info value.
- The parent ha_partition object remains responsible for deallocation of
  m_part_info.


mysql-test/r/partition_innodb.result:
  BUG#26117 "index_merge sort-union over partitioned table crashes"
   - Testcase
mysql-test/t/partition_innodb.test:
  BUG#26117 "index_merge sort-union over partitioned table crashes"
   - Testcase

6c8c9d3b

Fix (last) compiler warnings · 6d7b8075

unknown authored Feb 27, 2007


storage/innobase/pars/lexyy.c:
  Fix compiler warnings (fix is also in pars0lex.l)
support-files/compiler_warnings.supp:
  Extra safety to ensure we really get rid of warning :)

6d7b8075

Remove compiler warnings · 9d77ad53

unknown authored Feb 27, 2007


mysql-test/mysql-test-run.pl:
  Fix warning when using --extern
sql/field.cc:
  Fix wrong fix
sql/ha_ndbcluster.cc:
  Better fixes to remove compiler warnings
sql/ha_ndbcluster_binlog.cc:
  Better fixes to remove compiler warnings
sql/log.cc:
  Fix compiler warnings
sql/sql_parse.cc:
  Indentation fix
sql/sql_table.cc:
  Indentation fixes
storage/myisammrg/ha_myisammrg.cc:
  Fix compiler warnings
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Fix compiler warnings
support-files/compiler_warnings.supp:
  Suppress all 'safe' warnings, as detected by win64
win/README:
  Fixed typo

9d77ad53

Fixes for compiler warnings. · 51f7d585

unknown authored Feb 27, 2007


include/my_dbug.h:
  Added macro for fixing compiler warnings.
sql/field.cc:
  Fixed compiler warnings.
sql/ha_ndbcluster.cc:
  Fixed compiler warnings.
sql/ha_ndbcluster_binlog.cc:
  Fixed compiler warnings.
  Changed some tabs into spaces.
sql/rpl_injector.h:
  Fixed compiler warnings.
sql/sql_binlog.cc:
  Fixed compiler warnings.
sql/sql_repl.cc:
  Fixed compiler warnings.
sql/sql_table.cc:
  Fixed compiler warnings.
storage/myisammrg/ha_myisammrg.cc:
  Fixed compiler warnings.
strings/ctype-ucs2.c:
  Fixed compiler warnings.
strings/ctype-utf8.c:
  Fixed compiler warnings.
support-files/compiler_warnings.supp:
  Added suppressed warnings.

51f7d585

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 15a3fff3
unknown authored Feb 27, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/sql_select.cc:
  Auto merged
```
15a3fff3
removed unused variable · 1e70a722
unknown authored Feb 27, 2007

1e70a722
after merge fix · ff8aa819
unknown authored Feb 27, 2007

ff8aa819

26 Feb, 2007 8 commits

BUG#20013 No pentium_cflags in SETUP.sh · bcd8c705

unknown authored Feb 26, 2007

```yaml
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-20013
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```

reorder lines from BUG#20013 to resemble order in 5.0 


BUILD/SETUP.sh:
  BUG#20013 No pentium_cflags in SETUP.sh
  ---
  reorder lines from BUG#20013 to resemble order in 5.0

bcd8c705

after merge fix · 6fd7debd
unknown authored Feb 26, 2007

6fd7debd

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 5cdd4fe2

unknown authored Feb 26, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

5cdd4fe2

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 60126ce3

unknown authored Feb 26, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

60126ce3

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 9f0865f0

unknown authored Feb 26, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

9f0865f0

after merge fix · 46f13418
unknown authored Feb 26, 2007

46f13418

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 65c7f381

unknown authored Feb 26, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect3.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
BitKeeper/deleted/.del-bdb.result:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/blackhole/ha_blackhole.cc:
  Auto merged
mysql-test/r/binlog_stm_blackhole.result:
  manual merge
mysql-test/r/insert_select.result:
  manual merge
mysql-test/r/subselect.result:
  manual merge
mysql-test/r/update.result:
  manual merge
mysql-test/t/insert_select.test:
  manual merge
mysql-test/t/subselect.test:
  manual merge
sql/sql_help.cc:
  manual merge
sql/sql_insert.cc:
  manual merge
sql/sql_update.cc:
  manual merge

65c7f381

Merge ymer.(none):/tmp/mysql-5.0 · 7c638e0b

unknown authored Feb 26, 2007

into  ymer.(none):/tmp/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
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/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged

7c638e0b