Commits · 716b3e5435b3b58130628729f173d90c5462fab6 · Kirill Smelkov / mariadb

05 Sep, 2006 40 commits

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

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

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.

db018233

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

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

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

ebe937cc

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

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.

4a974740

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

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

a7a605cb

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

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

52f5b9dd

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

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.

721e9417

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

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

2e3e6ef1

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


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

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

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

489a9d5c

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

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

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.

a3361434

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


sql/set_var.cc:
  Manual merge.
```
40f8bb4f

Fix bad manual merge. · 1ad1ee30

unknown authored Sep 05, 2006


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

1ad1ee30

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


tests/mysql_client_test.c:
  Auto merged
```
15bd3945

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

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

5c5e0f5c

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

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

c9e647e3

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

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

f83f742b

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


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


tests/mysql_client_test.c:
  Auto merged
```
26c51d06

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

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

9b7a511a

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

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

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.

655470ce

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

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

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.

91d44bc2

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

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.

51384e21

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

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

84ed83b5

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


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


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


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


libmysqld/libmysqld.def:
  Auto merged
```
6a94bc51
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 5284bee2
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
5284bee2
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · eb54a574
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
eb54a574

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

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.

c27fea83

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


sql-common/client.c:
  Auto merged
```
e45deb96
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 2fec5b43
unknown authored Sep 05, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
2fec5b43