Commits · 7b137f15bd28727a62a6215cf21a92878948760e · Kirill Smelkov / mariadb

28 Jan, 2003 2 commits

A feature of doing automatick result buffering when INSERT is · 7b137f15
unknown authored Jan 28, 2003
```
done from the select containing a table to be inserted to.
```
7b137f15

Merge sinisa@work.mysql.com:/home/bk/mysql-5.0 · d2b66206

unknown authored Jan 28, 2003

into sinisa.nasamreza.org:/mnt/work/petica


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

d2b66206

23 Jan, 2003 2 commits

Added check for selects without into in SPs, and updated error messages and tests · cbc75706

unknown authored Jan 23, 2003

accordingly.


include/mysqld_error.h:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/czech/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/danish/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/dutch/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/english/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/estonian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/french/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/german/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/greek/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/hungarian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/italian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/japanese/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/korean/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/norwegian-ny/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/norwegian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/polish/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/portuguese/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/romanian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/russian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/serbian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/slovak/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/spanish/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/swedish/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/ukrainian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
mysql-test/r/sp.result:
  New test for repeat(...) and select with and without into in SPs.
mysql-test/t/sp.test:
  New test for repeat(...) and select with and without into in SPs.
sql/sql_yacc.yy:
  Check if an SP substatement is a SELECT and if so, has an INTO. If not, it's an
  error.

cbc75706

solve the lex conflict between the existing repeat() function · 172dc5b3
unknown authored Jan 23, 2003
```
and repeat SP-construction
```
172dc5b3

20 Jan, 2003 1 commit
- Changing some proc names to a more suitable one. · 6d5f7d1c
  unknown authored Jan 20, 2003
  
  6d5f7d1c
18 Jan, 2003 1 commit
- SELECT ... INTO local_vars ...; · 69047e71
  unknown authored Jan 18, 2003
```
For Stored Procedures
```
  69047e71
17 Jan, 2003 3 commits

Added the Stored Procedure tests. · 838303a7

unknown authored Jan 17, 2003

Removed newly added, but now redundant, test file.



BitKeeper/deleted/.del-mysql_proc.result~63faae2f407c3fc2:
  Delete: mysql-test/r/mysql_proc.result
BitKeeper/deleted/.del-mysql_proc.test~8863f59cfc347469:
  Delete: mysql-test/t/mysql_proc.test

838303a7

Merge sgluhov@work.mysql.com:/home/bk/mysql-5.0 · 7d369486
unknown authored Jan 17, 2003
```
into gluh.mysql.r18.ru:/home/gluh/mysql-5.0
```
7d369486

Make the CLI client (client/mysql.cc) work with multi-line SPs. · e7ffc215

unknown authored Jan 17, 2003

Make the mysqltest program (client/mysqltest.c) work with multi-line SPs.


client/mysql.cc:
  Added 'delimiter' command
client/mysqltest.c:
  Added 'delimiter' command
mysql-test/install_test_db.sh:
  Fix for install 'proc' table
mysql-test/r/connect.result:
  Fix for 'proc' table
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

e7ffc215

15 Jan, 2003 2 commits

Fixed some error handling in the SP parts of the parser. · dcac913c

unknown authored Jan 15, 2003


include/mysqld_error.h:
  Added SP error messages for the parser.
sql/share/czech/errmsg.txt:
  Added SP error messages for the parser.
sql/share/danish/errmsg.txt:
  Added SP error messages for the parser.
sql/share/dutch/errmsg.txt:
  Added SP error messages for the parser.
sql/share/english/errmsg.txt:
  Added SP error messages for the parser.
sql/share/estonian/errmsg.txt:
  Added SP error messages for the parser.
sql/share/french/errmsg.txt:
  Added SP error messages for the parser.
sql/share/german/errmsg.txt:
  Added SP error messages for the parser.
sql/share/greek/errmsg.txt:
  Added SP error messages for the parser.
sql/share/hungarian/errmsg.txt:
  Added SP error messages for the parser.
sql/share/italian/errmsg.txt:
  Added SP error messages for the parser.
sql/share/japanese/errmsg.txt:
  Added SP error messages for the parser.
sql/share/korean/errmsg.txt:
  Added SP error messages for the parser.
sql/share/norwegian-ny/errmsg.txt:
  Added SP error messages for the parser.
sql/share/norwegian/errmsg.txt:
  Added SP error messages for the parser.
sql/share/polish/errmsg.txt:
  Added SP error messages for the parser.
sql/share/portuguese/errmsg.txt:
  Added SP error messages for the parser.
sql/share/romanian/errmsg.txt:
  Added SP error messages for the parser.
sql/share/russian/errmsg.txt:
  Added SP error messages for the parser.
sql/share/serbian/errmsg.txt:
  Added SP error messages for the parser.
sql/share/slovak/errmsg.txt:
  Added SP error messages for the parser.
sql/share/spanish/errmsg.txt:
  Added SP error messages for the parser.
sql/share/swedish/errmsg.txt:
  Added SP error messages for the parser.
