Commits · 076b089a369825765df21d3b6c1732e4ea093e8f · nexedi / MariaDB

16 Sep, 2003 6 commits

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 076b089a
unknown authored Sep 16, 2003
```
into deer.(none):/home/hf/work/mysql-4.1.stmt
```
076b089a
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3952cb0f
unknown authored Sep 16, 2003
```
into deer.(none):/home/hf/work/mysql-4.1.stmt


sql/sql_class.h:
  Auto merged
```
3952cb0f

SCRUM · d0580715

unknown authored Sep 16, 2003

Prepared statements in embedded server
Several changes in library code with two goals:
to make mysql_prepare_stmt working in embedded server
to get rid of #define mysql_interface_func mysql->methods->interface_func
in user's interface


include/mysql.h:
  modifications of interface
  two goals: to implement prepared statements and to get rid
  of #define mysql_proc (mysql->smth) in interface
include/sql_common.h:
  read_rows function got 'virtual'
libmysql/client_settings.h:
  interface of some functions declared in client.c moved here
libmysql/libmysql.c:
  several functions changed with declared goals
libmysqld/embedded_priv.h:
  libmysqld.c <--> lib_sql.cc interface moved here
libmysqld/lib_sql.cc:
  all embedded 'virtual' functions moved here so they can be static
libmysqld/libmysqld.c:
  embedded 'virtual' function was moved out of here
sql-common/client.c:
  several changes with the declared goal
sql/sql_class.h:
  place to store statement data added to THD
sql/sql_prepare.cc:
  storing of prepare_statement result for embedded server added

d0580715

Bug fix: · 62f2cb14
unknown authored Sep 16, 2003
```
http://bugs.mysql.com/bug.php?id=1264
```
62f2cb14
Bug fix: · a0c238f6
unknown authored Sep 16, 2003
```
http://bugs.mysql.com/bug.php?id=1264
```
a0c238f6

Bug fix: · 0ebd55fc

unknown authored Sep 16, 2003

http://bugs.mysql.com/bug.php?id=1129
From:	Georg Richter
Description: there is a problem with special chars like umlauts in comments

0ebd55fc

15 Sep, 2003 14 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 81466771
unknown authored Sep 16, 2003
```
into mysql.com:/home/dlenev/src/mysql-4.1-clean
```
81466771

Made rpl_until test independent from mysqld version · bf9c210f

unknown authored Sep 16, 2003


mysql-test/r/rpl_until.result:
  Made test indepdendent from mysqld version
mysql-test/t/rpl_until.test:
  Made test indepdendent from mysqld version

bf9c210f

minor authentification optimisation · 12887c2f

unknown authored Sep 16, 2003


sql/sql_parse.cc:
  authentification fix: one constructor and two
  variables optimised

12887c2f

Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · d5877319
unknown authored Sep 15, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
```
d5877319
New SQL variables "collation_server" and "collation_database" · ebda1ae2
unknown authored Sep 15, 2003

ebda1ae2
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 34da7161
unknown authored Sep 15, 2003
```
into mysql.com:/home/mysql_src/mysql-4.1
```
34da7161

Accept SLAVE START and STOP, even if deprecated. · cc17035d

unknown authored Sep 15, 2003


sql/log_event.cc:
  undoing a wrong change (the case is handled in Rotate_log_event::exec_event)

cc17035d

Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 0ea88aca
unknown authored Sep 15, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
0ea88aca
In CREATE syntax: KEY a (field_name(10)) · faf5df67
unknown authored Sep 15, 2003
```
10 now means "number of characters", not number of bytes.
```
faf5df67
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 49baac8d
unknown authored Sep 15, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
```
49baac8d
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 7385c498
unknown authored Sep 15, 2003
```
into mysql.com:/home/mysql_src/mysql-4.1
```
7385c498

type_nchar.result: · e0c70de4

unknown authored Sep 15, 2003

  I forgot to push it in the previous changeset.


mysql-test/r/type_nchar.result:
  I forgot to push it in the previous changeset.

