Commits · 035346fcff6070dae08c134094f7cd1be980492c · Kirill Smelkov / mariadb

16 Jul, 2007 5 commits

Merge trift-lap.fambruehe:/MySQL/M50/push-5.0 · 035346fc

unknown authored Jul 16, 2007

into  trift-lap.fambruehe:/MySQL/M51/push-5.1


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

035346fc

Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 · 5f77904d

unknown authored Jul 16, 2007

into  trift-lap.fambruehe:/MySQL/M51/push-5.1


configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

5f77904d

Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0 · 0cbe9a28

unknown authored Jul 16, 2007

into  trift-lap.fambruehe:/MySQL/M50/push-5.0


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

0cbe9a28

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 67e3dbc3
unknown authored Jul 16, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
67e3dbc3
Raise version number after cloning 5.0.46 · 7d3cecca
unknown authored Jul 16, 2007

7d3cecca

13 Jul, 2007 1 commit

Additional tests checking for symptoms observed within · 3a979065

unknown authored Jul 13, 2007

  Bug28309 First insert violates unique constraint - was "memory" table empty ?
---
Add missing phony targets


Makefile.am:
  Add execution of the ddl stress tests.
    (modified) test-bt: Short running variant added
    (new) test-ext-stress: Longer running variant
    (modified) test-ext: test-ext-stress added
    (modified) test-fast: Short running variant with MyISAM only added
  ---
  Declare test-ext-jp and test-ext-stress to PHONY make targets.
mysql-test/suite/stress/include/ddl.cln:
  Script for cleanup at execution end
mysql-test/suite/stress/include/ddl.pre:
  Script for general preparations at execution start
mysql-test/suite/stress/include/ddl1.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl2.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl3.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl4.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl5.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl6.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl7.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl8.inc:
  ddl stress script
mysql-test/suite/stress/r/ddl_archive.result:
  File with expected results
mysql-test/suite/stress/r/ddl_csv.result:
  File with expected results
mysql-test/suite/stress/r/ddl_innodb.result:
  File with expected results
mysql-test/suite/stress/r/ddl_memory.result:
  File with expected results
mysql-test/suite/stress/r/ddl_myisam.result:
  File with expected results
mysql-test/suite/stress/r/ddl_ndb.result:
  File with expected results
mysql-test/suite/stress/t/ddl_archive.test:
  Storage engine specific toplevel testscript
mysql-test/suite/stress/t/ddl_csv.test:
  Storage engine specific toplevel testscript
mysql-test/suite/stress/t/ddl_innodb.test:
  Storage engine specific toplevel testscript
mysql-test/suite/stress/t/ddl_memory.test:
  Storage engine specific toplevel testscript
mysql-test/suite/stress/t/ddl_myisam.test:
  Storage engine specific toplevel testscript
mysql-test/suite/stress/t/ddl_ndb.test:
  Storage engine specific toplevel testscript

3a979065

12 Jul, 2007 1 commit
- Bug #29612 Cluster ndbd can't write to file, linux kernel 2.4 · 4922166e
  unknown authored Jul 12, 2007
```
- remove usage for now
```
  4922166e
10 Jul, 2007 4 commits

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 22531a8e
unknown authored Jul 10, 2007
```
into  mysql.com:/home/ram/work/mysql-5.1-maint
```
22531a8e

Fix for bug #29652: csv.test failure: two changes conflict after merge · 29ca25a6

unknown authored Jul 10, 2007

Problem: we don't take into account the length of the data written
to the temporary data file during update on a CSV table.

Fix: properly calculate the data file length during update.


mysql-test/r/csv.result:
  Fix for bug #29652: csv.test failure: two changes conflict after merge
    - test result adjusted.
storage/csv/ha_tina.cc:
  Fix for bug #29652: csv.test failure: two changes conflict after merge
    - adjust local_saved_data_file_length in case of update as well.
storage/csv/ha_tina.h:
  Fix for bug #29652: csv.test failure: two changes conflict after merge
    - adjust local_saved_data_file_length in case of update as well.

29ca25a6

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · c9e01795

unknown authored Jul 10, 2007

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


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged

c9e01795

Bug #29570 · 20beacc9
unknown authored Jul 10, 2007
```
- correct result files
```
20beacc9

09 Jul, 2007 25 commits

Bug #29634: mysqld_safe does not set err_log variable, error log file is not created · d66bf1f7

unknown authored Jul 09, 2007

Dont touch & chmod the err_log file if using syslog (mysqld_safe)


scripts/mysqld_safe.sh:
  Dont touch & chmod the err_log file if using syslog

d66bf1f7

Merge sita.local:/Users/tsmith/m/bk/maint/50 · 63846933
unknown authored Jul 09, 2007
```
into  sita.local:/Users/tsmith/m/bk/maint/51
```
63846933
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · bf30f9e1
unknown authored Jul 09, 2007
```
into  sita.local:/Users/tsmith/m/bk/maint/50
```
bf30f9e1

