Commits · b330e7038d055e4286e7e07826e94006e5a3bfc2 · Kirill Smelkov / mariadb

18 Jan, 2007 13 commits

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 · b330e703

unknown authored Jan 18, 2007

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


client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_packrec.c:
  Use local

b330e703

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


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


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


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


configure.in:
  Auto merged
```
3d15cf5d
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · f2f95ce6
unknown authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
```
f2f95ce6
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · f9b1e80e
unknown authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
```
f9b1e80e

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

unknown authored Jan 18, 2007

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


BUILD/check-cpu:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqladmin.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/my_read.c:
  Auto merged
mysys/my_seek.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqlbug.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
Makefile.am:
  Use local
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Use local
sql/mysqld.cc:
  Use local
strings/ctype-extra.c:
  SCCS merged

bcdff3b0

Raise version number after cloning 4.0.29 · ee72f7e5
unknown authored Jan 18, 2007

ee72f7e5

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 · 862e94b3

unknown authored Jan 18, 2007

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


BUILD/check-cpu:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_enum.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/mysqladmin.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_enum.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
server-tools/instance-manager/instance.cc:
  Use remote (global 5.1 version)
sql/unireg.cc:
  Use remote (5.1 global version)
mysql-test/t/trigger.test:
  Manual merge
server-tools/instance-manager/guardian.cc:
  Manual merge

862e94b3

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


configure.in:
  Auto merged
```
40e5dfe9
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41 · 61c57b43
unknown authored Jan 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


BUILD/check-cpu:
  Auto merged
```
61c57b43

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

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

6838ff79

17 Jan, 2007 27 commits

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

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

f3ae6290

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


configure.in:
  Use local
```
6c6a3e09

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

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

8f483391

errmsg change · e5ab607b
unknown authored Jan 17, 2007

e5ab607b
errmsg update from Stefan. · 74ed909a
unknown authored Jan 17, 2007

74ed909a

Merge trift2.:/MySQL/M50/upward-5.0 · 96fb5951

unknown authored Jan 17, 2007

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


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

96fb5951

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

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

5352ff12

Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · 72cf364f

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

72cf364f

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721 · cda1a07e
unknown authored Jan 17, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


BUILD/check-cpu:
  Auto merged
```
cda1a07e

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

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

cd2edad8

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

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

f58e9f54

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721 · 0a8ed58a
unknown authored Jan 17, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


BUILD/check-cpu:
  Auto merged
```
0a8ed58a

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

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

ae737d69

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721 · fa6248ba

unknown authored Jan 17, 2007

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my51-bug23721


BitKeeper/etc/collapsed:
  auto-union
BUILD/check-cpu:
  Auto merged

fa6248ba

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721 · 11aba733

unknown authored Jan 17, 2007

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721


BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
  Delete: BitKeeper/etc/collapsed
BUILD/check-cpu:
  Auto merged
BitKeeper/etc/collapsed:
  'Auto converge'

11aba733

Bug#23721: compile fails: check-cpu mishandles cpu flags with \ · 1f4ab785

unknown authored Jan 17, 2007

	hyphen in it (like ds-cpl).

convert illegal chars in cpu flags to '_' for variable assignment


BUILD/check-cpu:
  convert illegal chars in cpu flags to '_' for variable assignment

1f4ab785

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


sql/mysqld.cc:
  Auto merged
```
0520bf46

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

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.

9993ebbe

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


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


sql/sql_parse.cc:
  SCCS merged
```
5b2569f9

Merge 192.168.0.10:mysql/mysql-5.0-maint · 2cf1bc4a

unknown authored Jan 17, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

2cf1bc4a

Fix a failure of lowercase_tables2 test on powermacg5, introduced · 77f00934

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.

77f00934

Replace the --exec in a while loop that causes 3400 executions of cygwin/bash on · ed197be0
unknown authored Jan 17, 2007
```
windows with a small perl script that does exactly the same. 
```
ed197be0

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max · 6651ade1

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

6651ade1

Fix a ps.test failure in 5.0-runtime tree. · 41a9400b

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

41a9400b

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · a2649023

unknown authored Jan 17, 2007

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


myisam/mi_packrec.c:
  Auto merged
mysql-test/t/mysqladmin.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/my_read.c:
  Auto merged
mysys/my_seek.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged

a2649023