Commits · 0dda3a3bc1221f104579b9c787bd0ba224b09753 · nexedi / MariaDB

07 May, 2007 2 commits

Fix compile error with some compilers · 0dda3a3b
unknown authored May 07, 2007

0dda3a3b

unknown authored May 07, 2007

  Fix DeleteRead in multi-operation
    Dont use setup_read, as it will (correctly) find that tuple is deleted


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix multi-op DeleteRead
storage/ndb/test/ndbapi/testBasic.cpp:
  Fix multi-op DeleteRead

d4b3f437

04 May, 2007 2 commits
- bugfix in checksum with force varpart · 57ec524b
  unknown authored May 04, 2007
```
mysql-test/mysql-test-run.pl:
  bigger needed for running some tests
```
  57ec524b
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 6870dac6
  unknown authored May 04, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  6870dac6
03 May, 2007 3 commits

Merge trift2.:/MySQL/M50/netware-cross-5.0 · d0b59a4b
unknown authored May 03, 2007
```
into  trift2.:/MySQL/M51/netware-cross-5.1


scripts/Makefile.am:
  Manual merge.
```
d0b59a4b

Better distinction between "CLEANFILES" and "DISTCLEANFILES" for some generated files · 4c535ca9

unknown authored May 03, 2007

(here: "scripts/mysql_fix_privilege_tables{.sql,_sql.c}"). Important for cross-builds.


scripts/Makefile.am:
  Generated files like "mysql_fix_privilege_tables{.sql,_sql.c}" should survive
  a "make clean", this is essential for cross-builds.
  So move them from "CLEANFILES" to "DISTCLEANFILES".

4c535ca9

Updated funcs_1 files to 5.1.18 level · 4fc4fcd0

unknown authored May 02, 2007

