Commits · 8ea28e3774ebb361bfeb451ec8d11c330c8e67b3 · Kirill Smelkov / mariadb

18 Jan, 2007 9 commits

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50 · 8ea28e37
unknown authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51


configure.in:
  Auto merged
```
8ea28e37
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 · 8f159343
unknown authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50


configure.in:
  Auto merged
```
8f159343
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · ecb637b4
unknown authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41


configure.in:
  Use local
```
ecb637b4
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5e5cd842
unknown authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51


configure.in:
  Auto merged
```
5e5cd842
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8903b44e
unknown authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
```
8903b44e
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 543f4a07
unknown authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
```
543f4a07
Raise version number after cloning 4.0.29 · 7b2b2231
unknown authored Jan 18, 2007

7b2b2231
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1 · f87b6ef1
unknown authored Jan 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


configure.in:
  Auto merged
```
f87b6ef1

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50 · 8ca95b84

unknown authored Jan 17, 2007

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51


configure.in:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/buf/buf0flu.c:
  Auto merged
storage/innobase/buf/buf0lru.c:
  Auto merged
storage/innobase/include/buf0buf.h:
  Auto merged
storage/innobase/include/buf0buf.ic:
  Auto merged
storage/innobase/include/sync0arr.h:
  Auto merged
storage/innobase/include/sync0rw.h:
  Auto merged
storage/innobase/include/sync0rw.ic:
  Auto merged
storage/innobase/include/sync0sync.h:
  Auto merged
storage/innobase/os/os0sync.c:
  Auto merged
storage/innobase/sync/sync0arr.c:
  Auto merged
storage/innobase/sync/sync0rw.c:
  Auto merged
storage/innobase/sync/sync0sync.c:
  Auto merged

8ca95b84

17 Jan, 2007 17 commits

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 · e7eb4aa5

unknown authored Jan 17, 2007

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50


configure.in:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/buf/buf0flu.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/include/buf0buf.h:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/sync0arr.h:
  Auto merged
innobase/include/sync0rw.h:
  Auto merged
innobase/include/sync0rw.ic:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/os/os0sync.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged

e7eb4aa5

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · 26010833
unknown authored Jan 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
```
26010833
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · 7d274c05
unknown authored Jan 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41


configure.in:
  Use local
```
7d274c05

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · bbacca83

unknown authored Jan 17, 2007

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41


innobase/buf/buf0buf.c:
  Use local
innobase/buf/buf0flu.c:
  Use local
innobase/buf/buf0lru.c:
  Use local
innobase/include/buf0buf.h:
  Use local
innobase/include/buf0buf.ic:
  Use local
innobase/include/sync0arr.h:
  Use local
innobase/include/sync0rw.h:
  Use local
innobase/include/sync0rw.ic:
  Use local
innobase/include/sync0sync.h:
  Use local
innobase/os/os0sync.c:
  Use local
innobase/sync/sync0arr.c:
  Use local
innobase/sync/sync0rw.c:
  Use local
innobase/sync/sync0sync.c:
  Use local

bbacca83

Merge trift2.:/MySQL/M50/upward-5.0 · 064c1b29

unknown authored Jan 17, 2007

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


configure.in:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged

064c1b29

Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge · ae927d45

unknown authored Jan 17, 2007

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_locale.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/log_event.cc:
  Manual merge

ae927d45

Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · 9cd17b6c

unknown authored Jan 17, 2007

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

9cd17b6c

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · d8d639b3

unknown authored Jan 17, 2007

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


configure.in:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/field.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged

d8d639b3

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 55fbeec1

unknown authored Jan 17, 2007

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

55fbeec1

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · 158b0603

unknown authored Jan 17, 2007

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

158b0603

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 5d92d2d7
unknown authored Jan 17, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/mysqld.cc:
  Auto merged
```
5d92d2d7

Disable symlinks under valgrind builds (again), with a comment. · c9078c40

unknown authored Jan 17, 2007


sql/mysqld.cc:
  Once again, disable symlink.test under valgrind builds. symlink.test
  fails deep in mi_repair - the result of this having been disabled
  for almost 5 years.

c9078c40

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · c9bd73df
unknown authored Jan 17, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/sql_parse.cc:
  Use local.
```
c9bd73df
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · eeaf11b2
unknown authored Jan 17, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max


sql/sql_parse.cc:
  SCCS merged
```
eeaf11b2

Fix a failure of lowercase_tables2 test on powermacg5, introduced · f7e41bae

unknown authored Jan 17, 2007

