Commits · 5f033f9e68f808f9d09b18e6950372481bfad0fc · nexedi / MariaDB

16 Apr, 2003 7 commits

unknown authored Apr 16, 2003


client/mysql.cc:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

5f033f9e

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · c709caa1
unknown authored Apr 16, 2003
```
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean
```
c709caa1
Bugfix for segfault in mysql with embedded library · b2d08fa5
unknown authored Apr 16, 2003
```
mysys/default.c:
  Fix for bug in mysql with embedded library
  we can get NULL in *argv
```
b2d08fa5

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 857a9a4c

unknown authored Apr 16, 2003

into mashka.mysql.fi:/home/my/mysql-4.1


sql/lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

857a9a4c

Add mysys specific error messages · 165d2f73

unknown authored Apr 16, 2003

Make RELAY_THREAD and alias for IO_THREAD
Added new interface for string -> (unsigned) long long.


include/my_sys.h:
  Add mysys specific error messages
sql/lex.h:
  Make RELAY_THREAD an alias for IO_THREAD
sql/sql_yacc.yy:
  Make RELAY_THREAD an alias for IO_THREAD

165d2f73

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · cdc27248
unknown authored Apr 16, 2003
```
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean
```
cdc27248
Fix for bug #212 · 2321443d
unknown authored Apr 16, 2003
```
sql/sql_list.h:
  Here we should reset item::last sometimes
```
2321443d

15 Apr, 2003 1 commit

replace default separator in group_concat, correct a bug · b71482f3

unknown authored Apr 16, 2003


mysql-test/r/func_gconcat.result:
  replace default separator
sql/item_sum.h:
  add fix_length_and_dec() and copy_or_same()
sql/sql_yacc.yy:
  replace default separator

b71482f3

11 Apr, 2003 3 commits
- correct codes of warnings in result file · 1d56dd80
  unknown authored Apr 12, 2003
  
  1d56dd80
- Exported functions claimed by MySQLCC · 65c31078
  unknown authored Apr 11, 2003
  
  65c31078
- - make sure to generate the BDB tags file, otherwise s_symlink will create · 2a16b0b4
  unknown authored Apr 11, 2003
```
   a lot of broken symlinks to the non-existing tags file (which magically
   causes the source distribution to grow about three times in size
   (most likely a bug in GNU tar - need to investigate if it still happens
   with recent versions)
```
  2a16b0b4
10 Apr, 2003 3 commits

For to use the /libmysql/libmysql.def file instead · 8188c5d2

unknown authored Apr 10, 2003


BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
  Delete: VC++Files/libmysql/libmysql.def

8188c5d2

Merge · 839be686

unknown authored Apr 10, 2003


sql/item_create.cc:
  Auto merged
sql/item_create.h:
  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/set_var.cc:
  Auto merged
include/mysqld_error.h:
  merge.
sql/share/czech/errmsg.txt:
  SCCS merged
sql/share/danish/errmsg.txt:
  merge.
sql/share/dutch/errmsg.txt:
  merge .
sql/share/english/errmsg.txt:
  merge.
sql/share/estonian/errmsg.txt:
  merge.
sql/share/french/errmsg.txt:
  merge.
sql/share/german/errmsg.txt:
  merge.
sql/share/greek/errmsg.txt:
  merge.
sql/share/hungarian/errmsg.txt:
  e
  merge.
sql/share/italian/errmsg.txt:
  merge.
sql/share/japanese/errmsg.txt:
  merge.
sql/share/korean/errmsg.txt:
  merge.
sql/share/norwegian/errmsg.txt:
  merge.
sql/share/norwegian-ny/errmsg.txt:
  merge.
sql/share/polish/errmsg.txt:
  merge.
sql/share/portuguese/errmsg.txt:
  merge.
sql/share/romanian/errmsg.txt:
  SCCS merged
sql/share/russian/errmsg.txt:
  merge.
sql/share/serbian/errmsg.txt:
  merge.
sql/share/slovak/errmsg.txt:
  merge.
sql/share/spanish/errmsg.txt:
  merge.
sql/share/swedish/errmsg.txt:
  merge.
sql/share/ukrainian/errmsg.txt:
  merge.

839be686

added compress/uncompress function · f82e15ba

unknown authored Apr 09, 2003


sql/mysql_priv.h:
  added have_compress variable
sql/mysqld.cc:
  added have_compress variable
sql/set_var.cc:
  added have_compress variable

f82e15ba

09 Apr, 2003 1 commit
- Merge bk-internal:/home/bk/mysql-4.1 · e22260d3
  unknown authored Apr 09, 2003
```
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
```
  e22260d3
08 Apr, 2003 4 commits
- - bumped up version number to 4.1.1-alpha now that 4.0.1 has been tagged · d63350ae
  unknown authored Apr 08, 2003
```
 - tagged ChangeSet@1.1529 as mysql-4.1.0
```
  d63350ae
- Use of CHARSWT_INFO *result_collation · fb1af48c
  unknown authored Apr 08, 2003
```
instead of bool convert_result_charset
SET CHARACTER SET inststead of SET NAMES in tests
```
  fb1af48c
- SET NAMES doesn't start recoding · 12b04273
  unknown authored Apr 08, 2003
```
SET CHARACTER SET does
```
  12b04273
- A better fix for UNION and slow query log. · a7e2aed2
  unknown authored Apr 08, 2003
```
sql/sql_union.cc:
  A better fix for UNION and slow query log.
  This patch also fixes some indentation issues
```
  a7e2aed2
07 Apr, 2003 4 commits
- All collation names are now fit into convension · 9dfe574c
  unknown authored Apr 07, 2003
  
  9dfe574c
