Commits · c8c5d4b1007e3c6b1e71551438515372143dda0b · Kirill Smelkov / mariadb

04 May, 2007 2 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · c8c5d4b1
  unknown authored May 04, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
```
  c8c5d4b1
- BUG#24732 manifest file was not included in VS2005 amd64 builds · 6b7b9563
  unknown authored May 04, 2007
```
CMakeLists.txt:
  BUG#24732 prevent VS2005 from overwriting our generated manifest
```
  6b7b9563
03 May, 2007 3 commits

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


scripts/Makefile.am:
  Manual merge.
```
70d440ac

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

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".

ad33a48a

Updated funcs_1 files to 5.1.18 level · f32d1e9b

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

f32d1e9b

02 May, 2007 21 commits

Merge linux.site:/home/omer/source/bld50_tmp · 9460b8c4

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

9460b8c4

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

Resolve a possible timing issue with "scripts/mysql_fix_privilege_tables_sql.c" in the · 2478a8be

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.

2478a8be

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

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

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

e817a16a

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


CMakeLists.txt:
  Auto merged
```
eb92ed03

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

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

c444c3b5

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


CMakeLists.txt:
  Auto merged
```
4ac4ee4b
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-cmake-map-files · 7383bca4
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
```
7383bca4
Merge trift2.:/MySQL/M51/spec-5.1 · cc61eeb4
unknown authored May 02, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
cc61eeb4
Merge trift2.:/MySQL/M51/mysql-5.1 · 11b49c6c
unknown authored May 02, 2007
```
into  trift2.:/MySQL/M51/push-5.1


scripts/Makefile.am:
  Auto merged
```
11b49c6c
Merge trift2.:/MySQL/M50/mysql-5.0 · 898fc2e2
unknown authored May 02, 2007
```
into  trift2.:/MySQL/M50/push-5.0


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

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


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


support-files/mysql.spec.sh:
  SCCS merged
```
95aa256d
RPM spec file error: Trailing '*' to cover '.gz' for a man page was missing. · 09812630
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'.
```
09812630
Coeection to the bug format to for better search - review comment · 36305254
unknown authored May 02, 2007

36305254
generate map files on windows · 11a630c4
unknown authored May 02, 2007
```
CMakeLists.txt:
  Generate map files for executables
```
11a630c4
Manual merge: Makefile lines must start with tab, not blank. · aeeac397
unknown authored May 02, 2007

aeeac397

Merge trift2.:/MySQL/M50/mysql-5.0 · 67601f55

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.

67601f55

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

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.

589ae7b4

01 May, 2007 12 commits

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

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

55153730

mysql-test-run.pl: · c1155eb1

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

c1155eb1

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


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


sql/item_func.h:
  Auto merged
```
dc9b20a6

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

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

51d6e623

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

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · 350afd1e

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

350afd1e

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

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

f8274257

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 0e20de49

unknown authored May 01, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/r/olap.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

0e20de49

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 8e7cf826

unknown authored May 01, 2007

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


mysql-test/lib/mtr_report.pl:
  Auto merged
sql/sql_table.cc:
  Manual merge

8e7cf826

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · a41d1a41
unknown authored May 01, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
a41d1a41

Fix braindead bad merge of mysqldump test. · 8eb22d15

unknown authored May 01, 2007


mysql-test/r/mysqldump.result:
  Fix braindead bad merge
mysql-test/t/mysqldump.test:
  Fix braindead bad merge

8eb22d15

30 Apr, 2007 2 commits
- Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 0fc282bb
  unknown authored Apr 30, 2007
```
into  damien-katzs-computer.local:/Users/dkatz/mysql50
```
  0fc282bb
- Merge damien-katzs-computer.local:/Users/dkatz/mysql50 · 0671a012
  unknown authored Apr 30, 2007
```
into  damien-katzs-computer.local:/Users/dkatz/mysql51


mysys/my_copy.c:
  Auto merged
```
  0671a012