Commits · f1beb2a2f016cc95721a1dbb529bc57d8fb99f78 · nexedi / MariaDB

10 Oct, 2003 1 commit

WL#962: Added simple, read-only, non-scrolling, asensitive cursors in SPs, using the · f1beb2a2

unknown authored Oct 10, 2003

(updated) Protocol_cursor class.
Also did some bug fixes.


Docs/sp-imp-spec.txt:
  Added CURSOR docs (and fixed typos)
Docs/sp-implemented.txt:
  Updated for CURSORs
include/mysqld_error.h:
  New error codes/messages for CURSORs
libmysqld/Makefile.am:
  SP cursors now needs this.
mysql-test/r/sp-error.result:
  New tests for cursors.
mysql-test/r/sp.result:
  New tests for cursors.
mysql-test/t/sp-error.test:
  New tests for cursors.
mysql-test/t/sp.test:
  New tests for cursors.
sql/protocol.cc:
  We now always have Protocol_cursor (SPs use it)
sql/protocol.h:
  Fixed bugs in Protocol_cursor (for SPs)
sql/protocol_cursor.cc:
  Fixed bugs in Protocol_cursor (for SPs)
sql/share/czech/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/danish/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/dutch/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/english/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/estonian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/french/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/german/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/greek/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/hungarian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/italian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/japanese/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/korean/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/norwegian-ny/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/norwegian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/polish/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/portuguese/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/romanian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/russian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/serbian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/slovak/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/spanish/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/swedish/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/ukrainian/errmsg.txt:
  New error codes/messages for CURSORs
sql/sp_head.cc:
  Added cursor support.
  Also fixed problems with item_lists, where pointers and ref_pointer_arrays.
sql/sp_head.h:
  Added cursor support
sql/sp_pcontext.cc:
  Added cursor support
sql/sp_pcontext.h:
  Added cursor support
sql/sp_rcontext.cc:
  Added cursor support, in particular the new sp_cursor class.
sql/sp_rcontext.h:
  Added cursor support, in particular the new sp_cursor class.
sql/sql_lex.h:
  We sometimes need to copy item_lists in LEX when executing substatements in SPs
sql/sql_yacc.yy:
  Added minimal cursor support (not the full syntax yet).

f1beb2a2

03 Oct, 2003 2 commits

Check that a FUNCTION contains RETURN and that we actually get a return value. · 77d8252d

unknown authored Oct 03, 2003


include/mysqld_error.h:
  New error codes/messages for missing RETURNs in FUNCTIONs.
mysql-test/r/sp-error.result:
  New error tests for missing RETURNs in FUNCTIONs.
mysql-test/t/sp-error.test:
  New error tests for missing RETURNs in FUNCTIONs.
sql/share/czech/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/danish/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/dutch/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/english/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/estonian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/french/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/german/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/greek/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/hungarian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/italian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/japanese/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/korean/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/norwegian-ny/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/norwegian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/polish/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/portuguese/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/romanian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/russian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/serbian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/slovak/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/spanish/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/swedish/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/ukrainian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/sp_head.h:
  Check that a FUNCTION contains RETURN.
sql/sql_parse.cc:
  Check that a FUNCTION contains RETURN.
sql/sql_yacc.yy:
  Check that a FUNCTION contains RETURN.

77d8252d

Fixed BUG#822: Copying and clearing some things in thd/lex when · e307b0b9

unknown authored Oct 03, 2003

executing sub-statements (selects) prevents crashes intermittent
crashes.
Also fixed bug in sql_yacc.yy (generated a hpop instruction when
not needed).


mysql-test/r/sp.result:
  Test-case for BUG#822.
mysql-test/t/sp.test:
  Test-case for BUG#822.
sql/sp_head.cc:
  Fixed BUG#822; needed to copy and clear some stuff when calling sub-statements.
sql/sql_yacc.yy:
  Only generate hpop instruction when we actually have handlers.

e307b0b9

01 Oct, 2003 2 commits
- Made SELECT INTO variable-list re-entrant, which fixes bug in stored procedures (#822) · 8ad7a464
  unknown authored Oct 01, 2003
  
  8ad7a464
- Add proc table if not exists · b1e9da80
  unknown authored Oct 01, 2003
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
  b1e9da80
24 Sep, 2003 4 commits

Post-merge fixes. · df5f73f6
unknown authored Sep 24, 2003

df5f73f6

Merging 4.1 -> 5.0 · 371939cc

unknown authored Sep 24, 2003


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
BitKeeper/deleted/.del-sel000100.result~84ed46856cb3a69f:
  Auto merged
BitKeeper/deleted/.del-sel000100.test~548501cad19a1a59:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

371939cc

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0a9b64cc
unknown authored Sep 24, 2003
```
into narttu.mysql.fi:/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged
```
0a9b64cc

- Code cleanup: replaced C++-style comments with the proper syntax for · bad17621

unknown authored Sep 24, 2003

   .c files (the IBM Visual Age C compiler aborts with a syntax error
   on these)


libmysql/dll.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
libmysql/libmysql.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
mysys/my_getopt.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
sql/net_serv.cc:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
strings/ctype-bin.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
tests/client_test.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)