by the patch for Bug#4968


sql/sql_parse.cc:
  Fix lowercase_tables2 test failure on powermacg5: table_case_name()
  function needed create_info.alias if lowercase_table_names=2, which
  was not set for the stack copy of HA_CREATE_INFO. Move the
  update of create_info.alias from create_table_precheck to 
  mysql_execute_command, so that it is done on the right object.

f7e41bae

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max · 3cdad08c

unknown authored Jan 17, 2007

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/mysqld.cc:
  Auto merged
mysql-test/r/ps.result:
  SCCS merged
mysql-test/t/ps.test:
  Use local

3cdad08c

Fix a ps.test failure in 5.0-runtime tree. · 06bc6836

unknown authored Jan 17, 2007


mysql-test/r/ps.result:
  Update result files.
mysql-test/t/ps.test:
  Disable result ouptut of SHOW CREATE TABLE: DATA DIRECTORY option
  may be present or absent from the output depending on the build
  otpions and the operating system, so the output is not consistent
  across supported platforms.
sql/mysqld.cc:
  Remove a tricky #ifdef dependency of --use-symbolic-links on PURIFY
  added in 2002: DEBUG options should not influence server functionality.
  This backfired by producing different output of SHOW CREATE TABLE
  depending on the build options (see also Bug#25677 "With 
  --skip-symbolic-links option on, DATA DIRECTORY clause
  is silently ignored".

06bc6836

16 Jan, 2007 11 commits

myisam/mi_packrec.c · dbf4dc3d

unknown authored Jan 16, 2007

Fix a compile error: Macro "DBUG_ENTER" must not follow an executable statement.

myisam/mi_packrec.c:
Fix a compile error: Macro "DBUG_ENTER" must not follow an executable statement.

dbf4dc3d

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · b1cd0571

unknown authored Jan 16, 2007

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/t/ps.test:
  Use local.
mysql-test/t/backup.test:
  SCCS merged

b1cd0571

Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 329f6ba1

unknown authored Jan 16, 2007

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


mysql-test/t/backup.test:
  Auto merged
mysql-test/t/ps.test:
  Manual merge.

329f6ba1

A fix for the broken 4.1-runtime tree. · 9cff68bb

unknown authored Jan 16, 2007


mysql-test/t/backup.test:
  Backport a patch for sporadically failing myisam.test (and now ps.test)
  from 5.0. The cause was in backup.test not cleaning up tables in
  mysqltest-vardir/tmp after itself.
mysql-test/t/ps.test:
  Add additional protection against possible failure in the middle of
  backup.test

9cff68bb

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 4f4385d6
unknown authored Jan 16, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/sql_select.cc:
  Auto merged
```
4f4385d6

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 3634cce7

unknown authored Jan 16, 2007

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/ha/ha0ha.c:
  Auto merged
storage/innobase/include/hash0hash.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged
configure.in:
  Use local
sql/sql_parse.cc:
  Use local
sql/sql_table.cc:
  Use local
mysql-test/t/ps.test:
  SCCS merged

3634cce7

Merge bodhi.local:/opt/local/work/mysql-5.1-root · 7017cb07

unknown authored Jan 16, 2007

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

7017cb07

configure.in : Fix a dependency problem for "extra/" which shows up only in RPM builds. · 3b7d9850

unknown authored Jan 16, 2007


configure.in:
  Some files in "extra/", notably "comp_err", depend on "dbug/libdbug.a",
  so "dbug/" must be a target before "extra/" is attempted.  Fix this.

3b7d9850

Post-merge fixes. · 4c04fa4d

unknown authored Jan 16, 2007


sql/sql_insert.cc:
  Removing HAVE_ROW_BASED_REPLICATION conditional that is no longer used.

4c04fa4d

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 22f62e8a
unknown authored Jan 16, 2007
```
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
```
22f62e8a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 061ea692
unknown authored Jan 16, 2007
```
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
```
061ea692

15 Jan, 2007 3 commits

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · f71b6a84
unknown authored Jan 15, 2007
```
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-6298
```
f71b6a84

Merge bodhi.local:/opt/local/work/tmp_merge · c8fccee6

unknown authored Jan 15, 2007

into  bodhi.local:/opt/local/work/mysql-5.1-root


BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Auto merged
mysql-test/r/view.result:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/heap/hp_block.c:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/ha/ha0ha.c:
  Auto merged
storage/innobase/include/hash0hash.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  SCCS merged
mysql-test/t/view.test:
  Manual merge.

c8fccee6

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 095e2527
unknown authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
095e2527