Commits · 14754ce141aa6a061a94fa668094b0602edd69c5 · nexedi / MariaDB

29 Nov, 2002 15 commits

Merging.... · 14754ce1

unknown authored Nov 29, 2002


BitKeeper/etc/logging_ok:
  auto-union
client/insert_test.c:
  Auto merged
client/select_test.c:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_parse.cc:
  Manual merge

14754ce1

Correct bug which exposed itself in rpl000017 · c1403e17

unknown authored Nov 29, 2002

Commit for merge 


client/connect_test.c:
  Roll back wrong change
include/mysql_com.h:
  Correct prototypes not to have need to include my_global.h
sql/mysql_priv.h:
  Add expected hash lenght for old paswords.
sql/password.c:
  Change prototypes
sql/sql_acl.cc:
  Minor bug correction

c1403e17

let's leave "INSERT ... SELECT ... UPDATE" for the future · 1d418357
unknown authored Nov 29, 2002

1d418357

Merge work:/home/bk/mysql-4.1 · 8e02b39a

unknown authored Nov 29, 2002

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


sql/sql_yacc.yy:
  Auto merged

8e02b39a

added missing Com_xxx status variables · dcae6979

unknown authored Nov 29, 2002

moved SQLCOM_END to the end of the list
bad copy-paste in sql_yacc.yy fixed


sql/mysqld.cc:
  added missing Com_xxx status variables
sql/sql_lex.h:
  moved SQLCOM_END to the end. Comments added.
sql/sql_yacc.yy:
  bad copy-paste fixed :)

dcae6979

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 23342bad
unknown authored Nov 29, 2002
```
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
```
23342bad
make multi updates statistics visible in SHOW STATUS as Com_update_multi · 5234e49b
unknown authored Nov 29, 2002

5234e49b
s/SQLCOM_MULTI_UPDATE/SQLCOM_UPDATE_MULTI/ to be in line with SQLCOM_DELETE_MULTI · 76a634b7
unknown authored Nov 29, 2002

76a634b7

checking columns of top items · 042c34d8

unknown authored Nov 29, 2002


mysql-test/r/row_test.result:
  changed error message (report requestet columns number)
  new tests
mysql-test/t/row_test.test:
  new tests
sql/item.h:
  checking columns of wrapper items

042c34d8

Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · b226e15a
unknown authored Nov 29, 2002
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
```
b226e15a
UCS2 fixes · 641c7ff9
unknown authored Nov 29, 2002

641c7ff9
my_strntod_ucs2 and my_strntol_ucs2 fixes · 4b0a6e6b
unknown authored Nov 29, 2002

4b0a6e6b

fixed error handling bug · 5b62dfcd

unknown authored Nov 29, 2002

fixed naming bug
fixed bug of subselect excluding


mysql-test/r/subselect.result:
  test of error handling bug
  test of naming bug
  test bug of subselect excluding
mysql-test/t/subselect.test:
  test of error handling bug
  test of naming bug
  test bug of subselect excluding
sql/item_subselect.cc:
  fixed naming bug
  fixed error handling bug
sql/sql_lex.cc:
  fixed subselect excluding bug

5b62dfcd

Fixesd that wrong charset were used · 781a5bc8
unknown authored Nov 29, 2002

781a5bc8

mysql.h: · 5996e68f

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

5996e68f

28 Nov, 2002 25 commits

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

0d2e0f4b
test of changing subselects tree · 3ec9f7e1
unknown authored Nov 28, 2002

3ec9f7e1

fixed bug IN subselect with ORDER · 4078d0de

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

4078d0de

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

after review fix(CRUM) · c58b8afa

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

c58b8afa

merging · 5fe662e2

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

5fe662e2

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 9e355217

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

9e355217

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

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

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

b9daa52c

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

1c2d7aa8
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 12b7086c
unknown authored Nov 28, 2002
```
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1


sql/sql_yacc.yy:
  Auto merged
```
12b7086c

fixed * without tables in IN bug · 6f80b711

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

6f80b711

INSERT ... UPDATE syntax (syntax only) · 37a99172

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

37a99172

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

unknown authored Nov 28, 2002


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

b01993fd

Makefile.am: · 3284c39a

unknown authored Nov 28, 2002

  libmysys.a is needed for my_errno


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

3284c39a

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

09fc04ad

Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi · 22b0bfa2

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

22b0bfa2

Correct view of sort.c and mi_too_big_key_for_sort() · 0c349665

unknown authored Nov 28, 2002


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

0c349665

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

57321e64
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 · f1b3f48e
unknown authored Nov 28, 2002
```
libmysql/libmysql.c:
  Auto merged
```
f1b3f48e
Fix wrong increment in prepared statements handling · da6e29a6
unknown authored Nov 28, 2002
```
libmysql/libmysql.c:
  Fix wrong increment
```
da6e29a6
More use of new string->number conversion functions · 5a1b9e1d
unknown authored Nov 28, 2002

5a1b9e1d

Item_func_equal made uniform · fb4dc27c

unknown authored Nov 28, 2002


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

fb4dc27c

New functions · e761be55
unknown authored Nov 28, 2002

e761be55