- validating current result files
- updating with new features in information_schema / error messages
- forced order by and removed time stamps
removed a_version files that are not needed (now that the suite is in the main tree
Note: datadict tests still fail as a result of bug 28181 (a regression introduced in
5.0.42 - and 5.1.18(?) - tests should runn clean once it is fixed

BitKeeper/deleted/.del-a_version_check.test~82ea7fb267df9e58:
Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-a_version_check.result~97a8ec1e3211c26:
Delete: mysql-test/suite/funcs_1/r/a_version_check.result
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
Modified to correct failiure to return host name on some systems
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
corrections to fooce order by on queries, replace time stamps with strings and enable the
testing of referential_constraints table
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
corrections to force order by on queries
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated result file with order by selects, elimination of time stamps and selects
of empty user (that we don't have anymore) and adding the testing
of referential_constraints table
mysql-test/suite/funcs_1/r/innodb_func_view.result:
confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/innodb_views.result:
confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated result file with order by selects, elimination of time stamps and selects
of empty user (that we don't have anymore) and adding the testing
of referential_constraints table
mysql-test/suite/funcs_1/r/memory_func_view.result:
confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/memory_trig_08.result:
confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/memory_views.result:
confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated result file with order by selects, elimination of time stamps and selects
of empty user (that we don't have anymore) and adding the testing
of referential_constraints table
mysql-test/suite/funcs_1/r/myisam_func_view.result:
confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/myisam_views.result:
confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/r/ndb__datadict.result:
Updated result file with order by selects, elimination of time stamps and selects
of empty user (that we don't have anymore) and adding the testing
of referential_constraints table
mysql-test/suite/funcs_1/r/ndb_func_view.result:
confirming existing results as correct - old result file had wrong cast values
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
Corrected error with long trigger name (that was previously quietly trimmed)
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
confirmed existing results as corrects ones - updated error message
mysql-test/suite/funcs_1/r/ndb_views.result:
confirmed current results as correct - returned results included a wrong 'expected' error message
mysql-test/suite/funcs_1/t/disabled.def:
Updated disabled messages with clearer ones
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
Added code to test for error in case of a trigger name that is to long
mysql-test/suite/funcs_1/views/views_master.inc:
Correction to remove wrong '--eror' meaningless tag that generated warnings

4fc4fcd0

02 May, 2007 25 commits

Merge linux.site:/home/omer/source/bld50_tmp · ad8bc79d

unknown authored May 02, 2007

into  linux.site:/home/omer/source/bld51_2


BitKeeper/deleted/.del-a_version_check.result:
  Auto merged
BitKeeper/deleted/.del-a_version_check.test:
  Auto merged
BitKeeper/deleted/.del-datadict_load.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_master.inc:
  Auto merged
BitKeeper/deleted/.del-datadict_show_schema.inc:
  Auto merged
BitKeeper/deleted/.del-disabled.def~1:
  Auto merged
BitKeeper/deleted/.del-innodb__datadict.result:
  Auto merged
BitKeeper/deleted/.del-innodb_trig_08.result:
  Auto merged
BitKeeper/deleted/.del-innodb_views.result:
  Auto merged
BitKeeper/deleted/.del-memory__datadict.result:
  Auto merged
BitKeeper/deleted/.del-memory_trig_08.result:
  Auto merged
BitKeeper/deleted/.del-memory_views.result:
  Auto merged
BitKeeper/deleted/.del-myisam__datadict.result:
  Auto merged
BitKeeper/deleted/.del-myisam_trig_08.result:
  Auto merged
BitKeeper/deleted/.del-views_master.inc:
  Auto merged
BitKeeper/deleted/.del-innodb_func_view.result:
  manual merge - using local file
BitKeeper/deleted/.del-memory_func_view.result:
  manual merge - using local file
BitKeeper/deleted/.del-myisam_func_view.result:
  manual merge - using local file
BitKeeper/deleted/.del-myisam_views.result:
  manual merge - using local file

ad8bc79d

Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 885d71bd
unknown authored May 02, 2007
```
into  linux.site:/home/omer/source/bld50_2
```
885d71bd

Resolve a possible timing issue with "scripts/mysql_fix_privilege_tables_sql.c" in the · 06242b6a

unknown authored May 02, 2007

source tarball, this is essential for cross builds, like for NetWare.


scripts/Makefile.am:
  On a fast build machine, both the source (mysql_fix_privilege_tables.sql) 
  and the generated file (mysql_fix_privilege_tables_sql.c) may have identical timestamps
  (granularity is one second only, may be too coarse).
  If that happens, the Makefile rule will fire, and "comp_sql" will be built and called -
  which fails in a cross build, like for NetWare.
  
  Prevent that by sleeping for 5 (five) seconds, this will ensure a time difference.

06242b6a

Merge trift2.:/MySQL/M50/spec-5.0 · b9266843
unknown authored May 02, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
b9266843

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 89d9d274

unknown authored May 02, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


scripts/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged

89d9d274

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · e80288e2
unknown authored May 02, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


CMakeLists.txt:
  Auto merged
```
e80288e2

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 14df80c3

unknown authored May 02, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged

14df80c3

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-cmake-map-files · 3689e3f1
unknown authored May 02, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


CMakeLists.txt:
  Auto merged
```
3689e3f1
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-cmake-map-files · 1650a0ac
unknown authored May 02, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
```
1650a0ac
Merge trift2.:/MySQL/M51/spec-5.1 · 2b866a6a
unknown authored May 02, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
2b866a6a
Merge trift2.:/MySQL/M51/mysql-5.1 · 7a63b00c
unknown authored May 02, 2007
```
into  trift2.:/MySQL/M51/push-5.1


scripts/Makefile.am:
  Auto merged
```
7a63b00c
Merge trift2.:/MySQL/M50/mysql-5.0 · b29d3457
unknown authored May 02, 2007
```
into  trift2.:/MySQL/M50/push-5.0


scripts/Makefile.am:
  Auto merged
```
b29d3457
"ndb_size.tmpl" is gone (NDB change 2007-04-24), so remove it from the spec file. · 8cda0338
unknown authored May 02, 2007

8cda0338
Merge trift2.:/MySQL/M50/spec-5.0 · bfb03c5f
unknown authored May 02, 2007
```
into  trift2.:/MySQL/M51/spec-5.1


support-files/mysql.spec.sh:
  Auto merged
```
bfb03c5f
Merge trift2.:/MySQL/M41/spec-4.1 · 1728454f
unknown authored May 02, 2007
```
into  trift2.:/MySQL/M50/spec-5.0


support-files/mysql.spec.sh:
  SCCS merged
```
1728454f
RPM spec file error: Trailing '*' to cover '.gz' for a man page was missing. · 85f6d1a6
unknown authored May 02, 2007
```
support-files/mysql.spec.sh:
  Man pages may/will be compressed, so the file name needs trailing '*' to cover '.gz'.
```
85f6d1a6
Coeection to the bug format to for better search - review comment · 3cf8982b
unknown authored May 02, 2007

3cf8982b
generate map files on windows · 6ee28d9f
unknown authored May 02, 2007
```
CMakeLists.txt:
  Generate map files for executables
```
6ee28d9f
Manual merge: Makefile lines must start with tab, not blank. · 60069acd
unknown authored May 02, 2007

60069acd

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

unknown authored May 02, 2007

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


libmysqld/Makefile.am:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
  Auto merged
client/Makefile.am:
  Merge does not fit - to be done manually.

b7f99fc5

Format corrections for various "Makefile.am": Leading tab, no trailing blank. · 4e95b9dc

unknown authored May 02, 2007


client/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
libmysqld/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
netware/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
scripts/Makefile.am:
  "Makefile" command lines must start with a tab, not with blanks.
win/Makefile.am:
  After a backslash (to mark a continuation line) there must not be a trailing blank.

4e95b9dc

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · ab9bc657
unknown authored May 02, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
ab9bc657

ha_ndbcluster.cc: · 1bf24e5a

unknown authored May 02, 2007

Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values

sql/ha_ndbcluster.cc:
Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values

1bf24e5a

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · b3383e6a

unknown authored May 02, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


mysql-test/r/ndb_insert.result:
  Auto merged
mysql-test/t/ndb_insert.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Using local (will hand merge).

b3383e6a

ndb_insert.test, ndb_insert.result, ha_ndbcluster.cc: · 4a3d208c

unknown authored May 02, 2007

Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values

mysql-test/t/ndb_insert.test:
Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values
sql/ha_ndbcluster.cc:
Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values
mysql-test/r/ndb_insert.result:
Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values

4a3d208c

01 May, 2007 8 commits

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 937f7256

unknown authored May 01, 2007

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


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
sql/item_func.h:
  Auto merged

937f7256

mysql-test-run.pl: · 66823215

unknown authored May 01, 2007

  Run master init scripts also for --embedded-server


mysql-test/mysql-test-run.pl:
  Run master init scripts also for --embedded-server

66823215

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · cfdecea5
unknown authored May 01, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


sql/item_func.h:
  Auto merged
```
cfdecea5
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 4cdaefed
unknown authored May 01, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50


sql/item_func.h:
  Auto merged
```
4cdaefed

Updates to test/result files of funcs_1 to 5.0.40 level, · d23331ac

unknown authored May 01, 2007

 - validated current result files
 - forced order by and removed time stamps 
removed a_version files (since do not make sense now when suite is in the main tree)
Note: datadict tests still fail as a result of regression bug 28181 in 5.0.42 (discovered
      while performing this update) - tests should run clean once bug is fixed


BitKeeper/deleted/.del-a_version_check.test:
  Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-a_version_check.result:
  Delete: mysql-test/suite/funcs_1/r/a_version_check.result
BitKeeper/deleted/.del-innodb_views.warnings:
  Delete: mysql-test/suite/funcs_1/r/innodb_views.warnings
BitKeeper/deleted/.del-memory_views.warnings:
  Delete: mysql-test/suite/funcs_1/r/memory_views.warnings
BitKeeper/deleted/.del-myisam_views.warnings:
  Delete: mysql-test/suite/funcs_1/r/myisam_views.warnings
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Modified to correct failiure to return host name on some systems
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  corrections to force order by on queries and replace time stamps with strings
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  corrections to force order by on queries
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated result file with order bu selects, elimination of time stamps 
  and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
  confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/innodb_views.result:
  confirming existing results as correct ones - returned results are correct, 
  wrong 'expected' error messages removed
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated result file with order bu selects, elimination of time stamps 
  and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/memory_func_view.result:
  confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/memory_trig_08.result:
  confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/memory_views.result:
  confirming existing results as correct ones - returned results are correct, 
  wrong 'expected' error messages removed
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated result file with order bu selects, elimination of time stamps 
  and selects with empty user (that we don't have anymore)
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  confirming existing results as correct ones - old result file had wrong cast values returned
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
  confirming existing results as correct ones - updated error message
mysql-test/suite/funcs_1/r/myisam_views.result:
  confirming existing results as correct ones - returned results are correct, 
  wrong 'expected' error messages removed
mysql-test/suite/funcs_1/t/disabled.def:
  Updated disabled messages with clearer ones
mysql-test/suite/funcs_1/views/views_master.inc:
  removed invalid -- lines generating warning files

d23331ac

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 8c319d72
unknown authored May 01, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
8c319d72

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · 81b7e5fb

unknown authored May 01, 2007

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


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged

81b7e5fb

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · ef8eb58e

unknown authored May 01, 2007

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


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged

ef8eb58e