e0c70de4

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 15bde938
unknown authored Sep 15, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
```
15bde938

New syntax: · bf6480ba

unknown authored Sep 15, 2003

CREATE TABLE t1(a NVARCHAR(10))
This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.

Note, standard SQL doesn't have "NVARCHAR" syntax.
There are only these syntaxes in SQL2003:
 NATIONAL VARCHAR
 NCHAR VARCHAR
 NATIONAL CHARACTER VARYING 
 NCHAR VARYING

- Tests were added for all the above syntaxes.


sql/lex.h:
  New syntax:
  
  CREATE TABLE t1(a NVARCHAR(10))
  This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.
  
  Note, standard SQL doesn't have "NVARCHAR" syntax.
  There are only these syntaxes in SQL2003:
   NATIONAL VARCHAR
   NCHAR VARCHAR
   NATIONAL CHARACTER VARYING 
   NCHAR VARYING
sql/sql_yacc.yy:
  New syntax:
  
  CREATE TABLE t1(a NVARCHAR(10))
  This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.
  
  Note, standard SQL doesn't have "NVARCHAR" syntax.
  There are only these syntaxes in SQL2003:
   NATIONAL VARCHAR
   NCHAR VARCHAR
   NATIONAL CHARACTER VARYING 
   NCHAR VARYING

bf6480ba

14 Sep, 2003 3 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5d1b299f
unknown authored Sep 14, 2003
```
into mysql.com:/home/dlenev/src/mysql-4.1-868
```
5d1b299f

Post merge fixes. Fixed tests after adding UNTIL conditions · b15eba88

unknown authored Sep 14, 2003

to SHOW SLAVE STATUS.


mysql-test/r/rpl000015.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_empty_master_crash.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_error_ignored_table.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_flush_log_loop.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_loaddata.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_log.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_log_pos.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_max_relay_size.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_openssl.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_redirect.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_replicate_do.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_reset_slave.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_rotate_logs.result:
  Fixed test after adding UNTIL conditions to SHOW SLAVE STATUS
mysql-test/r/rpl_until.result:
  Post merge fix
mysql-test/t/rpl_until.test:
  Post merge fix

b15eba88

renamed join_types (as was suggested by Peter Gulutzan) · e3b11b1d
unknown authored Sep 14, 2003

e3b11b1d

13 Sep, 2003 7 commits

Manual merge after commiting START SLAVE UNTIL · 1f82a0de

unknown authored Sep 14, 2003


sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
include/mysqld_error.h:
  Manual merge
mysql-test/r/rpl000015.result:
  Manual merge
mysql-test/r/rpl_empty_master_crash.result:
  Manual merge
mysql-test/r/rpl_flush_log_loop.result:
  Manual merge
mysql-test/r/rpl_log.result:
  Manual merge
mysql-test/r/rpl_log_pos.result:
  Manual merge
mysql-test/r/rpl_redirect.result:
  Manual merge
mysql-test/r/rpl_replicate_do.result:
  Manual merge
mysql-test/r/rpl_rotate_logs.result:
  Manual merge
sql/share/czech/errmsg.txt:
  Manual merge
sql/share/danish/errmsg.txt:
  Manual merge
sql/share/dutch/errmsg.txt:
  Manual merge
sql/share/english/errmsg.txt:
  Manual merge
sql/share/estonian/errmsg.txt:
  Manual merge
sql/share/french/errmsg.txt:
  Manual merge
sql/share/german/errmsg.txt:
  Manual merge
sql/share/greek/errmsg.txt:
  Manual merge
sql/share/hungarian/errmsg.txt:
  Manual merge
sql/share/italian/errmsg.txt:
  Manual merge
sql/share/japanese/errmsg.txt:
  Manual merge
sql/share/korean/errmsg.txt:
  Manual merge
sql/share/norwegian-ny/errmsg.txt:
  Manual merge
sql/share/norwegian/errmsg.txt:
  Manual merge
sql/share/polish/errmsg.txt:
  Manual merge
sql/share/portuguese/errmsg.txt:
  Manual merge
sql/share/romanian/errmsg.txt:
  Manual merge
sql/share/russian/errmsg.txt:
  Manual merge
sql/share/serbian/errmsg.txt:
  Manual merge
sql/share/slovak/errmsg.txt:
  Manual merge
sql/share/spanish/errmsg.txt:
  Manual merge
sql/share/swedish/errmsg.txt:
  Manual merge
sql/share/ukrainian/errmsg.txt:
  Manual merge
sql/slave.cc:
  Manual merge
sql/slave.h:
  Manual merge
sql/sql_repl.cc:
  Manual merge
sql/sql_yacc.yy:
  Manual merge

1f82a0de

Implemented support for START SLAVE UNTIL (WL#868) · 2f8f0a7e

unknown authored Sep 14, 2003


include/mysqld_error.h:
  Added error codes for warnings and error messages for START SLAVE UNTIL
mysql-test/r/rpl000015.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_empty_master_crash.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_flush_log_loop.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_log.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_log_pos.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_redirect.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_replicate_do.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_rotate_logs.result:
  Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
sql/lex.h:
  Added UNTIL symbol
sql/log.cc:
  Invalidating until_log_name comparison result if group_relay_log_name is changed
sql/log_event.cc:
  Invalidating until_log_name comparison result if group_master_log_name is changed
sql/repl_failsafe.cc:
  Cancel until condition if LOAD MASTER DATA is executed
sql/share/czech/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/danish/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/dutch/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/english/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/estonian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/french/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/german/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/greek/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/hungarian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/italian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/japanese/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/korean/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/norwegian-ny/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/norwegian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/polish/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/portuguese/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/romanian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/russian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/serbian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/slovak/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/spanish/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/swedish/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/share/ukrainian/errmsg.txt:
  Added error and warning message for START SLAVE UNTIL
sql/slave.cc:
  Fixed wrong locking order in init_relay_log_pos()
  Added until condition fields to SHOW SLAVE STATUS
  Added checking if UNTIL condition is reached 
  (added proper method, added its invocation, reorganized locking 
  in exec_relay_log_event() and next_event())
sql/slave.h:
  Members in RELAY_LOG_INFO for storing UNTIL condition. Also 
  methods for for invalidation of cached UNTIL condition comparison
  results
sql/sql_repl.cc:
  Now honoring UNTIL clause then starting slave thread. Proper 
  errors and warnings.
sql/sql_yacc.yy:
  Added support for UNTIL clause in START SLAVE. This involved 
  extraction of some of master_defs to separate master_file_def
  non-terminal.

2f8f0a7e

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · df8b036d
unknown authored Sep 13, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
df8b036d

Fixes for OPTION_FOUND_ROWS in UNION's · aedc0ab0

unknown authored Sep 13, 2003


mysql-test/r/subselect.result:
  A warning added to subselect test due to the recent changes.
  
  UNION in sub-select returns the empty set, which is why this warning is
  a mistery to me.
mysql-test/r/union.result:
  two changes.
  
  First one is due to the proper handling of LIMIT offset, limit in 
  UNION without all.
  
  Second is a change in behaviour due to the fact that ORDER by in a 
  UNION without braces is not now applicable to the last SELECT node.
  
  It can not be applied until one bug is fixed (after my vacation).
  
  Should be documented.

aedc0ab0

"normal" warning in test suite disabled · 7eb9d41c

unknown authored Sep 13, 2003

bad merge fixed


mysql-test/t/isam.test:
  bad merge fixed
mysql-test/t/lock_tables_lost_commit.test:
  "normal" warning in test suite disabled
mysql-test/t/subselect.test:
  "normal" warning in test suite disabled

7eb9d41c

error messages from english/errmsg.txt added to other languages. · 80206632

unknown authored Sep 13, 2003

bug#1269


sql/share/czech/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/danish/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/dutch/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/estonian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/french/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/german/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/greek/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/hungarian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/italian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/japanese/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/korean/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/norwegian-ny/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/norwegian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/polish/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/portuguese/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/romanian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/russian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/serbian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/slovak/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/spanish/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/swedish/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269
sql/share/ukrainian/errmsg.txt:
  error messages from english/errmsg.txt added to other languages.
  bug##1269

80206632

removed double procedure deletetion · 434faadc
unknown authored Sep 13, 2003

434faadc

12 Sep, 2003 8 commits

fixed memory leak (now JOIN cleaning procedure always called) · 5b0c15a4
unknown authored Sep 13, 2003
```
sql/sql_select.cc:
  always clean JOIN
