Commits · dc3d6d6ef890f36e2c61ee39bb76ac0810f61398 · nexedi / MariaDB

29 Oct, 2007 12 commits

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · dc3d6d6e
unknown authored Oct 29, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
dc3d6d6e

autorun.sh: · 9094d084

unknown authored Oct 29, 2007

  After review changes


BUILD/autorun.sh:
  After review changes

9094d084

autorun.sh: · 17c847a6

unknown authored Oct 29, 2007

Removed innobase from compile-dist, and let it use autorun.sh to avoid
code duplication. Also corrected a problem when searching for one of
"libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)

BUILD/autorun.sh:
Removed innobase from compile-dist, and let it use autorun.sh to avoid
code duplication. Also corrected a problem when searching for one of
"libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)

17c847a6

5.1 has been promoted to "rc" status. · 7963c8f4
unknown authored Oct 29, 2007

7963c8f4

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

unknown authored Oct 29, 2007

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


mysql-test/r/derived.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_cache.cc:
  Null merge of a 5.0 patch, by order of the original author via IRC.

b7a6fb0c

Merge trift2.:/MySQL/M51/mysql-5.1 · 620e673c

unknown authored Oct 29, 2007

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


configure.in:
  Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Auto merged
mysql-test/r/partition.result:
  Ensure test for bug number 27816 is in the merged tree.
mysql-test/t/partition.test:
  Ensure test for bug number 27816 is in the merged tree.

620e673c

Merge trift2.:/MySQL/M41/push-4.1 · e4e91e1c
unknown authored Oct 29, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
e4e91e1c

Merge trift2.:/MySQL/M50/clone-5.0 · b4308259

unknown authored Oct 29, 2007

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


mysql-test/r/derived.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/type_date.result:
  Null-merge 5.0.50 build clone:
  The test for bug#31221 is already in the receiving tree.
mysql-test/t/type_date.test:
  Null-merge 5.0.50 build clone:
  The test for bug#31221 is already in the receiving tree.

b4308259

Merge trift2.:/MySQL/M50/mysql-5.0 · 12f53900
unknown authored Oct 29, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
12f53900
Merge trift2.:/MySQL/M41/mysql-4.1 · b76dc0ce
unknown authored Oct 29, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
b76dc0ce
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · 2a934d94
unknown authored Oct 29, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
2a934d94

Fix for · 19cec9fa

unknown authored Oct 29, 2007

  Bug#31857 funcs_1: a_processlist_priv_no_prot and b_processlist_priv_ps fail
  
Reason for the changes is:
  WL4007 Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> UPGRADE


mysql-test/suite/funcs_1/datadict/datadict_priv.inc:
  1. Adjustment to new server response (ER_PARSE_ERROR instead of ER_DBACCESS_DENIED_ERROR)
  2. Add missing subtest with ALTER DATABASE ... UPGRADE ...
mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result:
  Updated results
mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result:
  Updated results

19cec9fa

26 Oct, 2007 1 commit

Fix for · 097243b2

unknown authored Oct 26, 2007

   Bug#31408 funcs_1: <engine>_trig_03e test fail
Modification:
   The TRIGGER PRIVILEGE is now needed for getting informations about TRIGGERs.
   Therefore after REVOKE TRIGGER privilege the 
   - SHOW TRIGGERS
   - SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
   result sets are now empty.


mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  Updated results

097243b2

25 Oct, 2007 4 commits

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · d635c22e
unknown authored Oct 25, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
d635c22e
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · dcee5da0
unknown authored Oct 25, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
dcee5da0

add new trigger to prevent certain naming clashes · 542afc17

unknown authored Oct 25, 2007


BitKeeper/triggers/pre-commit.check-case.pl:
  catch duplicate file names, ignoring capitalisation, mostly to avoid changesets where a deleted file foobar and a deleted file FooBar break a tree on case insensitive file systems

542afc17

Mimic a rename which Daniel already did in 6.0, · 3e6acc9a

unknown authored Oct 25, 2007

to get rid of a name clash among *deleted* files on case-insignificant file systems.

BitKeeper/deleted/.del-changelog-bleh:
Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh

3e6acc9a

24 Oct, 2007 1 commit
- result fix · 611a8972
  unknown authored Oct 24, 2007
  
  611a8972
23 Oct, 2007 22 commits

result fix · a3d3fa35
unknown authored Oct 23, 2007

a3d3fa35

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

unknown authored Oct 23, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/type_datetime.result:
  after merge fix

2446b969

Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · cb178356
unknown authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
cb178356
after merge fix · e3eed377
unknown authored Oct 23, 2007

e3eed377

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · a895c8f0

unknown authored Oct 23, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


client/client_priv.h:
  Auto merged
client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/query_cache.result:
  manual merge
mysql-test/include/mix1.inc:
  manual merge
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/query_cache.test:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
mysql-test/t/type_decimal.test:
  manual merge
sql/item.cc:
  manual merge

a895c8f0

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 3e459feb

unknown authored Oct 23, 2007

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


client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
mysql-test/t/type_decimal.test:
  manual merge
sql/item.cc:
  manual merge

3e459feb

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 63230037
unknown authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
63230037
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 4eaaddec
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
4eaaddec
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt · 4cc7db9d
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
4cc7db9d

Merge mysql.com:/home/hf/work/30638/my50-30638 · a540bfee

unknown authored Oct 23, 2007

into  mysql.com:/home/hf/work/30638/my51-30638


sql/opt_range.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged

a540bfee

Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt · 1cdb1777
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
```
1cdb1777
Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 · 1d3ab6fe
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
```
1d3ab6fe
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 2e2f6ea7
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
2e2f6ea7
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 00637970
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
00637970
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · cc7c8e93
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550


sql/filesort.cc:
  SCCS merged
```
cc7c8e93
type conversions fixed to get rid of warnings · d61d1880
unknown authored Oct 23, 2007
```
sql/ha_heap.cc:
  type conversion fix
sql/opt_range.cc:
  type conversion fix
```
d61d1880
Merge mysql.com:/home/hf/work/30638/my50-30638 · a4c0c6f4
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
a4c0c6f4
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · a8cd7af9
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
a8cd7af9
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 5c7c4141
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
```
5c7c4141
merge 5.0-opt -> 5.1-opt for bug 30825 · 3579cdfc
unknown authored Oct 23, 2007

3579cdfc
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · fd721c36
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
fd721c36
Merge mysql.com:/home/hf/work/30638/my50-30638 · f3c632dd
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638


sql/opt_range.cc:
  merging
```
f3c632dd