Commits · f94972f66d9793647f0ee1a4976cf892a07b176a · nexedi / MariaDB

08 Sep, 2003 2 commits

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · f94972f6
unknown authored Sep 08, 2003
```
into deer.(none):/home/hf/work/mysql-4.1.clean
```
f94972f6

unknown authored Sep 08, 2003


include/errmsg.h:
  Error code added
libmysql/errmsg.c:
  Error message added
libmysqld/lib_sql.cc:
  static inited variable changed to global server_inited
libmysqld/libmysqld.c:
  check for mysql_server_init execution added

d0f9e73a

07 Sep, 2003 2 commits
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 7c835f0a
  unknown authored Sep 07, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
```
  7c835f0a
- fixed row union processing · 57c9756b
  unknown authored Sep 07, 2003
```
mysql-test/r/subselect.result:
  row union test
mysql-test/t/subselect.test:
  row union test
```
  57c9756b
06 Sep, 2003 3 commits

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 08e27475
unknown authored Sep 06, 2003
```
into deer.(none):/home/hf/work/mysql-4.1.clean
```
08e27475

Fix for LOAD DATA to work with embedded library · 1496610d

unknown authored Sep 06, 2003


libmysqld/lib_sql.cc:
  There's now one common SCRAMBLE_LENGTH
sql/sql_load.cc:
  mysql_load fixed to work with embedded library
sql/sql_parse.cc:
  LOAD DATA enabled for embedded library

1496610d

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 17c52a90
unknown authored Sep 06, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-string_parameters-4.1
```
17c52a90

04 Sep, 2003 3 commits

Fix for bug 1176 · 6f607d3a
unknown authored Sep 04, 2003

6f607d3a

BUG · d89b2a9f

unknown authored Sep 04, 2003

correct bug 1085 (a problem with min/max functions)
add tests of bugs 833,836,1085


mysql-test/r/func_gconcat.result:
  add tests of bugs 833, 836, 1085
mysql-test/t/func_gconcat.test:
  add tests of bugs #833, 836, 1085
sql/item_sum.cc:
  merge
sql/item_sum.h:
  correct bug 1085

d89b2a9f

merge · 6bd42390
unknown authored Sep 04, 2003

6bd42390

03 Sep, 2003 13 commits

fixed bug - check_user shall not be included into the · 7efa0ee1
unknown authored Sep 03, 2003
```
embedded library.
```
7efa0ee1
Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1 · f6daa5c3
unknown authored Sep 03, 2003
```
into oak.local:/home/kostja/mysql/mysql-4.1-root
```
f6daa5c3
C cleanups · d8572f24
unknown authored Sep 03, 2003

d8572f24
Monty explanation for net_store_length(uint) put to the comment · ff458939
unknown authored Sep 03, 2003

ff458939

Merge bk-internal:/home/bk/mysql-4.1/ · 1ef5dce8

unknown authored Sep 03, 2003

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


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/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1ef5dce8

fixed after-merge bug in CHANG_USER command · b74332ec
unknown authored Sep 03, 2003
```
sql/sql_parse.cc:
  fixed after-merge bug in CHANGE_USER command
```
b74332ec
Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 15c0fe47
unknown authored Sep 03, 2003
```
into oak.local:/home/kostja/mysql/mysql-4.1-root


BitKeeper/etc/ignore:
  auto-union
```
15c0fe47

post-merge fixes · d42b4eeb

unknown authored Sep 03, 2003


mysql-test/r/func_crypt.result:
  _dig_vec converted lowercase
sql/slave.cc:
  post-merge fix

d42b4eeb

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 90c74b36
unknown authored Sep 03, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-string_parameters-4.1
```
90c74b36

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

merged · cf578b26

unknown authored Sep 03, 2003


include/my_sys.h:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

cf578b26

CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ] · 4a21b30e

unknown authored Sep 03, 2003


myisam/mi_checksum.c:
  workaround for zlib's crc32 glitch
mysql-test/r/show_check.result:
  results updated
mysys/checksum.c:
  switching to crc32 as a checksum algorithm

4a21b30e

Added automatically created SSL certificates from mysql-test/std_data · 93c9f9c6
unknown authored Sep 03, 2003
```
to ignore list.
```
93c9f9c6

02 Sep, 2003 1 commit

fixed string parameter assugnment (coping instead of asigning pointer to buffer) (BUG#1115) · 0e2f6264

unknown authored Sep 02, 2003

fixed test_field_misc (UTF variable value)


sql/item.cc:
  added debug informetion
  fixed string parameter assugnment (coping instead of asigning pointer to buffer)
tests/client_test.c:
  test for BUG#1115
  fixed test_field_misc (UTF variable value)

0e2f6264

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 2 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 mysql.com:/home/wax/mysql/mysql-4.1 · 0a371caf

unknown authored Aug 29, 2003

into mysql.com:/home/wax/mysql/mysql-4.1mm


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

0a371caf