Commits · 3548ecdeb288bf7e85c4e8717d31d8ce4f3e6a26 · nexedi / MariaDB

29 Nov, 2002 3 commits

unknown authored Nov 29, 2002


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
include/mysql.h:
  Pull conflicts resolved
include/violite.h:
  Pull conflicts resolved
sql/item.cc:
  Pull conflicts resolved
sql/item.h:
  Pull conflicts recolved
sql/item_strfunc.cc:
  Pull conflicts resolved
sql/mysql_priv.h:
  Pull conflicts resolved
sql/sql_parse.cc:
  Pull conflicts resolved

3548ecde

Fixesd that wrong charset were used · 52ba265b
unknown authored Nov 29, 2002

52ba265b

mysql.h: · 76949bf9

unknown authored Nov 29, 2002

  renamed arg name to avoid a warning that it shadows global variable


include/mysql.h:
  renamed arg name to avoid a warning that it shadows global variable

76949bf9

28 Nov, 2002 25 commits

Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi · 854d1eb9
unknown authored Nov 29, 2002

854d1eb9
test of changing subselects tree · c01ed8b5
unknown authored Nov 28, 2002

c01ed8b5

fixed bug IN subselect with ORDER · 2a6028dc

unknown authored Nov 28, 2002


mysql-test/r/subselect.result:
  test of IN subselect with ORDER
mysql-test/t/subselect.test:
  test of IN subselect with ORDER

2a6028dc

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 660fc101
unknown authored Nov 28, 2002
```
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
```
660fc101

after review fix(CRUM) · bc2cde11

unknown authored Nov 28, 2002

after merge fix


sql/item.cc:
  after merge fix
sql/item_cmpfunc.cc:
  after review fix
sql/item_cmpfunc.h:
  after review fix

bc2cde11

merging · 4b75cb03

unknown authored Nov 28, 2002


include/mysqld_error.h:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_subselect.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/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  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/serbian/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

4b75cb03

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 85836d7a

unknown authored Nov 28, 2002

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


sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

85836d7a

Merge work.mysql.com:/home/bk/mysql-4.1 · b019ead4
unknown authored Nov 28, 2002
```
into myvenu.com:/home/venu/bk/src-4.1
```
b019ead4

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 68f879ca

unknown authored Nov 28, 2002

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


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

68f879ca

Get rid of pbool from my_list.h; and avoid using the my_global.h for clients · 34a2f5e4
unknown authored Nov 28, 2002

34a2f5e4
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 31cc5e88
unknown authored Nov 28, 2002
```
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1


sql/sql_yacc.yy:
  Auto merged
```
31cc5e88

fixed * without tables in IN bug · 1472cbf6

unknown authored Nov 28, 2002

fixed sunction-test select in IN bug
fixed unions in subselect bug


include/mysqld_error.h:
  new warning
mysql-test/r/subselect.result:
  test of * without tables in IN
  test of sunction-test select in IN
  test of unions in subselect
mysql-test/t/subselect.test:
  test of * without tables in IN
  test of sunction-test select in IN
  test of unions in subselect
sql/item.cc:
  fixed * substitution without tables
sql/item_subselect.cc:
  fixed subselect rewriting with function-test subselect
sql/item_subselect.h:
  mechanism for subselect removing
sql/share/czech/errmsg.txt:
  new warning
sql/share/danish/errmsg.txt:
  new warning
sql/share/dutch/errmsg.txt:
  new warning
sql/share/english/errmsg.txt:
  new warning
sql/share/estonian/errmsg.txt:
  new warning
sql/share/french/errmsg.txt:
  new warning
sql/share/german/errmsg.txt:
  new warning
sql/share/greek/errmsg.txt:
  new warning
sql/share/hungarian/errmsg.txt:
  new warning
sql/share/italian/errmsg.txt:
  new warning
sql/share/japanese/errmsg.txt:
  new warning
sql/share/korean/errmsg.txt:
  new warning
sql/share/norwegian-ny/errmsg.txt:
  new warning
sql/share/norwegian/errmsg.txt:
  new warning
sql/share/polish/errmsg.txt:
  new warning
sql/share/portuguese/errmsg.txt:
  new warning
sql/share/romanian/errmsg.txt:
  new warning
sql/share/russian/errmsg.txt:
  new warning
sql/share/serbian/errmsg.txt:
  new warning
sql/share/slovak/errmsg.txt:
  new warning
sql/share/spanish/errmsg.txt:
  new warning
sql/share/swedish/errmsg.txt:
  new warning
sql/share/ukrainian/errmsg.txt:
  new warning
sql/sql_base.cc:
  fixed case on no name field in UNION subselect
sql/sql_lex.cc:
  mechanisp of removing single subselect for optimisation purposes
sql/sql_lex.h:
  mechanisp of removing single subselect for optimisation purposes
sql/sql_parse.cc:
  error handling
sql/sql_union.cc:
  fixed unions in subselect
sql/sql_yacc.yy:
  fixed Lex->describe flag appearence

