Commits · 067863e184e9a23034d410919d4c8075ee30bcee · Kirill Smelkov / mariadb

12 Nov, 2004 9 commits

merge · 067863e1

unknown authored Nov 12, 2004


include/mysqld_error.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/rpl_charset.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/rpl_charset.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_uniq.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/parse_file.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/protocol_cursor.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/repl_failsafe.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.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/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/sql_udf.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  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

067863e1

post-review fixes · 9e921615

unknown authored Nov 12, 2004


mysql-test/r/rpl_rotate_logs.result:
  removed host dependence in error messages
mysql-test/t/rpl_rotate_logs.test:
  removed host dependence in error messages
mysys/my_error.c:
  comment about using my_error family functions
sql/filesort.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/ha_innodb.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/handler.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/item.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/item_cmpfunc.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/item_func.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/item_strfunc.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/item_subselect.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/item_sum.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/lock.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/log.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/mysql_priv.h:
  error check moved to fill_record
sql/mysqld.cc:
  fixed error messages
sql/parse_file.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/protocol.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/protocol_cursor.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/repl_failsafe.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/set_var.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/slave.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sp.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sp_head.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sp_rcontext.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_acl.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_analyse.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_base.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
  error check moved to fill_record
sql/sql_class.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_class.h:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_db.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_delete.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
  error check moved to fill_record
sql/sql_handler.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_help.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_insert.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
  error check moved to fill_record
sql/sql_lex.cc:
  layout fixed
sql/sql_load.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_map.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_parse.cc:
  error check moved to fill_record
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_prepare.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_rename.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_repl.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_select.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_show.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_table.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_trigger.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_udf.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_union.cc:
  error check moved to fill_record
sql/sql_update.cc:
  error check moved to fill_record
sql/sql_view.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/sql_yacc.yy:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/table.cc:
  changing my_error on my_message and my_printf_error where if they are prefered
sql/unireg.cc:
  changing my_error on my_message and my_printf_error where if they are prefered

9e921615

Fixed merge bug(?) in mysqldump.c. · 980a4188
unknown authored Nov 12, 2004
```
client/mysqldump.c:
  Added missing sentinel.
```
980a4188

Various build fixes. · eed282d6

unknown authored Nov 12, 2004


sql/mysql_priv.h:
  Fix build problems (causing link errors with the Sun compiler).
sql/net_serv.cc:
  Corrected macro definition.
sql/sql_base.cc:
  Fixed build problems (for broken HP compiler).
sql/sql_show.cc:
  64-bit build fix.

eed282d6

Build fixes to make it compile. · c3531618
unknown authored Nov 12, 2004
```
sql/handler.cc:
  Build fixes.
sql/log_event.cc:
  Build fixes.
```
c3531618

Merge avenger.(none):/export/brian/mysql/test/4.1 · 0265f48b

unknown authored Nov 11, 2004

into avenger.(none):/export/brian/mysql/test/5.0


client/mysqldump.c:
  Auto merged
myisam/mi_check.c:
  Auto merged

0265f48b

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 04519f43

unknown authored Nov 11, 2004

into avenger.(none):/export/brian/mysql/test/5.0


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

04519f43

Mainly resolving Guilhem's 4.1 patch to 5.0 · 593c7ce9

unknown authored Nov 11, 2004


client/mysqlbinlog.cc:
  Resolveing merge
client/mysqldump.c:
  resolving merge
sql/handler.cc:
  resolving merge
sql/lex.h:
  resolve merge
sql/log.cc:
  resolving merge
sql/log_event.cc:
  resolving merge
sql/sql_parse.cc:
  resolving merge
sql/sql_yacc.yy:
  resolving merge

593c7ce9

Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) · 4d0e9ad9

unknown authored Nov 11, 2004


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.h:
  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/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

4d0e9ad9

11 Nov, 2004 31 commits

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0f0935ef
unknown authored Nov 11, 2004
```
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
```
0f0935ef

mysqldump.c: · 72c53dad

unknown authored Nov 11, 2004

  Reorder options, revise --hex-blob help string.


client/mysqldump.c:
  Reorder options, revise --hex-blob help string.

72c53dad

Rename: send_prepare_results -> check_prepared_statement (sql_prepare.cc) · aebe9454
unknown authored Nov 11, 2004
```
sql/sql_prepare.cc:
  send_prepare_results -> check_prepared_statement
```
aebe9454
mi_write: fix for ft2 when found word (in the tree) has different length as the word to insert · 9ae3dde8
unknown authored Nov 11, 2004
```
myisam/mi_check.c:
  one more correctness check for CHECK of fulltext indexes
```
9ae3dde8

Few more places with thd->lex replaced with lex (mysql_update, · 7161b21f

unknown authored Nov 11, 2004

check_simple_select). This change was inspired by Monty in December 2003
when thd->lex became a pointer in 4.1.


sql/sql_parse.cc:
  Few more places with thd->lex replaced with lex.
sql/sql_update.cc:
  Few more places with thd->lex replaced with lex.

7161b21f

trx0purge.c: · 946f042d

unknown authored Nov 11, 2004

  Remove duplicated innodb max purge lag code


innobase/trx/trx0purge.c:
  Remove duplicated innodb max purge lag code

946f042d

Cleanup: thd->lex->select_lex -> select_lex (sql_delete.cc) · a6e1436f
unknown authored Nov 11, 2004
```
sql/sql_delete.cc:
  Cleanup: thd->lex->select_lex -> select_lex
```
a6e1436f

Cleanup in sql_acl.cc: thd->lex ->lex · c157d119

unknown authored Nov 11, 2004


sql/sql_acl.cc:
  Cleanup: we want to synonim thd->lex on stack, as we use it often in
  replace_user_table.

