Commits · 607a31f2c2a9397324fa3d2cad047e7dd8ffc11c · nexedi / MariaDB

14 Mar, 2008 6 commits

Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines · 607a31f2
unknown authored Mar 14, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
```
607a31f2

Merge... · e1c6a503

unknown authored Mar 14, 2008

Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

e1c6a503

Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1 · cfb8268a

unknown authored Mar 14, 2008

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1


configure.in:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_symlink.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/symlink.result:
  manual merge
mysql-test/suite/parts/inc/partition_basic.inc:
  manual merge
mysql-test/suite/parts/r/partition_basic_innodb.result:
  manual merge
mysql-test/suite/parts/r/partition_basic_myisam.result:
  manual merge
mysql-test/t/partition_symlink.test:
  manual merge
mysql-test/t/symlink.test:
  manual merge
sql/sql_parse.cc:
  manual merge

cfb8268a

Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0 · c1e10141

unknown authored Mar 14, 2008

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

c1e10141

Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines · addeb300

unknown authored Mar 14, 2008

into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines


mysql-test/suite/rpl/r/rpl_dual_pos_advance.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
  SCCS merged

addeb300

BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if · db911b4c

unknown authored Mar 14, 2008

            log-slave-updates and circul repl

This is a test case fix for BUG#13861.


mysql-test/r/rpl_dual_pos_advance.result:
  Fix for a test case for BUG#13861.
mysql-test/t/rpl_dual_pos_advance.test:
  Fix for a test case for BUG#13861.
  
  master_pos_wait() requires slave sql thread running. But it is not
  guaranteed for this test case. As we use start slave until it may
  execute all events and shutdown before master_pos_wait() is started.
  
  On the other hand it is safe just to wait for slave to stop here,
  as start slave returns _after_ sql thread is started.

db911b4c

13 Mar, 2008 2 commits

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · f36c8297
unknown authored Mar 13, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Null merge.
```
f36c8297

Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures · ecc147f2

unknown authored Mar 13, 2008

  
Disable test case for bug 29948, which is causing sporadically
failures in other tests inside mysql_client_test.


tests/mysql_client_test.c:
  Disable test case.

ecc147f2

12 Mar, 2008 10 commits

Fixed test failures caused by insufficient cleanups in the tests for · eefc19c5
unknown authored Mar 12, 2008
```
bug12713.
```
eefc19c5

Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt · 0d35eafc

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged

0d35eafc

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · df7268dc
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Manual merge.
```
df7268dc
Post-merge fix. · 821d164b
unknown authored Mar 12, 2008

821d164b
Re-enabled the test for mysql_insert_id() after merging from main. · 6927cb04
unknown authored Mar 12, 2008

6927cb04

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 2d91ad60

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

2d91ad60

Merge kaamos.(none):/data/src/mysql-5.1 · e38a0de2

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.
sql-common/client.c:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.

e38a0de2

Merge kaamos.(none):/data/src/opt/mysql-4.1-opt · ddfd9942
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
```
ddfd9942

Merge kaamos.(none):/data/src/mysql-5.0 · 242078d0

unknown authored Mar 12, 2008

into  kaamos.(none):/data/src/opt/mysql-5.0-opt


client/mysql.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.

242078d0

Merge kaamos.(none):/data/src/mysql-4.1 · 70cc07cf
unknown authored Mar 12, 2008
```
into  kaamos.(none):/data/src/opt/mysql-4.1-opt
```
70cc07cf

11 Mar, 2008 3 commits

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 6189a1d3

unknown authored Mar 11, 2008

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_select.cc:
  Manual merge.

6189a1d3

Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · ee87eaa4
unknown authored Mar 11, 2008
```
into  riffraff.(none):/data0/martin/bug34367/my51-bug34367-pushee
```
ee87eaa4
Merge bk@192.168.21.1:mysql-5.1-opt · 64549fed
unknown authored Mar 11, 2008
```
into  mysql.com:/home/hf/work/32801/my51-32801
```
64549fed

10 Mar, 2008 6 commits

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · ec893324

unknown authored Mar 10, 2008

into  mysql.com:/misc/mysql/34749/51-34749


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged

ec893324

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 2c9fe71c

unknown authored Mar 10, 2008

into  mysql.com:/misc/mysql/34749/50-34749


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged

2c9fe71c

Merge mysql.com:/misc/mysql/34749/50-34749 · 955be183

unknown authored Mar 10, 2008

into  mysql.com:/misc/mysql/34749/51-34749


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/ha_ndbcluster_cond.cc:
  Auto merged
sql/ha_ndbcluster_cond.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged

955be183

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · c0340d6b
unknown authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/51-29645
```
c0340d6b
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f1057cf4
unknown authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/50-29645
```
f1057cf4
Merge mysql.com:/misc/mysql/29645/50-29645 · d3e6e496
unknown authored Mar 10, 2008
```
into  mysql.com:/misc/mysql/29645/51-29645


scripts/mysql_config.sh:
  Auto merged
```
d3e6e496

08 Mar, 2008 3 commits
- Merge kaamos.(none):/data/src/opt/bug34889/my51 · a0cc986f
  unknown authored Mar 08, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


sql/sql_insert.cc:
  Auto merged
```
  a0cc986f
- Merge kaamos.(none):/data/src/opt/bug34889/my50 · 3620bee9
  unknown authored Mar 08, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
```
  3620bee9
- Merge kaamos.(none):/data/src/opt/bug34889/my50 · 9c24d728
  unknown authored Mar 08, 2008
```
into  kaamos.(none):/data/src/opt/bug34889/my51


sql/sql_insert.cc:
  Null merge.
tests/mysql_client_test.c:
  Manual merge.
```
  9c24d728
07 Mar, 2008 10 commits

Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 7eae4351
unknown authored Mar 07, 2008
```
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
```
7eae4351

Merge... · eafb727b

unknown authored Mar 07, 2008

Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1


sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

eafb727b

Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines · 67256c25

unknown authored Mar 07, 2008

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1


configure.in:
  Auto merged
include/mysql/plugin.h:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/partition_innodb.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/partition_innodb.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged

67256c25

Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines · 6a64623c

unknown authored Mar 07, 2008

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0


sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

6a64623c

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · c53606b8
unknown authored Mar 08, 2008
```
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27580
```
c53606b8
After merge fix · d90ae72f
unknown authored Mar 08, 2008

d90ae72f
Merge mysql.com:/home/svoj/devel/mysql/BUG34656/mysql-5.1-engines · 6f7ff28a
unknown authored Mar 07, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
```
6f7ff28a
Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines · 70a4abff
unknown authored Mar 07, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
```
70a4abff
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1-engines · ebae1cc7
unknown authored Mar 07, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
```
ebae1cc7
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines · f6380b54
unknown authored Mar 07, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines
```
f6380b54