Commits · 585cec056465764a3812e8d9396d8ca7d501637a · nexedi / MariaDB

01 Jul, 2003 1 commit

unknown authored Jul 02, 2003

removed outer resolving flag (because of movingtransformation after fix_fields)


sql/item.cc:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_cmpfunc.cc:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_cmpfunc.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_func.cc:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_func.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_row.cc:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_row.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_strfunc.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_subselect.cc:
  after review changes
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_subselect.h:
  after review changes
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/mysql_priv.h:
  after review changes
sql/sql_base.cc:
  after review changes
sql/sql_lex.cc:
  after review changes
sql/sql_lex.h:
  after review changes
sql/sql_select.cc:
  after review changes
sql/sql_union.cc:
  after review changes

585cec05

30 Jun, 2003 1 commit

Merge · 438d04f9

unknown authored Jun 30, 2003


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_lex.h:
  SCCS merged

438d04f9

29 Jun, 2003 2 commits

merged · b871e549

unknown authored Jun 29, 2003


sql/item_cmpfunc.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

b871e549

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · f90e82f9
unknown authored Jun 29, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
```
f90e82f9

28 Jun, 2003 7 commits
- Merge bk-internal:/home/bk/mysql-4.1/ · 376bada7
  unknown authored Jun 29, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  376bada7
- fixed a bug that made 4.0 MYI+FT files unreadable in 4.1 · db0c3c20
  unknown authored Jun 28, 2003
  
  db0c3c20
- timestamp MYD-4.0 format compatibility fix · 6732f7a9
  unknown authored Jun 28, 2003
  
  6732f7a9
- fixed bug #745 · 1bf6de2c
  unknown authored Jun 28, 2003
```
(resolving fields of reduced subselect)


mysql-test/r/subselect.result:
  test of bug #745
mysql-test/t/subselect.test:
  test of bug #745
sql/sql_union.cc:
  to get chance of outer resolved_fields resolve fields of result table as usual fileds
```
  1bf6de2c
- Merge · 6a854da7
  unknown authored Jun 28, 2003
```
sql/item.cc:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
```
  6a854da7
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · be9af553
  unknown authored Jun 28, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-cset-4.1


sql/sql_select.cc:
  Auto merged
```
  be9af553
- merging · 4d4ddfde
  unknown authored Jun 28, 2003
```
test moved to other bug 
```
  4d4ddfde
27 Jun, 2003 15 commits
- Merge bk-internal:/home/bk/mysql-4.1/ · 7b39d306
  unknown authored Jun 27, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  7b39d306
- merging · e2d2432b
  unknown authored Jun 27, 2003
```
sql/item.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
```
  e2d2432b
- after review patch · dfdb1e83
  unknown authored Jun 27, 2003
  
  dfdb1e83
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · c1ea9f5d
  unknown authored Jun 27, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1


sql/sql_select.cc:
  Auto merged
```
  c1ea9f5d
- Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 673e1557
  unknown authored Jun 27, 2003
```
into teton.kitebird.com:/home/paul/mysql-4.1
```
  673e1557
- fix test when no InnoDB is present · 7e4b7fef
  unknown authored Jun 27, 2003
  
  7e4b7fef
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 15fcc884
  unknown authored Jun 27, 2003
```
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
```
  15fcc884
- Added support for structured options (WL task ID 947). · cb9c86ed
  unknown authored Jun 27, 2003
  
  cb9c86ed
- Merge mysql.com:/space/my/mysql-4.1 · 0474a695
  unknown authored Jun 27, 2003
```
into mysql.com:/space/my/mysql-4.1-build
```
  0474a695
- item.cc: · de52e5fa
  unknown authored Jun 27, 2003
```
  A better comment


sql/item.cc:
  A better comment
```
  de52e5fa
- When unifying arguments for comparion, binary strings won character strings, · 7b54f4d6
  unknown authored Jun 27, 2003
```
and comparison was done binary. Now, a binary string wins a character sting 
taking in account their derivation. That means a character field wins a
binary literal and comparison is done according to the character field
collation, not binary. 
```
  7b54f4d6
- optimization results (SCRUM) WL#902 · 19764b16
  unknown authored Jun 27, 2003
```
mysql-test/r/subselect.result:
  optimization results