mysqld_safe.sh: · fef75d10

unknown authored Jul 09, 2007

  Fix a few typos in comments (from Paul DuBois)


scripts/mysqld_safe.sh:
  Fix a few typos in comments (from Paul DuBois)

fef75d10

Merge sita.local:/Users/tsmith/m/bk/maint/50 · d57c1908

unknown authored Jul 09, 2007

into  sita.local:/Users/tsmith/m/bk/maint/51


mysql-test/suite/rpl/r/rpl_misc_functions.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_misc_functions.test:
  Auto merged

d57c1908

rpl_misc_functions.result, rpl_misc_functions.test: · 0fdcf491

unknown authored Jul 09, 2007

  Backport from 5.1 a fix to make this test deterministic


mysql-test/r/rpl_misc_functions.result:
  Backport from 5.1 a fix to make this test deterministic
mysql-test/t/rpl_misc_functions.test:
  Backport from 5.1 a fix to make this test deterministic

0fdcf491

Merge sita.local:/Users/tsmith/m/bk/maint/50 · eb40ffbc
unknown authored Jul 09, 2007
```
into  sita.local:/Users/tsmith/m/bk/maint/51


sql/log.cc:
  Auto merged
```
eb40ffbc

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 7350d52c

unknown authored Jul 09, 2007

into  sita.local:/Users/tsmith/m/bk/maint/51


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged

7350d52c

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · c8b2392b
unknown authored Jul 09, 2007
```
into  sita.local:/Users/tsmith/m/bk/maint/50
```
c8b2392b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint · 1d599ea1
unknown authored Jul 09, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
```
1d599ea1

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 43a7a5be

unknown authored Jul 09, 2007

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


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

43a7a5be

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

unknown authored Jul 09, 2007

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


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/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  manual merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  manual merge

cd6f2f6b

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 58353a70

unknown authored Jul 09, 2007

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


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log_event.cc:
  manual merge

58353a70

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · fa4da4db
unknown authored Jul 09, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
```
fa4da4db

disabled.def: · 407209c1

unknown authored Jul 09, 2007

  post-merge fix: re-enable rpl_udf test


mysql-test/suite/rpl/t/disabled.def:
  post-merge fix: re-enable rpl_udf test

407209c1

Merge sita.local:/Users/tsmith/m/bk/51 · df0d80a3

unknown authored Jul 09, 2007

into  sita.local:/Users/tsmith/m/bk/maint/51

This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_dd_basic.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_gis.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_row_format.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_single_user.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_incident.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/r/csv.result:
  Manual merge
mysql-test/t/csv.test:
  Manual merge
mysql-test/t/disabled.def:
  Manual merge

df0d80a3

Merge sita.local:/Users/tsmith/m/bk/maint/41 · b3f397df
unknown authored Jul 09, 2007
```
into  sita.local:/Users/tsmith/m/bk/maint/50
```
b3f397df
Bug #29570 · ba6c552b
unknown authored Jul 09, 2007
```
- correct result files
```
ba6c552b
Merge sita.local:/Users/tsmith/m/bk/50 · 8b1b980d
unknown authored Jul 09, 2007
```
into  sita.local:/Users/tsmith/m/bk/maint/50


sql/log.cc:
  Auto merged
```
8b1b980d
Merge sita.local:/Users/tsmith/m/bk/41 · ee7519a5
unknown authored Jul 09, 2007
```
into  sita.local:/Users/tsmith/m/bk/maint/41
```
ee7519a5
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · dabd3c97
unknown authored Jul 09, 2007
```
into  sita.local:/Users/tsmith/m/bk/maint/50
```
dabd3c97
after-merge fix. · 49bc3c26
unknown authored Jul 09, 2007

49bc3c26

Merge mysql.com:/home/ram/work/b28808/b28808.5.0 · b9978675

unknown authored Jul 09, 2007

into  mysql.com:/home/ram/work/b28808/b28808.5.1


sql/mysqld.cc:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/t/show_check.test:
  merging
sql/sql_parse.cc:
  merging

b9978675

Merge mysql.com:/home/ram/work/mysql-5.0-maint · 0d177e16
unknown authored Jul 09, 2007
```
into  mysql.com:/home/ram/work/b28808/b28808.5.0
```
0d177e16
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · e5da88af
unknown authored Jul 08, 2007
```
into  sita.local:/Users/tsmith/m/bk/maint/50
```
e5da88af

08 Jul, 2007 4 commits
- Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 22881bfb
  unknown authored Jul 08, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.1-opt
```
  22881bfb
- Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 36896fa8
  unknown authored Jul 08, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.1-opt


sql/field.cc:
  Auto merged
```
  36896fa8
- Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f045039d
  unknown authored Jul 08, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.0-opt
```
  f045039d
- Post-merge fix. · f8186547
  unknown authored Jul 07, 2007
  
  f8186547