Commits · 4ed94fcd8ec8afc11e4208a5a3e83bd90b5fc644 · Kirill Smelkov / mariadb

17 Apr, 2003 1 commit

Check the number of args to SPs. · 4ed94fcd

unknown authored Apr 17, 2003

Fixes bug #280.


include/mysqld_error.h:
  Check the number of args to SPs.
mysql-test/r/sp-error.result:
  Check the number of args to SPs.
mysql-test/t/sp-error.test:
  Check the number of args to SPs.
sql/share/czech/errmsg.txt:
  Check the number of args to SPs.
sql/share/danish/errmsg.txt:
  Check the number of args to SPs.
sql/share/dutch/errmsg.txt:
  Check the number of args to SPs.
sql/share/english/errmsg.txt:
  Check the number of args to SPs.
sql/share/estonian/errmsg.txt:
  Check the number of args to SPs.
sql/share/french/errmsg.txt:
  Check the number of args to SPs.
sql/share/german/errmsg.txt:
  Check the number of args to SPs.
sql/share/greek/errmsg.txt:
  Check the number of args to SPs.
sql/share/hungarian/errmsg.txt:
  Check the number of args to SPs.
sql/share/italian/errmsg.txt:
  Check the number of args to SPs.
sql/share/japanese/errmsg.txt:
  Check the number of args to SPs.
sql/share/korean/errmsg.txt:
  Check the number of args to SPs.
sql/share/norwegian-ny/errmsg.txt:
  Check the number of args to SPs.
sql/share/norwegian/errmsg.txt:
  Check the number of args to SPs.
sql/share/polish/errmsg.txt:
  Check the number of args to SPs.
sql/share/portuguese/errmsg.txt:
  Check the number of args to SPs.
sql/share/romanian/errmsg.txt:
  Check the number of args to SPs.
sql/share/russian/errmsg.txt:
  Check the number of args to SPs.
sql/share/serbian/errmsg.txt:
  Check the number of args to SPs.
sql/share/slovak/errmsg.txt:
  Check the number of args to SPs.
sql/share/spanish/errmsg.txt:
  Check the number of args to SPs.
sql/share/swedish/errmsg.txt:
  Check the number of args to SPs.
sql/share/ukrainian/errmsg.txt:
  Check the number of args to SPs.
sql/sp_head.cc:
  Check the number of args to SPs.

4ed94fcd

16 Apr, 2003 9 commits

Post post-merge fix. · 8f47d237

unknown authored Apr 17, 2003


sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.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_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_update.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

8f47d237

Post-merge fixes. · d7edf978
unknown authored Apr 17, 2003

d7edf978

Merged 4.1 into 5.0. · 36752387

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

36752387

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

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 70a2f3c2

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

70a2f3c2

Add mysys specific error messages · e5c62e32

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

e5c62e32

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

15 Apr, 2003 1 commit

replace default separator in group_concat, correct a bug · b03a00eb

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

b03a00eb

11 Apr, 2003 3 commits
- correct codes of warnings in result file · fc6456b5
  unknown authored Apr 12, 2003
  
  fc6456b5
- Exported functions claimed by MySQLCC · b4d60df3
  unknown authored Apr 11, 2003
  
  b4d60df3
- - make sure to generate the BDB tags file, otherwise s_symlink will create · aa418f0f
  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)
```
  aa418f0f
10 Apr, 2003 3 commits

For to use the /libmysql/libmysql.def file instead · 18cccabf

unknown authored Apr 10, 2003


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

18cccabf

Merge · a4f6f3ad

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.

a4f6f3ad

added compress/uncompress function · 75bdeb1b

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

75bdeb1b

09 Apr, 2003 1 commit
- Merge bk-internal:/home/bk/mysql-4.1 · 3bcbdd78
  unknown authored Apr 09, 2003
```
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
```
  3bcbdd78
08 Apr, 2003 6 commits

- bumped up version number to 4.1.1-alpha now that 4.0.1 has been tagged · 5614054b
unknown authored Apr 08, 2003
```
 - tagged ChangeSet@1.1529 as mysql-4.1.0
