Commits · 153277938e010139241c0e63f7703d90dfc649ca · nexedi / MariaDB

08 Oct, 2003 7 commits
- Incorporate Stefan's new translations of German error messages. · 15327793
  unknown authored Oct 08, 2003
  
  15327793
- - portability fix: replaced "uint" with "unsigned int" · c613801a
  unknown authored Oct 08, 2003
  
  c613801a
- - added missing link line that seemed to have gone lost during the last · 9b270155
  unknown authored Oct 08, 2003
```
   4.0->4.1 merge (mysqltest needs to be linked with a C++ compiler)
```
  9b270155
- Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · a9d38863
  unknown authored Oct 08, 2003
```
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
```
  a9d38863
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 31f16704
  unknown authored Oct 08, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  31f16704
- query_cache.result, query_cache.test: · 9716275c
  unknown authored Oct 08, 2003
```
  Character set variables test


mysql-test/t/query_cache.test:
  Character set variables test
mysql-test/r/query_cache.result:
  Character set variables test
```
  9716275c
- Fixed test case to work on NetWare. · 4d3e0c71
  unknown authored Oct 08, 2003
```
mysql-test/r/func_gconcat.result:
  Removed extraneous CR (0x0D)
mysql-test/t/func_gconcat.test:
  Removed extraneous CR (0x0D)
```
  4d3e0c71
07 Oct, 2003 13 commits

Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 0649d454

unknown authored Oct 07, 2003

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1


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

0649d454

Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 6cb9a8f5
unknown authored Oct 07, 2003
```
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-constructors-4.1
```
6cb9a8f5

Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · bd925a00

unknown authored Oct 07, 2003

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-constructors-4.1


sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged

bd925a00

after merge fix · aa22cbdf
unknown authored Oct 07, 2003

aa22cbdf

Many files: · 0b5a6142

unknown authored Oct 07, 2003

  Multiple tablespaces for InnoDB
sql_table.cc:
  Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
sql_update.cc, sql_select.cc, my_base.h:
  More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS


include/my_base.h:
  More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
sql/sql_select.cc:
  More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
sql/sql_update.cc:
  More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
sql/sql_table.cc:
  Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
sql/sql_db.cc:
  Multiple tablespaces for InnoDB
sql/ha_innodb.cc:
  Multiple tablespaces for InnoDB
sql/mysqld.cc:
  Multiple tablespaces for InnoDB
sql/set_var.cc:
  Multiple tablespaces for InnoDB
sql/sql_cache.cc:
  Multiple tablespaces for InnoDB
sql/ha_innodb.h:
  Multiple tablespaces for InnoDB
innobase/include/btr0btr.ic:
  Multiple tablespaces for InnoDB
innobase/include/btr0pcur.ic:
  Multiple tablespaces for InnoDB
innobase/include/data0type.ic:
  Multiple tablespaces for InnoDB
innobase/include/dyn0dyn.ic:
  Multiple tablespaces for InnoDB
innobase/include/fut0lst.ic:
  Multiple tablespaces for InnoDB
innobase/include/log0log.ic:
  Multiple tablespaces for InnoDB
innobase/include/mach0data.ic:
  Multiple tablespaces for InnoDB
innobase/include/mtr0log.ic:
  Multiple tablespaces for InnoDB
innobase/include/rem0rec.ic:
  Multiple tablespaces for InnoDB
innobase/include/ut0byte.ic:
  Multiple tablespaces for InnoDB
innobase/include/ut0ut.ic:
  Multiple tablespaces for InnoDB
innobase/include/buf0buf.h:
  Multiple tablespaces for InnoDB
innobase/include/buf0lru.h:
  Multiple tablespaces for InnoDB
innobase/include/buf0rea.h:
  Multiple tablespaces for InnoDB
innobase/include/data0type.h:
  Multiple tablespaces for InnoDB
innobase/include/db0err.h:
  Multiple tablespaces for InnoDB
innobase/include/dict0boot.h:
  Multiple tablespaces for InnoDB
innobase/include/dict0dict.h:
  Multiple tablespaces for InnoDB
innobase/include/dict0load.h:
  Multiple tablespaces for InnoDB
innobase/include/dict0mem.h:
  Multiple tablespaces for InnoDB
innobase/include/fil0fil.h:
  Multiple tablespaces for InnoDB
innobase/include/fsp0fsp.h:
  Multiple tablespaces for InnoDB
innobase/include/ibuf0ibuf.h:
  Multiple tablespaces for InnoDB
innobase/include/lock0lock.h:
  Multiple tablespaces for InnoDB