1472cbf6

INSERT ... UPDATE syntax (syntax only) · 7dc19616

unknown authored Nov 28, 2002

sql_yacc.yy and sql_parse.cc cleanup


sql/lex.h:
  INSERT ... UPDATE syntax
sql/sql_parse.cc:
  merged SQLCOM_REPLACE and SQLCOM_INSERT the same way their _SELECT counterparts were merged long time ago - just to remove duplicate code and be consistent :)
  now nobody needs SQLCOM_REPLACE* at all :))
sql/sql_yacc.yy:
  INSERT ... UPDATE syntax
  cleanup

7dc19616

Fixed the reduce/reduce conflicts introduced by subselects. · c293be65

unknown authored Nov 28, 2002


sql/sql_yacc.yy:
  Fixed the reduce/reduce conflicts introduced by subselects by
  breaking select_init apart.

c293be65

Makefile.am: · 124f8113

unknown authored Nov 28, 2002

  libmysys.a is needed for my_errno


regex/Makefile.am:
  libmysys.a is needed for my_errno

124f8113

::index_read_last() method has been added · ee227ca7
unknown authored Nov 28, 2002

ee227ca7

Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi · 8eadb3d7

unknown authored Nov 28, 2002


BitKeeper/etc/logging_ok:
  auto-union
include/myisam.h:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/sort.c:
  Auto merged

8eadb3d7

Correct view of sort.c and mi_too_big_key_for_sort() · 8be0230d

unknown authored Nov 28, 2002


myisam/mi_check.c:
  Correct mi_too_big_key_for_sort()
myisam/sort.c:
  Correct view, according rules

8be0230d

Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · 681418e4
unknown authored Nov 28, 2002
```
into mysql.r18.ru:/usr/home/ram/mysql-4.1
```
681418e4
support for HA_READ_PREFIX_LAST_OR_PREV, HA_READ_PREFIX_LAST and HA_READ_BEFORE_KEY · 450cb2a1
unknown authored Nov 28, 2002

450cb2a1
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 · 9da6fc8d
unknown authored Nov 28, 2002
```
libmysql/libmysql.c:
  Auto merged
```
9da6fc8d
Fix wrong increment in prepared statements handling · 7642ff83
unknown authored Nov 28, 2002
```
libmysql/libmysql.c:
  Fix wrong increment
```
7642ff83
More use of new string->number conversion functions · ef75fee2
unknown authored Nov 28, 2002

ef75fee2

Item_func_equal made uniform · 0afea400

unknown authored Nov 28, 2002


mysql-test/r/row_test.result:
  Equal test
mysql-test/t/row_test.test:
  Equal test

0afea400

New functions · b54fa77b
unknown authored Nov 28, 2002

b54fa77b

27 Nov, 2002 12 commits

changed compare engine in basic row items (SCRUM) · c53dd15d

unknown authored Nov 28, 2002

fixed layout


sql/item_cmpfunc.cc:
  changed compare engine in basic row items
BitKeeper/etc/ignore:
  Added libmysqld/item_row.cc to the ignore list
sql/item_cmpfunc.h:
  changed compare engine in basic row items
sql/item_func.h:
  changed compare engine in basic row items
  fixed layout
sql/sql_select.cc:
  changed compare engine in basic row items

c53dd15d

after-merge fix · ca2a6854
unknown authored Nov 27, 2002

ca2a6854

merging · 50c277e4

unknown authored Nov 27, 2002


include/mysql_com.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  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/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged

50c277e4

layout fix · 17dbd8e4
unknown authored Nov 27, 2002

17dbd8e4
fixed current_thread · cb0f9b31
unknown authored Nov 27, 2002

cb0f9b31
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · f412ac39
unknown authored Nov 27, 2002
```
into sanja.is.com.ua:/home/bell/mysql/work-all_any-4.1
```
f412ac39
typo fixed · 4121d279
unknown authored Nov 27, 2002

4121d279
support for HA_READ_BEFORE_KEY and HA_READ_PREFIX_LAST_OR_PREV · 338df2ae
unknown authored Nov 27, 2002

338df2ae

merging · 66cd5e82

unknown authored Nov 27, 2002


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

66cd5e82

after review changes in IN/ALL/ANY/SOME (SCRUM) · a87495fd

unknown authored Nov 27, 2002


sql/item.cc:
  after review changes
sql/item.h:
  after review changes
sql/item_subselect.cc:
  after review changes
sql/mysql_priv.h:
  after review changes
sql/sql_base.cc:
  after review changes

a87495fd

Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · d45fb2c5
unknown authored Nov 27, 2002
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
```
d45fb2c5

new string-to-number functions · 68e63a36

unknown authored Nov 27, 2002


include/m_ctype.h:
  Typo fix
sql/field.cc:
  Use new string-to-number functions
strings/ctype-bin.c:
  Use new string-to-number functions
strings/ctype-simple.c:
  Use new string-to-number functions
strings/ctype-utf8.c:
  Use new string-to-number functions

68e63a36