Commits · ca3d54e1f3bfa683203a98b0a59c2722ff3f03bb · nexedi / MariaDB

02 Oct, 2006 13 commits

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · ca3d54e1

unknown authored Oct 02, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

ca3d54e1

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 60dc71eb

unknown authored Oct 02, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Manual merge
sql/mysqld.cc:
  Manual merge

60dc71eb

Remove faulty merge · c71ecd92
unknown authored Oct 02, 2006

c71ecd92

When compiling with qcc on QNC the define __GNUC__will be set although it... · 5bd5f55e

unknown authored Oct 02, 2006

When compiling with qcc on QNC the define __GNUC__will be set although it doesn't support full GNU syntax
 - disable __attribute__ when using qcc


include/my_global.h:
  Disable __attribute__ when compiling with qcc

5bd5f55e

Remove faulty merge causing ctype_utf8 failure · 4c59fcea
unknown authored Oct 02, 2006

4c59fcea
Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol) · bde5116b
unknown authored Oct 02, 2006

bde5116b

Merge bk-internal:/home/bk/mysql-4.1-maint · b85d8034

unknown authored Oct 02, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


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

b85d8034

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 1672af1f

unknown authored Oct 02, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/r/ctype_utf8.result:
  Manual merge
mysql-test/t/ctype_utf8.test:
  Manual merge

1672af1f

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · f41cd192

unknown authored Oct 02, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/ignore:
  auto-union
mysql-test/mysql-test-run.pl:
  Auto merged

f41cd192

Merge neptunus.(none):/home/msvensson/mysql/work/my51-work · aa784cf1
unknown authored Oct 02, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
aa784cf1
Merge bk-internal:/home/bk/mysql-5.1-maint · fd5b0790
unknown authored Oct 02, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
fd5b0790
Merge bk-internal:/home/bk/mysql-5.0-maint · afc1f9f8
unknown authored Oct 02, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
afc1f9f8
Don't run crash_commit_before under valgrind · 6da81ede
unknown authored Oct 02, 2006

6da81ede

30 Sep, 2006 12 commits

Merge siva.hindu.god:/usr/home/tim/m/bk/mrg/50 · fb6c45eb
unknown authored Sep 30, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51


include/my_global.h:
  Auto merged
```
fb6c45eb
Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol) · 38a15a31
unknown authored Sep 30, 2006
```
include/my_global.h:
  Change __cplusplus__ to __cplusplus in #define __attribute__(A) macro
```
38a15a31
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 85aba1c9
unknown authored Sep 30, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51


include/my_global.h:
  Auto merged
```
85aba1c9
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · a068dfc4
unknown authored Sep 30, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51


include/my_global.h:
  Auto merged
```
a068dfc4

Post-merge fix. New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt,... · 527096fc

unknown authored Sep 30, 2006

Post-merge fix.  New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt, means that the error number in 5.1 is 1573, while in 5.0 it is 1471.


mysql-test/r/ctype_ucs.result:
  Post-merge fix
mysql-test/r/ctype_utf8.result:
  Post-merge fix
mysql-test/t/ctype_utf8.test:
  Post-merge fix
mysql-test/t/view.test:
  Post-merge fix

527096fc

Merge bk-internal:/home/bk/mysql-5.0-maint · 343fa900
unknown authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean


include/my_global.h:
  Auto merged
```
343fa900
Merge rama.(none):/home/jimw/my/mysql-5.0-clean · 8d903c62
unknown authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.1-clean


include/my_global.h:
  Auto merged
```
8d903c62
Merge bk-internal:/home/bk/mysql-4.1-maint · 1376026b
unknown authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-4.1-clean


include/my_global.h:
  Auto merged
```
1376026b
Merge rama.(none):/home/jimw/my/mysql-4.1-clean · 9d2d5974
unknown authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean


include/my_global.h:
  Auto merged
```
9d2d5974

Disable __attribute__ entirely on g++ < 3.4. (Bug #2717) · 89fa50a9

unknown authored Sep 29, 2006


include/my_global.h:
  Disable __attribute__ on g++ < 3.4. There are actually some forms of it that
  are supported, but rather than create more ATTRIBUTE_<foo> macros to handle
  them, it is easier to just disable them all. We will catch the compiler warnings
  with more recent versions of g++.

89fa50a9

Merge bk-internal:/home/bk/mysql-4.1-maint · 09a9e9a2
unknown authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-4.1-clean
```
09a9e9a2

Merge siva.hindu.god:/usr/home/tim/m/bk/50 · f849da24

unknown authored Sep 29, 2006

into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51


include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Manual merge (use local)
mysql-test/t/ctype_utf8.test:
  Manual merge (use local)
mysql-test/r/ps.result:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
sql/unireg.cc:
  Manual merge

f849da24

29 Sep, 2006 15 commits

Merge siva.hindu.god:/usr/home/tim/m/bk/g51 · d678c613

unknown authored Sep 29, 2006

into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51


include/mysql_com.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/handler/ha_innodb.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Manual merge (use local)

d678c613

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 045a8adc
unknown authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
```
045a8adc

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c681d06f

unknown authored Sep 29, 2006

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


sql/mysql_priv.h:
  Auto merged

c681d06f

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 16a06614
unknown authored Sep 29, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
```
16a06614
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778 · efd91571
unknown authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
efd91571
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778 · 90a29133
unknown authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
90a29133

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778 · 53de6c39

unknown authored Sep 29, 2006

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


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

53de6c39

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · d91644a0
unknown authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
d91644a0
Update from Stefan. 2006-09-29 msg id <451BEF1.4030506@mysql.com> · f52333ab
unknown authored Sep 29, 2006
```
mysql-test/r/partition.result:
  Altered results after errmsg update.
```
f52333ab

Merge rama.(none):/home/jimw/my/mysql-5.0-clean · c6e2a2a4

unknown authored Sep 28, 2006

into  rama.(none):/home/jimw/my/mysql-5.1-clean


include/m_ctype.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Resolve conflict
sql/set_var.cc:
  Resolve conflict
sql/slave.h:
  Resolve conflict
sql/sql_class.h:
  Resolve conflict

c6e2a2a4

Merge bk-internal:/home/bk/mysql-5.0-maint · 39bdf4c4

unknown authored Sep 28, 2006

into  rama.(none):/home/jimw/my/mysql-5.0-clean


include/my_global.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

39bdf4c4

Fix merge of __attribute__ cleanup. · 00820e2b

unknown authored Sep 28, 2006


include/my_sys.h:
  Fix bad merge
sql/set_var.cc:
  Fix bad __attribute__ usage.

00820e2b

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 5b571b5b
unknown authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
5b571b5b
Fixed bad fix for a bad merge. · cb0a8b54
unknown authored Sep 28, 2006

cb0a8b54

Merge bk-internal:/home/bk/mysql-4.1-maint · 9afa051a

unknown authored Sep 28, 2006

into  rama.(none):/home/jimw/my/mysql-4.1-clean


include/my_global.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/mysqld.cc:
  Resolve conflict

9afa051a