Commits · 92aa1484f25a5a5d43f5947daa3eedd40460554b · nexedi / MariaDB

19 Jan, 2007 1 commit

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 92aa1484

unknown authored Jan 19, 2007

into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged

92aa1484

18 Jan, 2007 37 commits

Fix merge problem. · cd31b33d
unknown authored Jan 18, 2007

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


Makefile.am:
  Use local
```
d0ff31e2

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

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

c9c575a3

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

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.

b514d1fa

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

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

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

19a08f58

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

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

f5664a03

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

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

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

b6846967

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

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 · 5d8e8f78

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

5d8e8f78

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

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

628add23

Merge recycle.(none):/src/bug22807/my50-bug22807 · 7f949fcc

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

7f949fcc

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

Merge recycle.(none):/src/bug22807/my50-bug22807 · 058903b1

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

058903b1

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

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.

e1e62795

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

Bug#25408 5.1 Can't compile on Windows · 70d27850

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.

70d27850

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 rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 896aca8f

unknown authored Jan 18, 2007

into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533


mysql-test/r/select.result:
  Auto merged
mysql-test/r/type_bit.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged

896aca8f

Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533 · 6b1790de

unknown authored Jan 18, 2007

into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533


mysql-test/r/range.result:
  Auto merged
mysql-test/r/type_bit.result:
  Auto merged
mysql-test/r/type_bit_innodb.result:
  Auto merged
sql/field.cc:
  Auto merged

6b1790de

after merge fix. · 356d1563
unknown authored Jan 18, 2007

356d1563
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 mysql.com:/usr/home/ram/work/bug22533/my50-bug22533 · 76b36fe6

unknown authored Jan 18, 2007

into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533


mysql-test/t/range.test:
  Auto merged
sql/item.cc:
  Auto merged
mysql-test/r/select.result:
  merging
mysql-test/t/select.test:
  merging

76b36fe6

after merge fix. · f4e461a6
unknown authored Jan 18, 2007

f4e461a6

Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533 · 04b5eca8

unknown authored Jan 18, 2007

into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533


mysql-test/r/select.result:
  resolve skipped
mysql-test/t/range.test:
  merging
mysql-test/t/select.test:
  merging
sql/item.cc:
  merging

04b5eca8

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