Commits · d4a49bf7355cf8a30085256f4778f9f965e445c3 · nexedi / MariaDB

11 Jun, 2007 5 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · d4a49bf7
  unknown authored Jun 11, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
```
  d4a49bf7
- Merge chilla.local:/home/mydev/mysql-5.1-amain · 7de1fb2b
  unknown authored Jun 11, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
```
  7de1fb2b
- Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 24d23f0e
  unknown authored Jun 11, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  24d23f0e
- Merge chilla.local:/home/mydev/mysql-5.0-amain · 78e5fbce
  unknown authored Jun 11, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg


configure.in:
  Auto merged
```
  78e5fbce
- Merge chilla.local:/home/mydev/mysql-4.1-amain · 864c07e4
  unknown authored Jun 11, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
  864c07e4
08 Jun, 2007 1 commit

BUG#26976 - Missing table in merge not noted in related error msg + · a2b0edaa

unknown authored Jun 08, 2007

            SHOW CREATE TABLE fails

After merge fixes.


mysql-test/r/backup.result:
  Fixed test result.
mysql-test/r/sp.result:
  Fixed test result.
sql/sql_table.cc:
  Fixed wrongly merged line. Moved "deprecated" warnings from sql_yacc.yy
  to mysql_backup_tables/mysql_restore_table.
sql/sql_yacc.yy:
  Moved "deprecated" warnings from sql_yacc.yy to
  mysql_backup_tables/mysql_restore_table.
storage/myisam/ha_myisam.cc:
  Do not report the same error twice.
storage/myisammrg/ha_myisammrg.cc:
  Removed wrongly merged line.

a2b0edaa

07 Jun, 2007 6 commits

Merge trift2.:/MySQL/M41/bug23504-4.1 · eabbf72f
unknown authored Jun 07, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
eabbf72f

Merge trift2.:/MySQL/M50/push-5.0 · a7bb31a7

unknown authored Jun 07, 2007

into  trift2.:/MySQL/M51/push-5.1


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged

a7bb31a7

Merge trift2.:/MySQL/M41/bug23504-4.1 · c06e3435

unknown authored Jun 07, 2007

into  trift2.:/MySQL/M50/push-5.0


netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysql_test_run.def:
  Auto merged
netware/mysql_waitpid.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
netware/mysqltest.def:
  Auto merged
netware/pack_isam.def:
  Auto merged
netware/perror.def:
  Auto merged
netware/replace.def:
  Auto merged
netware/resolve_stack_dump.def:
  Auto merged
netware/resolveip.def:
  Auto merged
netware/my_print_defaults.def:
  Use 5.0 version

c06e3435

netware/*.def : Allocate 128K stack for all executables (bug#23504) · 71516c02

unknown authored Jun 07, 2007


netware/comp_err.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/libmysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/my_print_defaults.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisam_ftdump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisampack.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_install_db.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_test_run.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_waitpid.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqladmin.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlbinlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlcheck.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld_safe.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqldump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlimport.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlshow.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqltest.def:
  Allocate 128K stack for all executables (bug#23504)
netware/pack_isam.def:
  Allocate 128K stack for all executables (bug#23504)
netware/perror.def:
  Allocate 128K stack for all executables (bug#23504)
netware/replace.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolve_stack_dump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolveip.def:
  Allocate 128K stack for all executables (bug#23504)

71516c02

Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines · 357cee4b

unknown authored Jun 07, 2007

into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines


mysql-test/r/key_cache.result:
  Auto merged
mysql-test/r/lock.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/preload.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/repair.result:
  Auto merged
mysql-test/r/rpl_failed_optimize.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
storage/myisammrg/myrg_def.h:
  Auto merged
storage/myisammrg/myrg_open.c:
  Auto merged
mysql-test/r/backup.result:
  Use local.
mysql-test/r/sp.result:
  Use local.
sql/sql_error.cc:
  Use local.
sql/sql_error.h:
  Use local.
sql/share/errmsg.txt:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
storage/myisam/ha_myisam.cc:
  Manual merge.
storage/myisammrg/ha_myisammrg.cc:
  Manual merge.
storage/myisammrg/ha_myisammrg.h:
  Manual merge.

357cee4b

Merge 81.176.158.240:devel/mysql/BUG26976/mysql-5.0-engines · 3560bac9

unknown authored Jun 07, 2007

into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines


mysql-test/r/ps.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
sql/sql_table.cc:
  Auto merged

3560bac9

06 Jun, 2007 17 commits

Merge xiphis.org:/home/antony/work2/mysql-5.0-merge · db35c48c

unknown authored Jun 06, 2007

into  xiphis.org:/home/antony/work2/mysql-5.1-merge


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged

db35c48c

Merge xiphis.org:/home/antony/work2/mysql-4.1-engines.merge · 8def10ed
unknown authored Jun 06, 2007
```
into  xiphis.org:/home/antony/work2/mysql-5.0-merge


configure.in:
  Manual merge
```
8def10ed
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines · e9d8a1ed
unknown authored Jun 06, 2007
```
into  xiphis.org:/home/antony/work2/mysql-5.0-engines.merge


sql/mysqld.cc:
  Auto merged