c157d119

Rename: Item::val -> Item::val_real(). · 2e6fb936

unknown authored Nov 11, 2004


sql/filesort.cc:
  val -> val_real
sql/item.cc:
  val -> val_real
sql/item.h:
  val -> val_real
sql/item_buff.cc:
  val -> val_real
sql/item_cmpfunc.cc:
  val -> val_real
sql/item_cmpfunc.h:
  val -> val_real
sql/item_func.cc:
  val -> val_real
sql/item_func.h:
  val -> val_real
sql/item_geofunc.cc:
  val -> val_real
sql/item_geofunc.h:
  val -> val_real
sql/item_row.h:
  val -> val_real
sql/item_strfunc.cc:
  val -> val_real
sql/item_strfunc.h:
  val -> val_real
sql/item_subselect.cc:
  val -> val_real
sql/item_subselect.h:
  val -> val_real
sql/item_sum.cc:
  val -> val_real
sql/item_sum.h:
  val -> val_real
sql/item_timefunc.h:
  val -> val_real
sql/item_uniq.h:
  val -> val_real
sql/procedure.h:
  val -> val_real
sql/sp_head.cc:
  val -> val_real
sql/sql_analyse.cc:
  val -> val_real
sql/sql_class.cc:
  val -> val_real
sql/sql_select.cc:
  val -> val_real

2e6fb936

post-merge fixes for WL#1972 · 7ecaf256
unknown authored Nov 11, 2004
```
sql/item.cc:
  post-merge fixes
sql/sql_select.cc:
  post-merge fixes
```
7ecaf256

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3afd8e79

unknown authored Nov 11, 2004

into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469


sql/sql_yacc.yy:
  Auto merged

3afd8e79

Merge pcgem.rdg.cyberkinetica.com:/mnt/staff/repositories/mysql-4.1 · e4a0b794
unknown authored Nov 11, 2004
```
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469


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

ndb_test_platform.cpp: · df6f0988

unknown authored Nov 11, 2004

  better printouts in ndb_test_platform


ndb/tools/ndb_test_platform.cpp:
  better printouts in ndb_test_platform

df6f0988

waiter.cpp: · 0fa48ea4

unknown authored Nov 11, 2004

  fixed so that connectring option works


ndb/tools/waiter.cpp:
  fixed so that connectring option works

0fa48ea4

Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 10e868bb
unknown authored Nov 11, 2004
```
into mysql.com:/home/timka/mysql/src/5.0-1972


sql/sql_base.cc:
  Auto merged
```
10e868bb

mysql-test-run.sh: · 75f9f5f1

unknown authored Nov 11, 2004

  made sleep time for second master larger so that it has time to start


mysql-test/mysql-test-run.sh:
  made sleep time for second master larger so that it has time to start

75f9f5f1

basestring_vsnprintf fix for size==0 · 9fe89939
unknown authored Nov 11, 2004

9fe89939
Fixing filename case problems in sql_base.cc for views on MacOS X. (With help from sanja :) · e5fd013f
unknown authored Nov 11, 2004
```
sql/sql_base.cc:
  Fixing filename case problems for views on MacOS X. (With help from sanja :)
```
e5fd013f
Merge mysql.com:/usr/local/bk/mysql-5.0 · 25fa68b7
unknown authored Nov 11, 2004
```
into mysql.com:/home/pem/work/mysql-5.0
```
25fa68b7
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · c980069a
unknown authored Nov 11, 2004
```
into mysql.com:/M50/mysql-5.0
```
c980069a

forgot a return 0 · 3048dc0f

unknown authored Nov 11, 2004

    removed some errorcodes not used


ndb/src/mgmclient/CommandInterpreter.cpp:
  forgot a return 0
ndb/src/ndbapi/ndberror.c:
  removed some errorcodes not used

3048dc0f

Corrected a syntax error detected in test build. · 791df7b0

unknown authored Nov 11, 2004


client/mysqltest.c:
  Syntax error: Removed the trailing comma after last element of an "enum" list.

791df7b0

Merge mysql.com:/usr/local/bk/mysql-5.0 · 4f0831f5
unknown authored Nov 11, 2004
```
into mysql.com:/home/pem/work/mysql-5.0
```
4f0831f5
Updated lowercase_table2.results. (show tables output has changed) · e8c72fd3
unknown authored Nov 11, 2004
```
mysql-test/r/lowercase_table2.result:
  Updated results. (show tables output has changed)
```
e8c72fd3
'5.4', -1, HALF_UP · 9723a143
unknown authored Nov 11, 2004
```
fixed
```
9723a143
ndbcluster.sh: · 784a9a9f
unknown authored Nov 11, 2004
```
  fixed typo


mysql-test/ndb/ndbcluster.sh:
  fixed typo
```
784a9a9f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 082701e5
unknown authored Nov 11, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
082701e5
added ndb error codes and better explanations · 8d072e64
unknown authored Nov 11, 2004

8d072e64

Merge of WL#1972 "Evaluate HAVING before SELECT select-list" · 975f1c16

unknown authored Nov 11, 2004


sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/item.cc:
  manual merge
sql/sql_select.cc:
  manul merge

975f1c16

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · eb8cbe8c
unknown authored Nov 11, 2004
```
into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/sql_yacc.yy:
  Auto merged
```
eb8cbe8c
Fix for autobuild failure: forgotten ';' (bison 1.875 accepts if it's not there, but 1.75 does not) · f1b82eb2
unknown authored Nov 11, 2004
```
sql/sql_yacc.yy:
  forgotten ';' (bison 1.875 accepts if it's not there, but 1.75 does not)
```
f1b82eb2