Commits · 49b0312dd7afe5a60a9d6aa22daff79bf50f0a84 · Kirill Smelkov / mariadb

03 Sep, 2003 1 commit

merge commit, hope that none of bar and dlenev changes were · 49b0312d

unknown authored Sep 03, 2003

lost.


BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  merge commit: new error message added
sql-common/client.c:
  merge commit
sql/mysql_priv.h:
  merge commit: autoremerge
sql/set_var.h:
  merge commit
sql/share/czech/errmsg.txt:
  merge commit
sql/share/danish/errmsg.txt:
  merge commit
sql/share/dutch/errmsg.txt:
  merge commit
sql/share/english/errmsg.txt:
  merge commit
sql/share/estonian/errmsg.txt:
  merge commit
sql/share/french/errmsg.txt:
  merge commit
sql/share/german/errmsg.txt:
  merge commit
sql/share/greek/errmsg.txt:
  merge commit
sql/share/hungarian/errmsg.txt:
  merge commit
sql/share/italian/errmsg.txt:
  merge commit
sql/share/japanese/errmsg.txt:
  merge commit
sql/share/korean/errmsg.txt:
  merge commit
sql/share/norwegian-ny/errmsg.txt:
  merge commit
sql/share/norwegian/errmsg.txt:
  merge commit
sql/share/polish/errmsg.txt:
  merge commit
sql/share/portuguese/errmsg.txt:
  merge commit
sql/share/romanian/errmsg.txt:
  merge commit
sql/share/russian/errmsg.txt:
  merge commit
sql/share/serbian/errmsg.txt:
  merge commit
sql/share/slovak/errmsg.txt:
  merge commit
sql/share/spanish/errmsg.txt:
  merge commit
sql/share/swedish/errmsg.txt:
  merge commit
sql/share/ukrainian/errmsg.txt:
  merge commit
sql/slave.cc:
  merge commit
sql/slave.h:
  merge commit
sql/sql_acl.cc:
  merge commit
sql/sql_parse.cc:
  merge commit
sql/sql_repl.h:
  merge commit

49b0312d

01 Sep, 2003 4 commits

Updated various tests results which were missed during auto-merge · 651898ad

unknown authored Sep 01, 2003

with replication over SSL patch.


mysql-test/r/rpl_error_ignored_table.result:
  New SSL related fields in SHOW SLAVE STATUS
mysql-test/r/rpl_loaddata.result:
  New SSL related fields in SHOW SLAVE STATUS
mysql-test/r/rpl_max_relay_size.result:
  New SSL related fields in SHOW SLAVE STATUS
mysql-test/r/rpl_openssl.result:
  Post merge update of SHOW SLAVE STATUS result
mysql-test/r/rpl_reset_slave.result:
  New SSL related fields in SHOW SLAVE STATUS
mysql-test/r/rpl_rotate_logs.result:
  Fixed bad manual merge result

651898ad

Manual merge fixes · b4d59a8d

unknown authored Sep 01, 2003


sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
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/german/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-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  Mabual merge
mysql-test/r/rpl_flush_log_loop.result:
  Mabual merge
mysql-test/r/rpl_log.result:
  Mabual merge
mysql-test/r/rpl_log_pos.result:
  Mabual merge
mysql-test/r/rpl_replicate_do.result:
  Mabual merge
mysql-test/r/rpl_rotate_logs.result:
  Mabual merge
sql/slave.cc:
  Mabual merge
sql/slave.h:
  Mabual merge

b4d59a8d

Implemented replication over SSL · 8a548ffd

unknown authored Sep 01, 2003

 Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
 Honoring this parameters during connection to master.
 Introduced new format of master.info file


include/mysqld_error.h:
  Added error code for "slave without SSL ignored SSL params warning"
mysql-test/Makefile.am:
  Copy files required for rpl_openssl test during the make process
mysql-test/r/rpl000015.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_empty_master_crash.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_flush_log_loop.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_log.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_log_pos.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_redirect.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_replicate_do.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
mysql-test/r/rpl_rotate_logs.result:
  Added fields to SHOW SLAVE STATUS for replication over SSL
sql/lex.h:
  Added MASTER_SSL lexems for CHANGE MASTER
sql/mysqld.cc:
  Added --master-ssl-ca parameter. Fixed description of other master-ssl parameters
sql/repl_failsafe.cc:
  Added SSL support to connect_to_master()