```
e9d8a1ed

Merge xiphis.org:/home/antony/work2/mysql-5.1-engines · c25255ea

unknown authored Jun 06, 2007

into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge


mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

c25255ea

Merge xiphis.org:/home/antony/work2/mysql-4.1-engines · 62072a7e
unknown authored Jun 06, 2007
```
into  xiphis.org:/home/antony/work2/mysql-4.1-engines.merge
```
62072a7e
Merge trift2.:/MySQL/M41/mysql-4.1 · 5587133a
unknown authored Jun 06, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
5587133a

Merge trift2.:/MySQL/M50/mysql-5.0 · cfc1512e

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M50/push-5.0


CMakeLists.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/ctype_cp932_binlog.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

cfc1512e

Merge trift2.:/MySQL/M51/mysql-5.1 · d571c8c9

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M51/push-5.1


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
CMakeLists.txt:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

d571c8c9

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · ab5f3ee5
unknown authored Jun 06, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
```
ab5f3ee5
Merge trift2.:/MySQL/M50/push-5.0 · 64bd15db
unknown authored Jun 06, 2007
```
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
```
64bd15db

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 5f07f512

unknown authored Jun 06, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build


storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged

5f07f512

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-build · f27c2f26

unknown authored Jun 06, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged

f27c2f26

Merge trift2.:/MySQL/M41/push-4.1 · ec6f93c7

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Version change in 4.1 does not propagate to 5.0

ec6f93c7

Merge trift2.:/MySQL/M41/mysql-4.1 · 9352fe32
unknown authored Jun 06, 2007
```
into  trift2.:/MySQL/M41/push-4.1


configure.in:
  Auto merged
```
9352fe32
Raise version number after cloning 4.1.23 · 7430e256
unknown authored Jun 06, 2007

7430e256

Merge trift2.:/MySQL/M50/mysql-5.0 · f5dc3306

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M50/push-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged

f5dc3306

mtr_report.pl: · d6032e96

unknown authored Jun 06, 2007

Add another exception to the acceptable mysqld errors, for test case for bug 28436

mysql-test/lib/mtr_report.pl:
Add another exception to the acceptable mysqld errors, for test case for bug 28436

d6032e96

05 Jun, 2007 11 commits

BUG#26976 - Missing table in merge not noted in related error msg + · 2b315dff

unknown authored Jun 06, 2007

            SHOW CREATE TABLE fails

Underlying table names, that merge engine fails to open were not
reported.

With this fix CHECK TABLE issued against merge table reports all
underlying table names that it fails to open. Other statements
are unaffected, that is underlying table names are not included
into error message.

This fix doesn't solve SHOW CREATE TABLE issue.


myisammrg/myrg_def.h:
  Added myrg_print_wrong_table declaration.
myisammrg/myrg_open.c:
  If HA_OPEN_FOR_REPAIR is passed to merge engine open function,
  report names of tables that we fail to open.
mysql-test/r/backup.result:
  Updated test result.
mysql-test/r/key_cache.result:
  Updated test result - removed duplicate error.
mysql-test/r/lock.result:
  Updated test result - added summary row.
mysql-test/r/merge.result:
  A test case for BUG#26976.
mysql-test/r/preload.result:
  Updated test result - removed duplicate error, added summary row.
mysql-test/r/ps.result:
  Updated test result - removed duplicate error, added summary row.
mysql-test/r/repair.result:
  Updated test result - removed duplicate error, added summary row.
mysql-test/r/rpl_failed_optimize.result:
  Updated test result - removed duplicate error, added summary row.
mysql-test/r/sp.result:
  Updated test result - removed duplicate error, added summary row.
mysql-test/r/view.result:
  Updated test result - removed duplicate error, added summary row.
mysql-test/t/merge.test:
  A test case for BUG#26976.
sql/ha_myisam.cc:
  Do not report same error twice.
sql/ha_myisammrg.cc:
  If HA_OPEN_FOR_REPAIR is passed to merge engine open function,
  report names of tables that we fail to open.
  
  Added dummy ha_myisammrg::check to not confuse users with
  "not implemented" error in case all underlying tables are
  fine.
sql/ha_myisammrg.h:
   Added ha_myisammrg::check declaration.
sql/share/errmsg.txt:
  Added ER_ADMIN_WRONG_MRG_TABLE errno. It is used instead
  of ER_WRONG_MRG_TABLE in case HA_OPEN_FOR_REPAIR is
  passed to merge engine handler open function.
sql/sql_error.cc:
  warning_level_* are now public. It is required by mysql_admin_table to
  report message level.
sql/sql_error.h:
  warning_level_* are now public. It is required by mysql_admin_table to
  report message level.
sql/sql_table.cc:
  Reorder mysql_admin_table arguments to meet it's definition.
  
  Report errors that are pending in thd->warn_list as results of
  admin function.

2b315dff

ctype-bin.c: · 0f98f03b

unknown authored Jun 06, 2007

  Post-merge fix warning


strings/ctype-bin.c:
  Post-merge fix warning

0f98f03b

sql_prepare.cc: · e9aee315

unknown authored Jun 05, 2007

  Post-merge fix (byte -> uchar)


sql/sql_prepare.cc:
  Post-merge fix (byte -> uchar)

e9aee315

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 · 73868505

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

73868505

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · a04b8ee3

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

a04b8ee3

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6e6d0c31

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

6e6d0c31

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 · 01609990

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

01609990

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41 · 027f7f8c
unknown authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
```
027f7f8c
Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 4e001eb2
unknown authored Jun 05, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/mysqld.cc:
  Auto merged
```
4e001eb2

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · db7a16d6

unknown authored Jun 05, 2007

into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

db7a16d6

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9e56ab34
unknown authored Jun 05, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/mysqld.cc:
  Auto merged
```
9e56ab34