mysql-test/t/subselect.test:
  optimization results
```
  19764b16
- str0 IN (str1, str2, ...) now works according to collation rules · 6fd2a858
  unknown authored Jun 27, 2003
  
  6fd2a858
- - fixed typo (dbl -> dnl) in acinclude.m4 · 4a03f605
  unknown authored Jun 27, 2003
```
acinclude.m4:
   - fixed typo (dbl -> dnl)
```
  4a03f605
- BETWEEN now works according to collation rules · 3f810d0e
  unknown authored Jun 27, 2003
  
  3f810d0e
26 Jun, 2003 9 commits

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 608bda36

unknown authored Jun 26, 2003

into teton.kitebird.com:/home/paul/mysql-4.1


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/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

608bda36

Item::str_value can't be used for storing value · 25ec2483

unknown authored Jun 26, 2003

(fixed error in Item_cache_str)


sql/item.cc:
  Item::str_value can't be used for storing value
sql/item.h:
  Item::str_value can't be used for storing value

25ec2483

Merge bk-internal:/home/bk/mysql-4.1/ · 4b2bb5f8
unknown authored Jun 26, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
4b2bb5f8

preload.test: · 1aabc50b

unknown authored Jun 26, 2003

  Change mode to -rw-rw-r--


mysql-test/t/preload.test:
  Change mode to -rw-rw-r--

1aabc50b

New messages for 3-adic and N-adic operations · 1d29092e
unknown authored Jun 26, 2003
```
REPLACE() now processed arguments collations according to standard
```
1d29092e

Merge sanja.is.com.ua:/home/bell/mysql/bk/work-cond_count-4.1 · 662506e0

unknown authored Jun 26, 2003

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


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

662506e0

cond_count moved to SELECT_LEX_NODE · 54cd790b

unknown authored Jun 26, 2003

fixed BUG #726


mysql-test/r/subselect.result:
  test of bug #726
mysql-test/t/subselect.test:
  test of bug #726
sql/item_cmpfunc.cc:
  cond_count moved to SELECT_LEX_NODE
sql/item_subselect.cc:
  fixed current_select pointer
sql/sql_base.cc:
  cond_count moved to SELECT_LEX_NODE
sql/sql_class.cc:
  cond_count moved to SELECT_LEX_NODE
sql/sql_class.h:
  cond_count moved to SELECT_LEX_NODE
sql/sql_lex.cc:
  cond_count moved to SELECT_LEX_NODE
sql/sql_lex.h:
  cond_count moved to SELECT_LEX_NODE
sql/sql_select.cc:
  cond_count moved to SELECT_LEX_NODE

54cd790b

Bug fixed: mysql-test failure on rpl tests · 11e9c572
unknown authored Jun 26, 2003
```
scripts/mysql_create_system_tables.sh:
  Fixed bug: mysql-test failure on rpl tests
```
11e9c572
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 17abb8a6
unknown authored Jun 26, 2003
```
into mysql.r18.ru:/usr/home/bk/mysql-4.1
```
17abb8a6

25 Jun, 2003 5 commits

Merge kishkin.ru:/home/wax/mysql-4.1 into kishkin.ru:/home/wax/mysql-4g · 6350e8c1
unknown authored Jun 26, 2003
```
sql/field.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
```
6350e8c1
modify error message · 774e3a59
unknown authored Jun 25, 2003

774e3a59
after merging fix · 65ec2112
unknown authored Jun 26, 2003

65ec2112

merged · 16aaba70

unknown authored Jun 25, 2003


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/subselect.result:
  merging (wiil be fixed after building)
sql/item_subselect.cc:
  merging
sql/sql_select.cc:
  merging

16aaba70

item_func.cc: · 2534f837

unknown authored Jun 25, 2003

  My stupid typo fix


sql/item_func.cc:
  My stupid typo fix
  ,

2534f837