Commits · 0a665ab0722de91f69190912b6943b9b6cc087d9 · nexedi / MariaDB

18 Jan, 2007 31 commits

Fix merge problem. · 0a665ab0
unknown authored Jan 18, 2007

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


Makefile.am:
  Use local
```
5306a211

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

unknown authored Jan 18, 2007

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


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

b8ae1138

ndb_types.test: sleep a bit longer, to ensure that timestamp > @now · 4fda992b

unknown authored Jan 18, 2007


mysql-test/r/ndb_types.result:
  update results
mysql-test/t/ndb_types.test:
  Sleep a bit longer, to ensure that timestamp changes between:
  set @now = now();
  and:
  insert into/update t1
  
  Test case failed (select timestamp>@now from t1 ==> 0, should be 1), and passed when run again.  This should(?) avoid that fluke.
  
  Clean up test file a bit while I'm here.

4fda992b

Makefile.am: Fix previous bad merge. Re-enable the test-ps target. · d0cfcce4
unknown authored Jan 18, 2007
```
Makefile.am:
  Fix previous bad merge.  Re-enable the test-ps target.
```
d0cfcce4

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

unknown authored Jan 18, 2007

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


client/mysql_upgrade.c:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/string.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

aff1113b

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

unknown authored Jan 18, 2007

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


sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

377fc51a

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40 · d1824f12
unknown authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
```
d1824f12

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c7b6685f

unknown authored Jan 18, 2007

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


client/mysql_upgrade.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Use local

c7b6685f

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · c90839bb
unknown authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
```
c90839bb

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

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

73dcec76

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

unknown authored Jan 18, 2007

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


client/mysqlbinlog.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge

e594d616

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

unknown authored Jan 18, 2007

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


sql/sql_show.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge

3d62df33

Merge recycle.(none):/src/bug22807/my50-bug22807 · 45b9c2dc

unknown authored Jan 18, 2007

into  recycle.(none):/src/mysql-5.0-maint


client/mysql_upgrade.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysys/string.c:
  Auto merged

45b9c2dc

Merge recycle.(none):/src/bug22807/my51-bug22807 · 104ce0dc
unknown authored Jan 18, 2007
```
into  recycle.(none):/src/mysql-5.1-maint
```
104ce0dc

Merge recycle.(none):/src/bug22807/my50-bug22807 · 4ee678f9

unknown authored Jan 18, 2007

into  recycle.(none):/src/bug22807/my51-bug22807


client/mysql_upgrade.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysys/string.c:
  Auto merged

4ee678f9

Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces · b1bfec73

unknown authored Jan 18, 2007

- Create space safe strings for system() calls in mysql_upgrade.exe


client/mysql_upgrade.c:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Make use of new dynstr_append_os_quoted function to produce a string safe for
  passing to the system() function.                                              
  - Refactor possible source of assertion.
include/my_sys.h:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Declare dynstr_append_os_quoted function.
mysys/string.c:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Define dynstr_append_os_quoted function.  This function will concatenate any 
  number of strings, escapes any OS quote in the result then surround the whole  
  affair in another set of quotes which is finally appended to specified         
  DYNAMIC_STRING.

b1bfec73

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · 811bdbba
unknown authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
```
811bdbba
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

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

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

64b075e6

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

7b2b2231

Bug#25408 5.1 Can't compile on Windows · 4ddc4051

unknown authored Jan 18, 2007

- DBUG_ENTER must be called before assignment on Windows and Netware.


storage/myisam/mi_packrec.c:
  Bug#25408 5.1 Can't compile on Windows
  - Call DBUG_ENTER before variable assignment.

4ddc4051

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

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

61430c77

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/maint/41 · 9a765037
unknown authored Jan 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


BUILD/check-cpu:
  Auto merged
```
9a765037

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 9 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

errmsg change · 1a0bd37c
unknown authored Jan 17, 2007

1a0bd37c
errmsg update from Stefan. · efa5ba55
unknown authored Jan 17, 2007

efa5ba55

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