sql/share/ukrainian/errmsg.txt:
  Added SP error messages for the parser.
sql/sql_yacc.yy:
  Replaced dummy printfs with real error messages in the SP parser.

dcac913c

Fixed some basic error handling for SP functions in mysql_execute_command(). · 79993565

unknown authored Jan 15, 2003


include/mysqld_error.h:
  Added error codes for SPs
sql/mysql_priv.h:
  Changed return value of mysql_execute_command() from void to int; need to be able
  to detect if executions of substatements in SPs failed.
sql/share/czech/errmsg.txt:
  Added error messages for SPs.
sql/share/danish/errmsg.txt:
  Added error messages for SPs.
sql/share/dutch/errmsg.txt:
  Added error messages for SPs.
sql/share/english/errmsg.txt:
  Added error messages for SPs.
sql/share/estonian/errmsg.txt:
  Added error messages for SPs.
sql/share/french/errmsg.txt:
  Added error messages for SPs.
sql/share/german/errmsg.txt:
  Added error messages for SPs.
sql/share/greek/errmsg.txt:
  Added error messages for SPs.
sql/share/hungarian/errmsg.txt:
  Added error messages for SPs.
sql/share/italian/errmsg.txt:
  Added error messages for SPs.
sql/share/japanese/errmsg.txt:
  Added error messages for SPs.
sql/share/korean/errmsg.txt:
  Added error messages for SPs.
sql/share/norwegian-ny/errmsg.txt:
  Added error messages for SPs.
sql/share/norwegian/errmsg.txt:
  Added error messages for SPs.
sql/share/polish/errmsg.txt:
  Added error messages for SPs.
sql/share/portuguese/errmsg.txt:
  Added error messages for SPs.
sql/share/romanian/errmsg.txt:
  Added error messages for SPs.
sql/share/russian/errmsg.txt:
  Added error messages for SPs.
sql/share/serbian/errmsg.txt:
  Added error messages for SPs.
sql/share/slovak/errmsg.txt:
  Added error messages for SPs.
sql/share/spanish/errmsg.txt:
  Added error messages for SPs.
sql/share/swedish/errmsg.txt:
  Added error messages for SPs.
sql/share/ukrainian/errmsg.txt:
  Added error messages for SPs.
sql/sp_head.cc:
  Moved net.no_send_ok fiddling to sql_parse.cc.
  Check if mysql_execute_command() failed.
sql/sql_parse.cc:
  Changed return value of mysql_execute_command() from void to int; need to be able
  to detect if executions of substatements in SPs failed. Fixed all returns
  accordingly.
  Added error checks for SQLCOM_CREATE_PROCEDURE, CALL, ALTER_PROCEDURE, and
  DROP_PROCEDURE.

79993565

10 Jan, 2003 1 commit

Removed dummy SPSET construct. · bc543f69

unknown authored Jan 10, 2003

Setting of SP local variables is now part of the existing SET syntax.

Note: This has the result that a somewhat extended syntax (from SQL-99)
is allowed. We allow a list of settings ("SET a=1, b=2, ...;"), where the
different variables can be of different types (SP local, system or user (@)).
This also means that certain optional modifiers, such as GLOBAL, are allowed
when setting an SP local variable, but then has no meaning and is ignored.


sql/lex.h:
  Removed dummy SPSET symbol.
sql/sql_yacc.yy:
  Removed dummy SPSET construct.
  Setting of SP local variables is now part of the existing SET syntax.

bc543f69

09 Jan, 2003 8 commits

Post-merge fix. · 59aba384

unknown authored Jan 09, 2003


mysql-test/r/rpl_temporary.result:
  Corrected version number in result file.

59aba384

Merge · b09fe58c

unknown authored Jan 09, 2003


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.cc:
  SCCS merged
sql/item.h:
  SCCS merged
sql/lex.h:
  SCCS merged
sql/sql_lex.cc:
  SCCS merged
sql/sql_lex.h:
  SCCS merged

b09fe58c

.del-koi8_u.xml~ec104975f7e009bf: · ac2aea8c

unknown authored Jan 09, 2003

  Delete: sql/share/charsets/koi8_u.xml
.del-koi8_r.xml~f95ebf1fb19f94cf:
  Delete: sql/share/charsets/koi8_r.xml


BitKeeper/deleted/.del-koi8_r.xml~f95ebf1fb19f94cf:
  Delete: sql/share/charsets/koi8_r.xml
BitKeeper/deleted/.del-koi8_u.xml~ec104975f7e009bf:
  Delete: sql/share/charsets/koi8_u.xml

ac2aea8c

euc_kr, koi8_r and koi8_u have been renamed so that now · 49fc3a76
unknown authored Jan 09, 2003
```
all charset names don't have "_" sign.
```
49fc3a76
koi8u.xml, koi8r.xml: · 90bf0f97
unknown authored Jan 09, 2003
```
  new file
```
90bf0f97
do not call get_charset_by_name() with string "DEFAULT" · 5a5c618e
unknown authored Jan 09, 2003

