Commits · 462e3982c5db8dbce6f7e191e9c2422337b08495 · nexedi / MariaDB

01 Mar, 2007 1 commit
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 462e3982
  unknown authored Mar 01, 2007
```
into  trift2.:/MySQL/M51/push-5.1


scripts/make_binary_distribution.sh:
  Auto merged
```
  462e3982
28 Feb, 2007 18 commits
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · f835ac88
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


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


Docs/Makefile.am:
  Auto merged
```
  858ea1bf
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 · ff71e731
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
```
  ff71e731
- Makefile.am: · 48c3d361
  unknown authored Feb 28, 2007
```
  EXCEPTIONS-CLIENT is now static part of repository


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


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


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


Docs/Makefile.am:
  SCCS merged
```
  548d23ac
- Makefile.am: · 5a232872
  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
```
  5a232872
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · f629d608
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


configure.in:
  SCCS merged
```
  f629d608
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · c96275aa
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  c96275aa
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 77e5eb3c
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


configure.in:
  SCCS merged
```
  77e5eb3c
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 · 7d1ff29c
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
```
  7d1ff29c
- Merge trift2.:/MySQL/M50/upward-5.0 · 83f36c15
  unknown authored Feb 28, 2007
```
into  trift2.:/MySQL/M51/merge-5.1


scripts/make_binary_distribution.sh:
  Null merge, it is a backport from 5.1 to 5.0 anyway.
```
  83f36c15
- added initialization of 'cmp_type' variable(to remove compiler warning) · 793a137d
  unknown authored Feb 28, 2007
  
  793a137d
- Merge trift2.:/MySQL/M50/mysql-5.0 · 912a9076
  unknown authored Feb 28, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  912a9076
- A binary package should also contain the "mysqld-debug" server (backport from 5.1). · e1426fee
  unknown authored Feb 28, 2007
  
  e1426fee
- Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 53c5511a
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  53c5511a
- valgrind error fix · 8010d987
  unknown authored Feb 28, 2007
  
  8010d987
27 Feb, 2007 9 commits

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

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

8dfbc1b6

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

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

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

b68a2201

Fix (last) compiler warnings · ae72e394

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 :)

ae72e394

Remove compiler warnings · 3956f591

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

3956f591

Fixes for compiler warnings. · 175507b7

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.

175507b7

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


sql/sql_select.cc:
  Auto merged
```
13f1e40b
removed unused variable · 3a520a78
unknown authored Feb 27, 2007

3a520a78
after merge fix · 6e133525
unknown authored Feb 27, 2007

6e133525

26 Feb, 2007 10 commits

BUG#20013 No pentium_cflags in SETUP.sh · 81dfa8a9

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

81dfa8a9

after merge fix · 79a6e0fe
unknown authored Feb 26, 2007

79a6e0fe

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 6247e1b2

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

6247e1b2

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 536adef6

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

536adef6

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · de5d4e32

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

de5d4e32

after merge fix · bab42f67
unknown authored Feb 26, 2007

bab42f67

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

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

b1060052

Merge ymer.(none):/tmp/mysql-5.0 · 1eb71c68

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

1eb71c68

Compiler warning suppression fix: Add missing file to 'make dist'. · 8c336fbc
unknown authored Feb 26, 2007
```
support-files/Makefile.am:
  Add missing file to 'make dist'.
```
8c336fbc

item.cc, item.h: · 90d4f809

unknown authored Feb 26, 2007

  Post fix for bug#23800.


sql/item.h:
  Post fix for bug#23800.
sql/item.cc:
  Post fix for bug#23800.

90d4f809

25 Feb, 2007 2 commits

mi_open.c: · ca0cb9e6

unknown authored Feb 26, 2007

  #if => #ifdef


storage/myisam/mi_open.c:
  #if => #ifdef

ca0cb9e6

item.h: · 84e68927

unknown authored Feb 25, 2007

  Post fix for bug#23800.
  Copy the table name of an Item_outer_ref to the conventional memory.


sql/item.h:
  Post fix for bug#23800.
  Copy the table name of an Item_outer_ref to the conventional memory.

84e68927