innobase/include/log0log.h:
  Multiple tablespaces for InnoDB
innobase/include/log0recv.h:
  Multiple tablespaces for InnoDB
innobase/include/os0file.h:
  Multiple tablespaces for InnoDB
innobase/include/page0page.h:
  Multiple tablespaces for InnoDB
innobase/include/que0types.h:
  Multiple tablespaces for InnoDB
innobase/include/rem0rec.h:
  Multiple tablespaces for InnoDB
innobase/include/srv0srv.h:
  Multiple tablespaces for InnoDB
innobase/include/srv0start.h:
  Multiple tablespaces for InnoDB
innobase/include/sync0sync.h:
  Multiple tablespaces for InnoDB
innobase/include/trx0sys.h:
  Multiple tablespaces for InnoDB
innobase/include/ut0byte.h:
  Multiple tablespaces for InnoDB
innobase/include/univ.i:
  Multiple tablespaces for InnoDB
innobase/btr/btr0cur.c:
  Multiple tablespaces for InnoDB
innobase/btr/btr0sea.c:
  Multiple tablespaces for InnoDB
innobase/buf/buf0buf.c:
  Multiple tablespaces for InnoDB
innobase/buf/buf0flu.c:
  Multiple tablespaces for InnoDB
innobase/buf/buf0lru.c:
  Multiple tablespaces for InnoDB
innobase/buf/buf0rea.c:
  Multiple tablespaces for InnoDB
innobase/data/data0type.c:
  Multiple tablespaces for InnoDB
innobase/dict/dict0boot.c:
  Multiple tablespaces for InnoDB
innobase/dict/dict0crea.c:
  Multiple tablespaces for InnoDB
innobase/dict/dict0dict.c:
  Multiple tablespaces for InnoDB
innobase/dict/dict0load.c:
  Multiple tablespaces for InnoDB
innobase/dict/dict0mem.c:
  Multiple tablespaces for InnoDB
innobase/fil/fil0fil.c:
  Multiple tablespaces for InnoDB
innobase/fsp/fsp0fsp.c:
  Multiple tablespaces for InnoDB
innobase/ha/ha0ha.c:
  Multiple tablespaces for InnoDB
innobase/ibuf/ibuf0ibuf.c:
  Multiple tablespaces for InnoDB
innobase/log/log0log.c:
  Multiple tablespaces for InnoDB
innobase/log/log0recv.c:
  Multiple tablespaces for InnoDB
innobase/mach/mach0data.c:
  Multiple tablespaces for InnoDB
innobase/mem/mem0dbg.c:
  Multiple tablespaces for InnoDB
innobase/mem/mem0pool.c:
  Multiple tablespaces for InnoDB
innobase/mtr/mtr0log.c:
  Multiple tablespaces for InnoDB
innobase/os/os0file.c:
  Multiple tablespaces for InnoDB
innobase/os/os0proc.c:
  Multiple tablespaces for InnoDB
innobase/page/page0cur.c:
  Multiple tablespaces for InnoDB
innobase/que/que0que.c:
  Multiple tablespaces for InnoDB
innobase/row/row0ins.c:
  Multiple tablespaces for InnoDB
innobase/row/row0mysql.c:
  Multiple tablespaces for InnoDB
innobase/row/row0sel.c:
  Multiple tablespaces for InnoDB
innobase/row/row0upd.c:
  Multiple tablespaces for InnoDB
innobase/srv/srv0srv.c:
  Multiple tablespaces for InnoDB
innobase/srv/srv0start.c:
  Multiple tablespaces for InnoDB
innobase/sync/sync0rw.c:
  Multiple tablespaces for InnoDB
innobase/sync/sync0sync.c:
  Multiple tablespaces for InnoDB
innobase/trx/trx0sys.c:
  Multiple tablespaces for InnoDB
innobase/trx/trx0trx.c:
  Multiple tablespaces for InnoDB
innobase/trx/trx0undo.c:
  Multiple tablespaces for InnoDB
innobase/ut/ut0byte.c:
  Multiple tablespaces for InnoDB
innobase/ut/ut0ut.c:
  Multiple tablespaces for InnoDB

0b5a6142

fixed error detection · b08e1e6f
unknown authored Oct 07, 2003

b08e1e6f
merge · d5a0441a
unknown authored Oct 07, 2003
```
sql/item_subselect.h:
  Auto merged
```
d5a0441a
after merge fix · b70040a1
unknown authored Oct 07, 2003

b70040a1
Simple optimization · 670321ce
unknown authored Oct 07, 2003

670321ce

merge · 6ac1dc86