5a5c618e

Separating CHARSET and COLLATION terms · 6383a27b

unknown authored Jan 09, 2003


mysql-test/r/alter_table.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/create.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/innodb.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/isam.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/select.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/show_check.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_blob.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_float.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_ranges.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
sql/field.cc:
  In field type charset rather than collation name is displayed
sql/sql_db.cc:
  COLLATE clause has been added into SHOW CREATE DATABASE
sql/sql_lex.cc:
  Detect charset names rather than collation names
sql/sql_show.cc:
  COLLATION field has been added into SHOW FIELDS
sql/sql_yacc.yy:
  COLLATE syntax has been added in CREATE TABLE/DATABASE

6383a27b

fixed order_by test to make it repeatable · 6fb06a7a
unknown authored Jan 09, 2003

6fb06a7a

08 Jan, 2003 15 commits
- buf0buf.c: · aef11cc9
  unknown authored Jan 09, 2003
```
  Add a sanity check awe mem >= buf pool size


innobase/buf/buf0buf.c:
  Add a sanity check awe mem >= buf pool size
```
  aef11cc9
- os0proc.c: · c2c98f91
  unknown authored Jan 09, 2003
```
  Fix typos


innobase/os/os0proc.c:
  Fix typos
```
  c2c98f91
- srv0srv.c, mem0pool.c, mem0pool.h, buf0buf.h, buf0buf.c: · 106d4fe2
  unknown authored Jan 09, 2003
```
  Make smaller buffer headers and the lock table; fix AWE high_end bug


innobase/buf/buf0buf.c:
  Make smaller buffer headers and the lock table; fix AWE high_end bug
innobase/include/buf0buf.h:
  Make smaller buffer headers and the lock table; fix AWE high_end bug
innobase/include/mem0pool.h:
  Make smaller buffer headers and the lock table; fix AWE high_end bug
innobase/mem/mem0pool.c:
  Make smaller buffer headers and the lock table; fix AWE high_end bug
innobase/srv/srv0srv.c:
  Make smaller buffer headers and the lock table; fix AWE high_end bug
```
  106d4fe2
- Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 · 3f323f46
  unknown authored Jan 08, 2003
```
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean


sql/item_strfunc.cc:
  Auto merged
```
  3f323f46
- Fix for the bug about point(subselect(...)) · dc5ce03f
  unknown authored Jan 08, 2003
```
sql/item_strfunc.cc:
  null_value-s was indefined here
```
  dc5ce03f
- Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · ec827d55
  unknown authored Jan 08, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  ec827d55
- Renamed to look in common style · 3bc97a7f
  unknown authored Jan 08, 2003
  
  3bc97a7f
- Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · adda82c3
  unknown authored Jan 08, 2003
```
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
```
  adda82c3
- fix for readline building · a2b66896
  unknown authored Jan 08, 2003
  
  a2b66896
- charset.c: · 1c334ec0
  unknown authored Jan 08, 2003
```
  find only primary collations


mysys/charset.c:
  find only primary collations
```
  1c334ec0
- New function to search for charset using charset name rather than collation name · fe47e535
  unknown authored Jan 08, 2003
  
  fe47e535
- Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · f94cc9b6
  unknown authored Jan 08, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  f94cc9b6
- COLLATE is field attribute not field type · 8ef72be7
  unknown authored Jan 08, 2003
  
  8ef72be7
- resolving type conflict of BC and UP variables on FreeBSD · 544fd657
  unknown authored Jan 08, 2003
  
  544fd657
- Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · add72d57
  unknown authored Jan 08, 2003
```
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1


mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
```
  add72d57
07 Jan, 2003 5 commits

Enchanced my_once..() functions. · 7ffc2004

unknown authored Jan 07, 2003

Cleaned up charset.c
Removed non fatal memory leak in charset.c


include/my_sys.h:
  Enchanced my_once..() functions.
mysys/charset.c:
  Moved my_once_strdup() to my_once.cc
  Added usage of my_once_memdup()
  A lot of indentation changes.
mysys/my_once.c:
  Enchanced my_once..() functions.

7ffc2004

Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 · c49ef18b
unknown authored Jan 07, 2003

c49ef18b

Fixed that derived tables are properly droped · 64dc734d

unknown authored Jan 07, 2003


mysys/my_init.c:
  Move my_once_free() up to not get warnings for this from safemalloc.
sql/item_row.cc:
  Removed compiler warnings
sql/sql_select.cc:
  split fix_tables_pointer() into two functions to be able to reuse code
sql/sql_select.h:
  split fix_tables_pointer() into two functions to be able to reuse code

64dc734d

charset.c: · ec8526bd

unknown authored Jan 07, 2003

  memory leak fix
  I will move my_once_strdup to my_alloc.c later. 


mysys/charset.c:
  memory leak fix
  I will move my_once_strdup to my_alloc.c later.

ec8526bd

Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · 893f3a6b
unknown authored Jan 07, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
893f3a6b