sql/share/czech/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/danish/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/dutch/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/english/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/estonian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/french/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/german/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/greek/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/hungarian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/italian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/japanese/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/korean/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/norwegian-ny/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/norwegian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/polish/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/portuguese/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/romanian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/russian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/serbian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/slovak/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/spanish/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/swedish/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/share/ukrainian/errmsg.txt:
  Added "slave without SSL ignored SSL params" warning
sql/slave.cc:
  Introduced new format of master.info file
  Added support of SSL params in master.info and SHOW SLAVE STATUS
  Added support of SSL connections
sql/slave.h:
  Added SSL parameters to MASTER_INFO
sql/sql_lex.h:
  Added SSL parameters for CHANGE MASTER TO
sql/sql_repl.cc:
  Added SSL parameters for CHANGE MASTER TO
sql/sql_yacc.yy:
  Added SSL parameters for CHANGE MASTER TO

8a548ffd

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ba91207f
unknown authored Sep 01, 2003
```
into mysql.r18.ru:/usr/home/ram/work/4.1
```
ba91207f

30 Aug, 2003 6 commits
- Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 37474a61
  unknown authored Aug 30, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
  37474a61
- Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1 · e4116780
  unknown authored Aug 30, 2003
```
into hegel.local:/home/miguel/bk/mysql-4.1
```
  e4116780
- Two small fixes · 674f3881
  unknown authored Aug 30, 2003
```
mysql-test/r/isam.result:
  Fixing results to match test changes
sql/sql_union.cc:
  Better fix for VC++
```
  674f3881
- Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · fd7bc726
  unknown authored Aug 30, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
  fd7bc726
- Fix for a compilation problem with VC++ · 83099205
  unknown authored Aug 30, 2003
  
  83099205
- Fix VC++ compiler error with redifinition return type · e9183c74
  unknown authored Aug 29, 2003
```
include/thr_alarm.h:
  Fix VC++ compiler error with redefinition return type
```
  e9183c74
29 Aug, 2003 4 commits
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · e515e4dc
  unknown authored Aug 29, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-tmp_field-4.1
```
  e515e4dc
- tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of... · 4ca3bee9
  unknown authored Aug 29, 2003
```
tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of tmp_table_field(TABLE *t_arg)


sql/item_timefunc.h:
  no need redefine tmp_table_field(), it will be inherited
```
  4ca3bee9
- comment left after merge was moved to correct · 06b4c4bc
  unknown authored Aug 29, 2003
```
place


sql/sql_class.h:
  comment moved to correct place
```
  06b4c4bc
- Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · f5558db1
  unknown authored Aug 29, 2003
```
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.fix
```
  f5558db1
28 Aug, 2003 14 commits

Fixed problem with absence of gmtime_r under Windows. · fb3ab3c8

unknown authored Aug 29, 2003


include/my_pthread.h:
  HAVE_GMTIME_R should not be defined under Windows
  (it is ok for HAVE_LOCALTIME_R since there additional implementation 
  in my_windcond.c.

fb3ab3c8

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 82ace8f8
unknown authored Aug 28, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1


sql/sql_select.cc:
  Auto merged
```
82ace8f8
fixed typo · 0f57bb2e
unknown authored Aug 28, 2003

0f57bb2e
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 914bc868
unknown authored Aug 28, 2003
```
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
```
914bc868
Fix for the bug #1125 mysqldump -X creates invalid XML · 38a65b4d
unknown authored Aug 28, 2003

38a65b4d
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 86feb16b
unknown authored Aug 28, 2003
```
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-aggregate-4.1
```
86feb16b
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · c326e596
unknown authored Aug 28, 2003
```
into deer.(none):/home/hf/work/mysql-4.1.clean
```
c326e596
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d1d92817
unknown authored Aug 28, 2003
```
into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
```
d1d92817
fixed merge mistake · f8e55811
unknown authored Aug 28, 2003

f8e55811

Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE · 241ed6b8

unknown authored Aug 28, 2003

This commit is related to my previos one(ChangeSet 1.1583 03/08/27 18:03:39).
Note about COMMIT&ROLLBACK:
  Only 'COMMIT' statement updates the binary log. 
  'ROLLBACK' statement doesn't update the binlog.


mysql-test/r/drop.result:
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
mysql-test/r/innodb.result:
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
mysql-test/t/drop.test:
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
mysql-test/t/innodb.test:
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
sql/handler.cc:
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
sql/sql_table.cc:
  Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE

241ed6b8

enum renamed (asked for compilation under windows) · 834cfbd1
unknown authored Aug 28, 2003

834cfbd1

SCRUM: · 36636e82

unknown authored Aug 28, 2003

Fixed some mess with STDCALL in function's declarations


include/mysql.h:
  That definitions are more correct
libmysqld/lib_sql.cc:
  should be declared as STDCALL
libmysqld/libmysqld.c:
  should be declared as STDCALL
sql-common/client.c:
  should be declared as STDCALL

36636e82

Merge · 94eb7e41

unknown authored Aug 27, 2003


sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/create.result:
  merge
mysql-test/t/create.test:
  merge
sql/item_cmpfunc.h:
  SCCS merged

94eb7e41

reset() split in 2 function clear() & add() · 85f7a697

unknown authored Aug 28, 2003

aggregate function reinitialization (if no rows was found) made with help of clear()
(fixed BUG#860)


mysql-test/r/subselect.result:
  test for BUG#860
mysql-test/t/subselect.test:
  test for BUG#860
sql/item_sum.cc:
  reset() replaced with clear()
sql/item_sum.h:
  reset() replaced with clear()
  (reset now is just composition of clear() and add())
sql/item_uniq.h:
  reset() replaced with clear()
sql/sql_select.cc:
  removed NULL value assigment, now it will be done by clear() call
  function for clearing if there was not found any row in group
sql/sql_select.h:
  function for clearing if there was not found any row in group

85f7a697

27 Aug, 2003 8 commits

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · f5d4eb89

unknown authored Aug 27, 2003

into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1


sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

f5d4eb89

fixed bug #910 (right type of ifnull function) · a73058a7

unknown authored Aug 27, 2003


mysql-test/r/create.result:
  added test for bug #910 (right type of ifnull function)
mysql-test/t/create.test:
  added test for bug #910 (right type of ifnull function)
sql/field.h:
  added new constructors of Field_decimal, Field_tiny, Field_short, Field_float,
  Field_null, Field_year
  for using in Item::tmp_table_field_from_field_type
sql/item.cc:
  added Item::tmp_table_field_from_field_type
sql/item.h:
  added Item::tmp_table_field_from_field_type

a73058a7

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c2d54add
unknown authored Aug 27, 2003
```
into narttu.mysql.fi:/my/mysql-4.1
```
c2d54add

hanged UDF interface to use clear() instead of reset() · 0ee6f7fd

unknown authored Aug 27, 2003


BUILD/FINISH.sh:
  Add just_clean option (for cleanup script)
scripts/mysql_fix_privilege_tables.sql:
  Added 'USE mysql' for easer use on windows
sql/item_sum.cc:
  Changed UDF interface to use clear() instead of reset()
sql/item_sum.h:
  Changed UDF interface to use clear() instead of reset()
sql/slave.cc:
  Fixed checking of eof for slave/master protocol. (Bug #887)
sql/sql_udf.cc:
  Changed UDF interface to use clear() instead of reset()
sql/sql_udf.h:
  Changed UDF interface to use clear() instead of reset()
sql/sql_yacc.yy:
  ERRORS and WARNINGS should not be reserved words
sql/udf_example.cc:
  Changed UDF interface to use clear() instead of reset()

0ee6f7fd

Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE · 5f8cc099
unknown authored Aug 27, 2003

5f8cc099
Merge fixes · cd822e34
unknown authored Aug 27, 2003
```
sql/sql_union.cc:
  Some further merge fixes
```
cd822e34

sql_union.cc: · 8a920b61

unknown authored Aug 27, 2003

  Post merge fixes


sql/sql_union.cc:
  Post merge fixes

8a920b61

merge fixes · 8a6f8201

unknown authored Aug 27, 2003


sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

8a6f8201

26 Aug, 2003 3 commits
- Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 8e8e4fe0
  unknown authored Aug 26, 2003
```
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
```
  8e8e4fe0
- Fix for bug in ROLLUP when all tables where 'const' tables (Bug #714) · 91dc31d3
  unknown authored Aug 26, 2003
```
mysql-test/r/olap.result:
  new test case for bug
mysql-test/t/olap.test:
  new test case for bug
sql-common/client.c:
  Safety fix
```
  91dc31d3
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c0cea540
  unknown authored Aug 26, 2003
```
into narttu.mysql.fi:/my/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
```
  c0cea540