bad17621

23 Sep, 2003 6 commits

- added option "--readline" to enable linking against libreadline · 6ae16dfe
unknown authored Sep 23, 2003
```
   (instead of libedit, which is the default for 4.1)
 - brushed up the usage help text a bit
```
6ae16dfe
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · a0ec1f53
unknown authored Sep 23, 2003
```
into mysql.com:/home/dlenev/src/mysql-4.1-868
```
a0ec1f53

derror.cc: · dd1ae126

unknown authored Sep 23, 2003

  Typo fix: redundant "in"


sql/derror.cc:
  Typo fix: redundant "in"

dd1ae126

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 156296a9
unknown authored Sep 23, 2003
```
into mysql.com:/home/dlenev/src/mysql-4.1-868
```
156296a9

charset.c: · b47cfa20

unknown authored Sep 23, 2003

  comp_err failed to compile error message file when a
  character set was not incompiled.


mysys/charset.c:
  comp_err failed to compile error message file when a
  character set was not incompiled.

b47cfa20

derror.cc: · af82dbfd

unknown authored Sep 23, 2003

  Better English message


sql/derror.cc:
  Better English message

af82dbfd

22 Sep, 2003 8 commits

Merge mysql.com:/space/my/mysql-4.1 · 42b87448
unknown authored Sep 23, 2003
```
into mysql.com:/space/my/mysql-4.1-build
```
42b87448

- Polished mysql-copyright a bit and added call to remove · be66b2e1

unknown authored Sep 23, 2003

   cmd-line-utils/readline from the commercial distribution
 - fixed some copyright headers so mysql-copyright can process them


Build-tools/mysql-copyright:
   - remove the cmd-line-utils/readline directory from the commercial
     distribution
   - make use of more builtin Perl functions instead of forking 
     subprocesses
include/my_pthread.h:
   - fixed copyright header
sql/filesort.cc:
   - fixed copyright header
sql/gen_lex_hash.cc:
   - fixed copyright header
sql/item.h:
   - fixed copyright header
sql/item_cmpfunc.cc:
   - fixed copyright header
sql/records.cc:
   - fixed copyright header

be66b2e1

Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 9f6cb8e1
unknown authored Sep 22, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
9f6cb8e1
Bug 1181 fix. LIKE didn't work with UCS2 character set. · b5b750c3
unknown authored Sep 22, 2003

b5b750c3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 03cd5bd8
unknown authored Sep 22, 2003
```
into mysql.com:/home/dlenev/src/mysql-4.1-868
```
03cd5bd8
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6629358e
unknown authored Sep 22, 2003
```
into gw.mysql.r18.ru:/usr/home/ram/work/4.1


sql/item_strfunc.cc:
  Auto merged
```
6629358e
xml.c: · 26a22750
unknown authored Sep 22, 2003
```
  Bug fix


strings/xml.c:
  Bug fix
```
26a22750
Bug 1350 fix · 6af37b2f
unknown authored Sep 22, 2003

6af37b2f

20 Sep, 2003 1 commit
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · f579e143
  unknown authored Sep 20, 2003
```
into mysql.com:/home/dlenev/src/mysql-4.1-868
```
  f579e143
19 Sep, 2003 9 commits

comp_err.c: · dc9043c6

unknown authored Sep 19, 2003

  There are some problems compiling with pure "configure"
  I need to fix it first.


extra/comp_err.c:
  There are some problems compiling with pure "configure"
  I need to fix it first.

dc9043c6

New test for UTF8 functionality · 5a7847ce
unknown authored Sep 19, 2003

5a7847ce
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 0a6dae64
unknown authored Sep 19, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1


sql/item_func.cc:
  Auto merged
