Commits · b08e1e6f2881210a48ae94362444111adbd51623 · nexedi / MariaDB

07 Oct, 2003 7 commits
- 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
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 2 commits

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

prohibited using derived tables in UPDATE command (BUG#1477) · 326e3410

unknown authored Oct 05, 2003

fixed incorrect table name in test


mysql-test/r/derived.result:
  fixed incorrect table name in test
  new test of derived table
mysql-test/t/derived.test:
  fixed incorrect table name in test
  new test of derived table
sql/sql_yacc.yy:
  prohibited using derived tables in UPDATE command

326e3410

04 Oct, 2003 3 commits

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


sql/sql_parse.cc:
  Auto merged
```
707efda6

Fix for bugs #1437, #1446 · 0bb1e434

unknown authored Oct 04, 2003


include/mysql.h:
  read_statistic added to virtual methods
libmysql/client_settings.h:
  interface for cli_read_statistic added
libmysql/libmysql.c:
  read_statistic and mysql_stat code changes
libmysqld/lib_sql.cc:
  emb_read_statistic implemented
  server_version initialized
sql-common/client.c:
  cli_read_statistic added to the table
sql/sql_parse.cc:
  storage of result of COM_STATISTIC changed in embedded library

0bb1e434

fixed error message as suggested by Peter Gulutzan · d4da026e
unknown authored Oct 04, 2003

d4da026e

03 Oct, 2003 7 commits

Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 56aa0fc3
unknown authored Oct 03, 2003
```
into mysql.com:/home/mysql_src/mysql-4.1
```
56aa0fc3
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · 19e849b8
unknown authored Oct 03, 2003
```
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1
```
19e849b8
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · 4ce3127a
unknown authored Oct 03, 2003
```
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1
```
4ce3127a
fixed bug with Item_sum_min/Item_sum_max from test func_gconcat.test · 08742044
unknown authored Oct 03, 2003

08742044

editing comments. · 3ec15a74

unknown authored Oct 03, 2003


mysql-test/t/rpl_relayrotate.test:
  a comment
sql/log_event.cc:
  removed irrelevant comment, added another one.

3ec15a74

Fix for a rpl_relayrotate failure. · 7f41edd7

unknown authored Oct 03, 2003

Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.


mysql-test/r/rpl_relayrotate.result:
  remove timeout which was too short for Valgrind
mysql-test/r/rpl_until.result:
  updated error message
mysql-test/t/rpl_relayrotate.test:
  removed timeout which was too short for Valgrind
sql/log_event.cc:
  Fix for a rpl_relayrotate failure. The problem was that Rotate_log_event::exec_event()
  believed that the relay log was corrupted. Fixed it by moving the test for
  corruption to Start_log_event::exec_event(). 
  Changed Rotate_log_event::exec_event() to not increment positions when the
  event is seen in the middle of a transaction (that was an old bug found by
  chance :)

7f41edd7

sql_cache.cc, mysql_priv.h: · 42c52649

unknown authored Oct 03, 2003

  Query cache now takes in account character_set_results and collation_connection


sql/mysql_priv.h:
  Query cache now takes in account character_set_results and collation_connection
sql/sql_cache.cc:
  Query cache now takes in account character_set_results and collation_connection

42c52649

02 Oct, 2003 2 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5f4a4c7a
  unknown authored Oct 03, 2003
```
into mishka.mysql.fi:/home/my/mysql-4.1


sql/mysql_priv.h:
  Auto merged
```
  5f4a4c7a
- Changes in NetWare directory from Novell, pre-4.1.1 · 0761637e
  unknown authored Oct 02, 2003
  
  0761637e