unknown authored Oct 07, 2003


sql/item_subselect.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

6ac1dc86

WL #562: Change format of slow log in 4.1 · 57e77c21
unknown authored Oct 07, 2003

57e77c21
merge · 7e722762
unknown authored Oct 07, 2003
```
sql/sql_yacc.yy:
  Auto merged
```
7e722762
merge · c2cf7476
unknown authored Oct 07, 2003

c2cf7476

06 Oct, 2003 19 commits

Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · bdf40ae2

unknown authored Oct 07, 2003

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1


sql/mysql_priv.h:
  Auto merged

bdf40ae2

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · cb439d4e
unknown authored Oct 07, 2003
```
into narttu.mysql.fi:/my/mysql-4.1
```
cb439d4e

Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 3febbcf4

unknown authored Oct 07, 2003

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

3febbcf4

after merge fix · ec094f40
unknown authored Oct 07, 2003

ec094f40
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 07e6ef7f
unknown authored Oct 07, 2003
```
into narttu.mysql.fi:/my/mysql-4.1


sql/item_subselect.cc:
  Auto merged
```
07e6ef7f

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 98313f42

unknown authored Oct 06, 2003

into mishka.mysql.fi:/home/my/mysql-4.1


include/mysql.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged

98313f42

Move init_compiled_charsets to own file · 6510d6a1

unknown authored Oct 06, 2003

Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used
Simple code cleanup


client/mysql.cc:
  Fixed indentation
include/my_sys.h:
  Move init_compiled_charsets to own file
include/mysql.h:
  Remove compiler warning	
libmysql/Makefile.shared:
  Move init_compiled_charsets to own file
mysys/Makefile.am:
  Move init_compiled_charsets to own file
mysys/charset.c:
  Move init_compiled_charsets to own file
mysys/my_init.c:
  Remove dependency of charsets
scripts/mysql_create_system_tables.sh:
  Remove run time warning
scripts/mysql_fix_privilege_tables.sql:
  Add help tables
sql/sql_insert.cc:
  Code cleanup

6510d6a1

Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 03545a9a
unknown authored Oct 06, 2003
```
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1
```
03545a9a

fixed error names · b94300ab

unknown authored Oct 06, 2003


mysql-test/r/row.result:
  fixed error message as it was suggested by Peter Gulutzan
mysql-test/r/subselect.result:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/czech/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/danish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/dutch/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/english/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/estonian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/french/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/german/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/greek/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/hungarian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/italian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/japanese/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/korean/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/norwegian-ny/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/norwegian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/polish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/portuguese/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/romanian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/russian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/serbian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/slovak/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/spanish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/swedish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/ukrainian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan

b94300ab

Merge · a808926c

unknown authored Oct 06, 2003


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

a808926c

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3a077bf0
unknown authored Oct 06, 2003
```
into narttu.mysql.fi:/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
```
3a077bf0
Fix for #1447 · 2d106ed6
unknown authored Oct 06, 2003
```
libmysqld/lib_sql.cc:
  Check for unfetched rows added
```
2d106ed6

Fix for #1488 · f9c85521

unknown authored Oct 06, 2003


libmysqld/lib_sql.cc:
  net->sqlstate should be initialized here

f9c85521

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 24bf52c0
unknown authored Oct 06, 2003
```
into deer.(none):/home/hf/work/mysql-4.1.stmt
```
24bf52c0

Fix for #1487 · d98b1186

unknown authored Oct 06, 2003


libmysqld/lib_sql.cc:
  arg_parameters now are stored in these THD members
sql/sql_class.h:
  members to store query arguments
sql/sql_prepare.cc:
  query arguments retrieval added for embedded case
  code not necessary in embedded server #ifdefed

d98b1186

fix error messages · 1385d26e

unknown authored Oct 06, 2003

fix derived inside subqueries


mysql-test/r/subselect.result:
  error tex changes whi i forgot to commit
mysql-test/t/derived.test:
  code changing
sql/sql_yacc.yy:
  allow derived inside subselects

1385d26e

Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · f0134b1c
unknown authored Oct 06, 2003
```
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-derived-4.1
```
f0134b1c
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 37770120
unknown authored Oct 06, 2003
```
into deer.(none):/home/hf/work/mysql-4.1.stmt
```
37770120

Fix for #1470 · ffa71446

unknown authored Oct 06, 2003


libmysqld/lib_sql.cc:
  check for error
sql/sql_prepare.cc:
  set success mark here

ffa71446

05 Oct, 2003 1 commit

Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · fa60085a

unknown authored Oct 05, 2003

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1


sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged

fa60085a