- sys_var_collation is now abstract class · b4eb7b35
  unknown authored Apr 07, 2003
```
Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.
```
  b4eb7b35
- New methods to store strings with "convert to" argimument · 4b721f06
  unknown authored Apr 07, 2003
  
  4b721f06
- fixed bug with locales in libedit · 77370ca4
  unknown authored Apr 06, 2003
```
configure.in:
  fixed bug with external libedit
```
  77370ca4
05 Apr, 2003 8 commits

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · ba1abaa2
unknown authored Apr 05, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


sql/sql_yacc.yy:
  Auto merged
```
ba1abaa2

Some optimization in SET NAMES · 72d3b3a1

unknown authored Apr 05, 2003


mysql-test/r/ctype_collate.result:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/r/variables.result:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/t/ctype_collate.test:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/t/variables.test:
  SET NAMES charset COLLATE collation is new syntax

72d3b3a1

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · a24734ce
unknown authored Apr 05, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


sql/sql_yacc.yy:
  Auto merged
```
a24734ce

sql_yacc.yy: · 97415bd7

unknown authored Apr 05, 2003

  I wonder how it happend that I compiled this!


sql/sql_yacc.yy:
  I wonder how it happend that I compiled this!

97415bd7

sql_yacc.yy, set_var.h, set_var.cc: · 9b4452f8

unknown authored Apr 05, 2003

  Optimization of SET NAMES


sql/set_var.cc:
  Optimization of SET NAMES
sql/set_var.h:
  Optimization of SET NAMES
sql/sql_yacc.yy:
  Optimization of SET NAMES

9b4452f8

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 58676d75

unknown authored Apr 05, 2003

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


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

58676d75

fixed st_select_lex initialization · 1a0898c3

unknown authored Apr 05, 2003

fixed mustiupdate subselect compatibility

(bug 217)



mysql-test/r/subselect.result:
  test of multi-update & subselect
mysql-test/t/subselect.test:
  test of multi-update & subselect
sql/sql_update.cc:
  added subselect compatibility to query cache
sql/sql_yacc.yy:
  right st_select_lex initialization 
  layout fix

1a0898c3

sql_cache.cc: · 6fa8e897

unknown authored Apr 05, 2003

  Cast to unsigned char


sql/sql_cache.cc:
  Cast to unsigned char

6fa8e897

04 Apr, 2003 9 commits

Post merge fixes. · d259de25

unknown authored Apr 04, 2003


mysql-test/r/sp.result:
  Enabled the cs test as it works now.
mysql-test/t/sp.test:
  Enabled the cs test as it works now.

d259de25

Merge · 9e31ab36

unknown authored Apr 04, 2003


sql/share/czech/errmsg.txt:
  SCCS merged
sql/share/danish/errmsg.txt:
  SCCS merged
sql/share/dutch/errmsg.txt:
  SCCS merged
sql/share/estonian/errmsg.txt:
  SCCS merged
sql/share/french/errmsg.txt:
  SCCS merged
sql/share/german/errmsg.txt:
  SCCS merged
sql/share/greek/errmsg.txt:
  SCCS merged
sql/share/hungarian/errmsg.txt:
  SCCS merged
sql/share/italian/errmsg.txt:
  SCCS merged
sql/share/japanese/errmsg.txt:
  SCCS merged
sql/share/korean/errmsg.txt:
  SCCS merged
sql/share/norwegian-ny/errmsg.txt:
  SCCS merged
sql/share/norwegian/errmsg.txt:
  SCCS merged
sql/share/polish/errmsg.txt:
  SCCS merged
sql/share/portuguese/errmsg.txt:
  SCCS merged
sql/share/romanian/errmsg.txt:
  SCCS merged
sql/share/russian/errmsg.txt:
  SCCS merged
sql/share/serbian/errmsg.txt:
  SCCS merged
sql/share/slovak/errmsg.txt:
  SCCS merged
sql/share/spanish/errmsg.txt:
  SCCS merged
sql/share/swedish/errmsg.txt:
  SCCS merged
sql/share/ukrainian/errmsg.txt:
  SCCS merged

9e31ab36

Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5582a83a
unknown authored Apr 04, 2003
```
into mysql.com:/home/pem/work/mysql-4.1
```
5582a83a

Added missing error message (was only added in english/). · 33acac60

unknown authored Apr 04, 2003

Removed extraneous error message from german/errmsg.txt.


sql/share/czech/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/danish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/dutch/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/estonian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/french/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/german/errmsg.txt:
  Added missing error message (was only added in english/).
  Removed extraneous error message.
sql/share/greek/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/hungarian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/italian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/japanese/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/korean/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/norwegian-ny/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/norwegian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/polish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/portuguese/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/romanian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/russian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/serbian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/slovak/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/spanish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/swedish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/ukrainian/errmsg.txt:
  Added missing error message (was only added in english/).

33acac60

Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 1e95930f
unknown authored Apr 04, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
1e95930f
Index.xml: · 59bf122b
unknown authored Apr 04, 2003
```
  Type


sql/share/charsets/Index.xml:
  Type
```
59bf122b

Merging 4.1 to 5.0. · d021b5a5

unknown authored Apr 04, 2003


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

d021b5a5

Updating subselect results after SUBSELECT was changed into SUBQUERY. · f859761a
unknown authored Apr 04, 2003
```
mysql-test/r/subselect.result:
  Updating results after SUBSELECT was changed into SUBQUERY.
```
f859761a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2dc116a5
unknown authored Apr 04, 2003
```
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp


sql/item_strfunc.cc:
  Auto merged
```
2dc116a5