```
0a6dae64

Fixed that multibyte charsets didn't honor multibyte · 25cb265e

unknown authored Sep 19, 2003

sequence boundaries in functions LIKE and LOCATE in
the case of "binary" collation. Comparison was done
like if the strings were just a binary strings without
character set assumption.

25cb265e

SCRUM · 67010e01

unknown authored Sep 19, 2003

embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea?


client/mysqltest.c:
  hash_insert ->my_hash_insert
include/hash.h:
  hash_insert ->my_hash_insert
mysys/hash.c:
  hash_insert ->my_hash_insert
mysys/testhash.c:
  hash_insert ->my_hash_insert
sql/ha_berkeley.cc:
  hash_insert ->my_hash_insert
sql/ha_innodb.cc:
  hash_insert ->my_hash_insert
sql/hash_filo.h:
  hash_insert ->my_hash_insert
sql/item_func.cc:
  hash_insert ->my_hash_insert
sql/lock.cc:
  hash_insert ->my_hash_insert
sql/repl_failsafe.cc:
  hash_insert ->my_hash_insert
sql/set_var.cc:
  hash_insert ->my_hash_insert
sql/slave.cc:
  hash_insert ->my_hash_insert
sql/sql_acl.cc:
  hash_insert ->my_hash_insert
sql/sql_base.cc:
  hash_insert ->my_hash_insert
sql/sql_cache.cc:
  hash_insert ->my_hash_insert
sql/sql_parse.cc:
  hash_insert ->my_hash_insert
sql/sql_select.cc:
  hash_insert ->my_hash_insert
sql/sql_udf.cc:
  hash_insert ->my_hash_insert
sql/table.cc:
  hash_insert ->my_hash_insert
tools/mysqlmanager.c:
  hash_insert ->my_hash_insert

67010e01

SCRUM · 87d31e9c

unknown authored Sep 19, 2003

embedded library
missed memory freeing added


libmysqld/embedded_priv.h:
  declaration added
libmysqld/lib_sql.cc:
  implementation added
libmysqld/libmysqld.c:
  mysql->thd releasing

87d31e9c

SCRUM · 9000e94d

unknown authored Sep 19, 2003

prepared statements in embedded library.
some fixes after testing


include/mysql.h:
  virtual method added
libmysql/client_settings.h:
  declaration added
libmysql/libmysql.c:
  implementation added
  mysql_fetch changed to work in both libraries
libmysqld/lib_sql.cc:
  implementation added
sql-common/client.c:
  added items in methods table
sql/client_settings.h:
  decided to remove such defines - i placed single #ifdef in client.c

9000e94d

Test for mysqldump · ec49acf1
unknown authored Sep 19, 2003

ec49acf1

Fix for the bug #1333: COMPRESS(NULL) segfaults. · 03769442

unknown authored Sep 19, 2003


mysql-test/r/func_compress.result:
  Test for the bug #1333: COMPRESS(NULL) segfaults.
mysql-test/t/func_compress.test:
  Test for the bug #1333: COMPRESS(NULL) segfaults.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

03769442

18 Sep, 2003 6 commits

SCRUM · cb253b2a

unknown authored Sep 18, 2003

embedded library
some dirty places cleaned:

uint removed from mysql.h as Miguel suggested
empty_string renamed as my_empty_string to get rid of name's intersections
using embedded library


include/mysql.h:
  uint -> unsigned int
include/mysql_com.h:
  this caused warnings when not in expression
libmysqld/lib_sql.cc:
  uint -> unsigned int
sql-common/client.c:
  uint -> unsigned int
sql/item_strfunc.cc:
  empty_string -> my_empty_string
sql/mysql_priv.h:
  empty_string -> my_empty_string
sql/set_var.cc:
  empty_string -> my_empty_string
sql/sql_class.cc:
  empty_string -> my_empty_string
sql/sql_prepare.cc:
  net_flush ifdef-ed

cb253b2a

SCRUM: · da3118fa

unknown authored Sep 18, 2003

embedded library
I decided to get rid of #define mysql_some_function in mysql.h
It puzzles users and makes problems with dynamic libraries

Finally, there are only two functions left, that are covered with
the #define-s and it won't hurt performance at all


client/mysqltest.c:
  that'll be faster
include/mysql.h:
  #defines changed to functions
libmysql/libmysql.c:
  that'll be faster that calls of wrapper functions
libmysqld/libmysqld.c:
  skip wrapper function
sql-common/client.c:
  skip wrapper function

da3118fa

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 86f1f2a1
unknown authored Sep 18, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
```
86f1f2a1

configure.in: · cf104c99

unknown authored Sep 18, 2003

  Fix the problem with errmsg compilation


configure.in:
  Fix the problem with errmsg compilation

cf104c99

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 9714fed8
unknown authored Sep 18, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
```
9714fed8

SCRUM · bfb441a5

unknown authored Sep 18, 2003

prepared statements in embedded library


include/mysql_com.h:
  to make net_flush() working in expressions
libmysqld/lib_sql.cc:
  some bugs fixed
libmysqld/libmysqld.c:
  we already have the define in client_settings.h
sql/protocol.cc:
  net_store_data should work that way in Protocol_prep (embedded server)
sql/protocol.h:
  definition for net_store_data
sql/sql_prepare.cc:
  now it works in embedded library

bfb441a5

17 Sep, 2003 1 commit
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · ee7f8d15
  unknown authored Sep 17, 2003
```
into deer.(none):/home/hf/work/mysql-4.1.stmt
```
  ee7f8d15