```
5614054b

Merging · bbcf5390

unknown authored Apr 08, 2003


myisam/mi_check.c:
  Auto merged
myisam/sort.c:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  error messages trimmed
sql/share/czech/errmsg.txt:
  error messages trimmed
sql/share/danish/errmsg.txt:
  error messages trimmed
sql/share/dutch/errmsg.txt:
  error messages trimmed
sql/share/english/errmsg.txt:
  error messages trimmed
sql/share/estonian/errmsg.txt:
  error messages trimmed
sql/share/french/errmsg.txt:
  error messages trimmed
sql/share/german/errmsg.txt:
  error messages trimmed
sql/share/greek/errmsg.txt:
  error messages trimmed
sql/share/hungarian/errmsg.txt:
  error messages trimmed
sql/share/italian/errmsg.txt:
  error messages trimmed
sql/share/japanese/errmsg.txt:
  error messages trimmed
sql/share/korean/errmsg.txt:
  error messages trimmed
sql/share/norwegian-ny/errmsg.txt:
  error messages trimmed
sql/share/norwegian/errmsg.txt:
  error messages trimmed
sql/share/polish/errmsg.txt:
  error messages trimmed
sql/share/portuguese/errmsg.txt:
  error messages trimmed
sql/share/romanian/errmsg.txt:
  error messages trimmed
sql/share/russian/errmsg.txt:
  error messages trimmed
sql/share/serbian/errmsg.txt:
  error messages trimmed
sql/share/slovak/errmsg.txt:
  error messages trimmed
sql/share/spanish/errmsg.txt:
  error messages trimmed
sql/share/swedish/errmsg.txt:
  error messages trimmed
sql/share/ukrainian/errmsg.txt:
  error messages trimmed

bbcf5390

SCRUM · 131d9000

unknown authored Apr 08, 2003

two KILL versions
code trimming with headquarter's suggestions 


myisam/mi_check.c:
  killed_ptr function changed backward
myisam/myisamchk.c:
  killed_ptr function changed backward
myisam/myisamdef.h:
  killed_ptr function changed backward
myisam/sort.c:
  killed_ptr function changed backward
sql/ha_myisam.cc:
  killed_ptr function changed backward
sql/lock.cc:
  error sending trimmed
sql/log_event.cc:
  error sending trimmed
sql/records.cc:
  error sending trimmed
sql/slave.cc:
  error sending trimmed
sql/sql_class.h:
  inline functions to send right message about killing added
sql/sql_delete.cc:
  error sending trimmed
sql/sql_load.cc:
  error sending trimmed
sql/sql_parse.cc:
  error sending trimmed
sql/sql_prepare.cc:
  error sending trimmed
sql/sql_select.cc:
  error sending trimmed
sql/sql_table.cc:
  error sending trimmed
sql/sql_update.cc:
  error sending trimmed

131d9000

Use of CHARSWT_INFO *result_collation · 8c95b516

unknown authored Apr 08, 2003

instead of bool convert_result_charset
SET CHARACTER SET inststead of SET NAMES in tests

8c95b516

SET NAMES doesn't start recoding · f20835c7
unknown authored Apr 08, 2003
```
SET CHARACTER SET does
```
f20835c7

A better fix for UNION and slow query log. · 0695239a

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

0695239a

07 Apr, 2003 4 commits
- All collation names are now fit into convension · f390da22
  unknown authored Apr 07, 2003
  
  f390da22
- sys_var_collation is now abstract class · b9b15d52
  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.
```
  b9b15d52
- New methods to store strings with "convert to" argimument · 65ae25d0
  unknown authored Apr 07, 2003
  
  65ae25d0
- fixed bug with locales in libedit · 3aa55997
  unknown authored Apr 06, 2003
```
configure.in:
  fixed bug with external libedit
```
  3aa55997
05 Apr, 2003 8 commits

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


sql/sql_yacc.yy:
  Auto merged
```
9a4258b4

Some optimization in SET NAMES · 0ee98167

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

0ee98167

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


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

sql_yacc.yy: · a00dbd11

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!

a00dbd11

sql_yacc.yy, set_var.h, set_var.cc: · a7a96235

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

a7a96235

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 740adf71

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

740adf71

fixed st_select_lex initialization · 933e16a3

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

933e16a3

sql_cache.cc: · 1f61635d

unknown authored Apr 05, 2003

  Cast to unsigned char


sql/sql_cache.cc:
  Cast to unsigned char

1f61635d

04 Apr, 2003 4 commits

Post merge fixes. · cfd69393

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.

cfd69393

Merge · 2a25cf79

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

2a25cf79

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

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

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

f3f0fb58