Commits · 5dd1379fcd410adc7988e21a48db20e03ca58db1 · nexedi / MariaDB

09 Sep, 2003 3 commits

merge · 5dd1379f

unknown authored Sep 09, 2003


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

5dd1379f

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 83794e3f

unknown authored Sep 09, 2003

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


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

83794e3f

Fix for a bug #1226. · 6bc438e3

unknown authored Sep 09, 2003

Happens when braces are used on a single select, which leads
to the uninitialized global parameters structure.

6bc438e3

08 Sep, 2003 7 commits

Merge bk-internal:/home/bk/mysql-4.1/ · 706fb1b2
unknown authored Sep 08, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
706fb1b2
Merge · 59234e45
unknown authored Sep 08, 2003
```
innobase/row/row0sel.c:
  SCCS merged
```
59234e45

fix for #1219 · a700a6e4

unknown authored Sep 08, 2003


libmysqld/lib_sql.cc:
  we need ER() macrodefinition from errmsg.h

a700a6e4

fix for #1218 · a363f0fb

unknown authored Sep 08, 2003


sql/sql_parse.cc:
  This line fails in libmysqld.
  And isn't needed while we don't check privileges in embedded library

a363f0fb

Trimming of embedded library code · d78fae17

unknown authored Sep 08, 2003


sql/sql_parse.cc:
  It's better to check for HAVE_REPLICATION here instead of EMBEDDED_LIBRARY

d78fae17

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

fix for #1210 · 7ee0b7e6

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

7ee0b7e6

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

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

Fix for LOAD DATA to work with embedded library · cff1b45f

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

cff1b45f

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

04 Sep, 2003 3 commits

Fix for bug 1176 · 34625c18
unknown authored Sep 04, 2003

34625c18

BUG · 30535c58

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

30535c58

merge · a5650c0b
unknown authored Sep 04, 2003

a5650c0b

03 Sep, 2003 15 commits

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

12f7ffbb
Monty explanation for net_store_length(uint) put to the comment · 4e31a173
unknown authored Sep 03, 2003

4e31a173

Merge bk-internal:/home/bk/mysql-4.1/ · df23d18e

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

df23d18e

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


BitKeeper/etc/ignore:
  auto-union
```
48e6347a

post-merge fixes · d45953fa

unknown authored Sep 03, 2003


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

d45953fa

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

merge commit, hope that none of bar and dlenev changes were · 5b4fdded

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

5b4fdded

merged · 3350532e

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

3350532e

making InnoDB to return the row exactly the same (bytewise) as it was written to it · 3652deae
unknown authored Sep 03, 2003

3652deae

CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ] · 94b750c6

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

94b750c6

Added automatically created SSL certificates from mysql-test/std_data · 5ab0391a
unknown authored Sep 03, 2003
```
to ignore list.
```
5ab0391a
inserted forgoten ASSERT (BUG#1180) · 5774cd1f
unknown authored Sep 03, 2003
```
sql/sql_prepare.cc:
  inserted forgoten ASSERT
```
5774cd1f

02 Sep, 2003 2 commits

fixed BUG#1180 (changing WHERE clause of prepared statements by optimisation) · 313fee35

unknown authored Sep 02, 2003


sql/item.h:
  constructor and method for aloning AND/OR structure of WHERE clause
sql/item_cmpfunc.cc:
  constructor and method for aloning AND/OR structure of WHERE clause
sql/item_cmpfunc.h:
  constructor and method for aloning AND/OR structure of WHERE clause
sql/item_func.cc:
  constructor for aloning AND/OR structure of WHERE clause
sql/item_func.h:
  constructor for aloning AND/OR structure of WHERE clause
sql/sql_lex.cc:
  field for saving WHERE root
sql/sql_lex.h:
  field for saving WHERE root
sql/sql_prepare.cc:
  saving WHERE root
  creating new AND/OR structure before executing prepared statement
tests/client_test.c:
  test suite for bug #1180

313fee35

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

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)

7207e232

01 Sep, 2003 4 commits

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

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

ccc46837

Manual merge fixes · 17a21538

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

17a21538

Implemented replication over SSL · 41a38d47

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

41a38d47

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

30 Aug, 2003 1 commit
- Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 95f1b509
  unknown authored Aug 30, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
  95f1b509