```
5b0c15a4
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 61663eaa
unknown authored Sep 12, 2003
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
```
61663eaa

Fix for a bug #1231 · 67dafb01

unknown authored Sep 12, 2003

Parse error caused global ORDER BY to be initialized although it should
not have been.

67dafb01

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 774c65c7

unknown authored Sep 12, 2003

into deer.(none):/home/hf/work/mysql-4.1.stmt


include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged

774c65c7

SCRUM: · dc250a6e

unknown authored Sep 12, 2003

#977 Prepared statements in embedded library


include/mysql.h:
  read_prepare_result function moved to 'virtual'
libmysql/client_settings.h:
  declare proper function for libmysql
libmysql/libmysql.c:
  some code moved from implementation of read_prepare_result to 
  mysql_prepare_result to make creating separate (remote and embedded-server)
  versions easier
libmysqld/libmysqld.c:
  emb_read_prepare_result prototype
sql-common/client.c:
  cli_read_prepare_result added to the client_methods
sql/client_settings.h:
  we don't need prepared statements in mini_client
sql/sql_prepare.cc:
  embedded send_prep_stmt added

dc250a6e

Monty's merge bug fixed · 11930efb

unknown authored Sep 12, 2003


libmysqld/lib_sql.cc:
  these definitions moved to be after my_bool declaration

