Commits · 07e970d62d222c2da709071f3cbb425a664c278b · nexedi / MariaDB

05 Sep, 2006 40 commits

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 07e970d6
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
07e970d6

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · efa6d724

unknown authored Sep 05, 2006

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


client/mysql.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
vio/viosocket.c:
  Auto merged
mysql-test/r/ctype_recoding.result:
  Manual merge.
mysql-test/t/ctype_recoding.test:
  Manual merge.

efa6d724

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 4aa16aaa
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
4aa16aaa

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · e85b6691

unknown authored Sep 05, 2006

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


mysql-test/r/heap_btree.result:
  Auto merged

e85b6691

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · f059e1e5

unknown authored Sep 05, 2006

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


mysql-test/r/heap_btree.result:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/t/heap_btree.test:
  Manually merged.

f059e1e5

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 4404b309

unknown authored Sep 05, 2006

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


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Delete: CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~2:
  Delete: server-tools/instance-manager/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Delete: sql/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~4:
  Delete: strings/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~5:
  Delete: tests/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~6:
  Delete: vio/CMakeLists.txt
BitKeeper/deleted/.del-Makefile.am~2:
  Delete: win/Makefile.am
BitKeeper/deleted/.del-README~1:
  Delete: win/README
BitKeeper/deleted/.del-build-vs71.bat:
  Delete: win/build-vs71.bat
BitKeeper/deleted/.del-build-vs8.bat:
  Delete: win/build-vs8.bat
BitKeeper/deleted/.del-configure.js:
  Delete: win/configure.js
BitKeeper/deleted/.del-CMakeLists.txt~7:
  Delete: client/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~8:
  Delete: zlib/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~9:
  Delete: dbug/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~10:
  Delete: extra/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~11:
  Delete: extra/yassl/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~12:
  Delete: extra/yassl/taocrypt/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~13:
  Delete: libmysql/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~14:
  Delete: mysys/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~15:
  Delete: regex/CMakeLists.txt

4404b309

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · bbe8502b

unknown authored Sep 05, 2006

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


storage/ndb/tools/ndb_condig.cpp:
  Auto merged

bbe8502b

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · e7de5a37

unknown authored Sep 05, 2006

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


mysql-test/r/ctype_recoding.result:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/ctype_recoding.test:
  manual merge.
sql/sql_lex.h:
  manual merge.
sql/sql_table.cc:
  manual merge.

e7de5a37

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 1a811a65

unknown authored Sep 05, 2006

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


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

1a811a65

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 4fe669c2
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
4fe669c2
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 2460d777
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


client/mysql.cc:
  Manual merge.
```
2460d777
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 6a8dd4cc
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
6a8dd4cc

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 30e98982

unknown authored Sep 05, 2006

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


sql/net_serv.cc:
  Auto merged
vio/viosocket.c:
  Auto merged

30e98982

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 599e53c5
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
599e53c5

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 9f2e319a

unknown authored Sep 05, 2006

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


mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/t/heap_btree.test:
  Manually merged.

9f2e319a

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 0fcbbf3e
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/set_var.cc:
  Manual merge.
```
0fcbbf3e

Fix bad manual merge. · 1aca8973

unknown authored Sep 05, 2006


sql/mysqld.cc:
  Fixes bad merge.
mysql-test/r/grant.result:
  Fix bad merge.

1aca8973

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 0d748dba
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


tests/mysql_client_test.c:
  Auto merged
```
0d748dba

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 4c9375f3

unknown authored Sep 05, 2006

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


configure.in:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql-common/client.c:
  Auto merged

4c9375f3

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 29c3501a

unknown authored Sep 05, 2006

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


BUILD/check-cpu:
  Auto merged
sql/item_func.h:
  Auto merged
sql-common/client.c:
  Auto merged

29c3501a

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 578f1d8f

unknown authored Sep 05, 2006

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


include/config-netware.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged
configure.in:
  SCCS merged
sql/sql_base.cc:
  SCCS merged

578f1d8f

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · c00e4bad
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/mysqld.cc:
  Auto merged
```
c00e4bad
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · b193fc59
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


tests/mysql_client_test.c:
  Auto merged
```
b193fc59

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 0b760ccf

unknown authored Sep 05, 2006

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


mysql-test/r/grant.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged

0b760ccf

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 5f5a9e56
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
5f5a9e56

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · e742cee1

unknown authored Sep 05, 2006

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.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_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
configure.in:
  Manual merge.
mysql-test/r/grant.result:
  manual merge.

e742cee1

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · e47d58fe
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
e47d58fe

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 0bfb1986

unknown authored Sep 05, 2006

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


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/grant.result:
  Manual merge.
mysql-test/r/sp.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/grant.test:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
mysql-test/t/view.test:
  manual merge.
sql/sql_acl.cc:
  manual merge.
sql/sql_parse.cc:
  manual merge.
sql/sql_yacc.yy:
  manual merge.

0bfb1986

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 8b7bbdd9

unknown authored Sep 05, 2006

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


include/config-netware.h:
  Auto merged
configure.in:
  Manual Merge.

8b7bbdd9

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · aa943079

unknown authored Sep 05, 2006

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


mysql-test/r/ctype_ucs2_def.result:
  Auto merged
mysql-test/t/ctype_ucs2_def-master.opt:
  Auto merged
mysql-test/t/ctype_ucs2_def.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysqld.cc:
  SCCS merged

aa943079

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 9f6dce54
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


mysql-test/t/handler.test:
  Auto merged
```
9f6dce54
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 31462d8c
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/sql_base.cc:
  Use refactored code.
```
31462d8c
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 5201f562
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/log.cc:
  Manual merge.
```
5201f562
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 9dd8054d
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


libmysqld/libmysqld.def:
  Auto merged
```
9dd8054d
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · ff6c1914
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
ff6c1914
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 381527e1
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
381527e1

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 479f4795

unknown authored Sep 05, 2006

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


mysql-test/r/ctype_ucs2_def.result:
  Auto merged
mysql-test/t/ctype_ucs2_def-master.opt:
  Auto merged
mysql-test/t/ctype_ucs2_def.test:
  Auto merged
sql/mysqld.cc:
  Manual merge.

479f4795

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 6c84b4cb
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql-common/client.c:
  Auto merged
```
6c84b4cb
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 13101bb7
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
13101bb7
Removed duplicate code from bad merge. · 1ecb3e11
unknown authored Sep 05, 2006

1ecb3e11