Commits · a5146e747764f62b95543743a567130eb218a496 · nexedi / MariaDB

23 Jan, 2003 1 commit
- solve the lex conflict between the existing repeat() function · a5146e74
  unknown authored Jan 23, 2003
```
and repeat SP-construction
```
  a5146e74
17 Jan, 2003 3 commits

Added the Stored Procedure tests. · 0a93ff8d

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

0a93ff8d

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

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

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

0003cfbf

15 Jan, 2003 2 commits

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

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.

f1d16d42

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

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.

fa46b6a8

10 Jan, 2003 1 commit

Removed dummy SPSET construct. · 514fb424

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.

514fb424

09 Jan, 2003 8 commits

Post-merge fix. · a0104997

unknown authored Jan 09, 2003


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

a0104997

Merge · e78e2140

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

e78e2140

.del-koi8_u.xml~ec104975f7e009bf: · dcc9635b

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

dcc9635b

euc_kr, koi8_r and koi8_u have been renamed so that now · 38b29509
unknown authored Jan 09, 2003
```
all charset names don't have "_" sign.
```
38b29509
koi8u.xml, koi8r.xml: · 164a874e
unknown authored Jan 09, 2003
```
  new file
```
164a874e
do not call get_charset_by_name() with string "DEFAULT" · 63a4a327
unknown authored Jan 09, 2003

63a4a327

Separating CHARSET and COLLATION terms · 965392b3

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

965392b3

fixed order_by test to make it repeatable · 0c914236
unknown authored Jan 09, 2003

0c914236

08 Jan, 2003 15 commits
- buf0buf.c: · 8410bf7e
  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
```
  8410bf7e
- os0proc.c: · 0053e09a
  unknown authored Jan 09, 2003
```
  Fix typos


innobase/os/os0proc.c:
  Fix typos
```
  0053e09a
- srv0srv.c, mem0pool.c, mem0pool.h, buf0buf.h, buf0buf.c: · b0dbbac2
  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
```
  b0dbbac2
- Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 · f710940b
  unknown authored Jan 08, 2003
```
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean


sql/item_strfunc.cc:
  Auto merged
```
  f710940b
- Fix for the bug about point(subselect(...)) · aa8fcaa2
  unknown authored Jan 08, 2003
```
sql/item_strfunc.cc:
  null_value-s was indefined here
```
  aa8fcaa2
- Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · 2d213615
  unknown authored Jan 08, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  2d213615
- Renamed to look in common style · ee277f05
  unknown authored Jan 08, 2003
  
  ee277f05
- Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · 6ebb02b1
  unknown authored Jan 08, 2003
```
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
```
  6ebb02b1
- fix for readline building · ea38d62a
  unknown authored Jan 08, 2003
  
  ea38d62a
- charset.c: · beabcc66
  unknown authored Jan 08, 2003
```
  find only primary collations


mysys/charset.c:
  find only primary collations
```
  beabcc66
- New function to search for charset using charset name rather than collation name · bfaa40ad
  unknown authored Jan 08, 2003
  
  bfaa40ad
- Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · 16693249
  unknown authored Jan 08, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  16693249
- COLLATE is field attribute not field type · 9d242d16
  unknown authored Jan 08, 2003
  
  9d242d16
- resolving type conflict of BC and UP variables on FreeBSD · 74d1b014
  unknown authored Jan 08, 2003
  
  74d1b014
- Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · 57cf0384
  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
```
  57cf0384
07 Jan, 2003 5 commits

Enchanced my_once..() functions. · d27b8eb7

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.

d27b8eb7

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

36818816

Fixed that derived tables are properly droped · e61e44f9

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

e61e44f9

charset.c: · bc7aaa2c

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.

bc7aaa2c

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

06 Jan, 2003 5 commits

buf0buf.c, buf0buf.ic, buf0buf.h: · 8cca8f80

unknown authored Jan 06, 2003

  Reduce memory usage of the buffer headers
Many files:
  Merge InnoDB-4.1 with AWE support


sql/mysqld.cc:
  Merge InnoDB-4.1 with AWE support
sql/set_var.cc:
  Merge InnoDB-4.1 with AWE support
sql/ha_innodb.h:
  Merge InnoDB-4.1 with AWE support
sql/ha_innodb.cc:
  Merge InnoDB-4.1 with AWE support
innobase/btr/btr0cur.c:
  Merge InnoDB-4.1 with AWE support
innobase/btr/btr0pcur.c:
  Merge InnoDB-4.1 with AWE support
innobase/buf/buf0flu.c:
  Merge InnoDB-4.1 with AWE support
innobase/buf/buf0lru.c:
  Merge InnoDB-4.1 with AWE support
innobase/buf/buf0rea.c:
  Merge InnoDB-4.1 with AWE support
innobase/include/btr0pcur.h:
  Merge InnoDB-4.1 with AWE support
innobase/include/buf0lru.h:
  Merge InnoDB-4.1 with AWE support
innobase/include/log0recv.h:
  Merge InnoDB-4.1 with AWE support
innobase/include/os0proc.h:
  Merge InnoDB-4.1 with AWE support
innobase/include/srv0srv.h:
  Merge InnoDB-4.1 with AWE support
innobase/log/log0log.c:
  Merge InnoDB-4.1 with AWE support
innobase/log/log0recv.c:
  Merge InnoDB-4.1 with AWE support
innobase/os/os0file.c:
  Merge InnoDB-4.1 with AWE support
innobase/os/os0proc.c:
  Merge InnoDB-4.1 with AWE support
innobase/srv/srv0srv.c:
  Merge InnoDB-4.1 with AWE support
innobase/srv/srv0start.c:
  Merge InnoDB-4.1 with AWE support
innobase/trx/trx0sys.c:
  Merge InnoDB-4.1 with AWE support
innobase/trx/trx0trx.c:
  Merge InnoDB-4.1 with AWE support
innobase/ut/ut0ut.c:
  Merge InnoDB-4.1 with AWE support
innobase/include/buf0buf.h:
  Reduce memory usage of the buffer headers
innobase/include/buf0buf.ic:
  Reduce memory usage of the buffer headers
innobase/buf/buf0buf.c:
  Reduce memory usage of the buffer headers

8cca8f80

Updated test results · 7398e161
unknown authored Jan 06, 2003

7398e161
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · b87bc9a7
unknown authored Jan 06, 2003
```
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
```
b87bc9a7

merge · e18a399c

unknown authored Jan 06, 2003


mysql-test/t/ctype_many.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

e18a399c

merge post fix · 6e0c500e
unknown authored Jan 06, 2003

6e0c500e