11930efb

Fix results for mix_innodb_myisam_binlog · 32a4e783

unknown authored Sep 12, 2003

Optimize calls to current_thd


mysql-test/r/mix_innodb_myisam_binlog.result:
  updated results
mysql-test/t/mix_innodb_myisam_binlog.test:
  Fix for 4.1
sql/ha_innodb.cc:
  Don't call current_thd in an assert that is not deleted in release version
  (Because current_thd is slow)

32a4e783

Optimize thai character handling · 3500763b

unknown authored Sep 12, 2003

Remove sel000xxxx tests
After merge fixes


BitKeeper/deleted/.del-sel000033.test~3971fbe746eec069:
  Delete: mysql-test/t/sel000033.test
BitKeeper/deleted/.del-sel000033.result~56d1d02d72b94602:
  Delete: mysql-test/r/sel000033.result
BitKeeper/deleted/.del-sel000100.result~84ed46856cb3a69f:
  Delete: mysql-test/r/sel000100.result
BitKeeper/deleted/.del-sel000100.test~548501cad19a1a59:
  Delete: mysql-test/t/sel000100.test
mysql-test/r/distinct.result:
  Merge test with sel000100
mysql-test/r/grant.result:
  Update result after merge
mysql-test/r/range.result:
  After merge fix
  Merge test with sel000033
mysql-test/t/distinct.test:
  Merge test with sel000100
mysql-test/t/range.test:
  Merge test with sel000033
sql/log_event.cc:
  Remove duplicate allocation
sql/sql_select.cc:
  After merge fixes
strings/ctype-tis620.c:
  Remove usage of strnlen
  Optimize code and make it \0 safe

3500763b

11 Sep, 2003 2 commits

Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · d410f851
unknown authored Sep 11, 2003
```
into mysql.com:/home/mysql_src/mysql-4.1
```
d410f851

merge with 4.1 tree · 41824a35

unknown authored Sep 11, 2003


client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/client_test.c:
  Auto merged

41824a35