Commits · 992a20fc07c18e3e2d880d307945502584f03d66 · nexedi / MariaDB

01 Jun, 2006 1 commit

Merge rurik.mysql.com:/home/igor/tmp_merge · 992a20fc

unknown authored May 31, 2006

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
  Auto merged
BitKeeper/deleted/.del-sql_state.h~4307ea5f1fe99019:
  Auto merged
mysql-test/r/explain.result:
  Auto merged
mysql-test/r/key_cache.result:
  Auto merged
mysql-test/r/preload.result:
  Auto merged
mysql-test/t/explain.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/sql_base.cc:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~11edc4db89248c16:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~184eb1f09242dc72:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~2cdeb8d6f80eba72:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~587903f9311db2d1:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~606dfaeb9e81aa4e:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~6bbd9eac7f0e6b89:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~7397c423c52c6d2c:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~898865062c970766:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~94a93cc742fca24d:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~9dab24f7fb11b1e1:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~b6181e29d8282b06:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~ba132dc9bc936c8a:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~e2609fdf7870795:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~e3183b99fbba0a9c:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~eeb2c47537ed9c23:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~ef28b592c7591b7:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~f19bfd5d4c918964:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150:
  Manual merge
BitKeeper/deleted/.del-mysqld_error.h~9dac75782467aab7:
  Manual merge

992a20fc

31 May, 2006 3 commits

Bug#14157: utf8 encoding in binlog without set character_set_client · 4cae5175

unknown authored May 31, 2006

adapting to pushbuild's custom to switch from default pathes. The name for
var directory must be set with MYSQLTEST_VARDIR.


mysql-test/t/mysqlbinlog.test:
  correction of log path since pushbuild uses non-default options.

4cae5175

BUG#14157: utf8 encoding in binlog without set character_set_client · 65585ee3

unknown authored May 31, 2006

missed table to drop after merge from 4.1 


mysql-test/r/mysqlbinlog.result:
  result changed
mysql-test/t/mysqlbinlog.test:
  manual merge post-fix

65585ee3

Merge dl145k.mysql.com:/tmp/andrei/MERGE/mysql-4.1 · 1956a1a4

unknown authored May 31, 2006

into  dl145k.mysql.com:/tmp/andrei/MERGE/5.0


BitKeeper/deleted/.del-config.guess~fd94a91a69a8ce8:
  Auto merged
BitKeeper/deleted/.del-config.sub~d18f703b655db258:
  Auto merged
BitKeeper/deleted/.del-ltmain.sh~9b8b907df176f96e:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  manual merge, accepting 4.1 mods
sql/sql_class.cc:
  use local, Ramil explained it's a backport

1956a1a4

30 May, 2006 8 commits

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 54822a0d
unknown authored May 30, 2006
```
into  mysql.com:/space/pekka/ndb/version/my50
```
54822a0d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · a08bcfd9
unknown authored May 30, 2006
```
into  mysql.com:/usr/home/ram/work/mysql-5.0
```
a08bcfd9
Merge mysql.com:/home/alik/MySQL/devel/5.0-rt · 4bf4ff1a
unknown authored May 30, 2006
```
into  mysql.com:/home/alik/MySQL/devel/5.0-tree
```
4bf4ff1a
Merge mysql.com:/usr/home/ram/work/mysql-4.1 · 934ad5ba
unknown authored May 30, 2006
```
into  mysql.com:/usr/home/ram/work/mysql-5.0


client/mysqlbinlog.cc:
  merge
```
934ad5ba
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 291b58b3
unknown authored May 30, 2006
```
into  rurik.mysql.com:/home/igor/mysql-4.1
```
291b58b3

Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX · 031cf6a3

unknown authored May 30, 2006

refers to a column name.


mysql-test/r/select.result:
  Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
  refers to a column name.
  Added a new test case.
mysql-test/t/select.test:
  Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
  refers to a column name.
  Added a new test case.
sql/share/czech/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/danish/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/dutch/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/english/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/estonian/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/french/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/german/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/greek/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.\
sql/share/hungarian/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/italian/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/japanese-sjis/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.\
sql/share/japanese/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/korean/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/norwegian-ny/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/norwegian/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/polish/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/portuguese/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/romanian/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/russian/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/serbian/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/slovak/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/spanish/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/swedish/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.
sql/share/ukrainian/errmsg.txt:
  Removed error message ER_INDEX_DOES_NOT_EXIST,
  used ER_KEY_DOES_NOT_EXITS instead.

031cf6a3

Bug#17204 "second CALL to procedure crashes Server" · 0838a57e

unknown authored May 30, 2006

Bug#18282 "INFORMATION_SCHEMA.TABLES provides inconsistent info about invalid views"
This bug caused crashes or resulted in wrong data being returned
when one tried to obtain information from I_S tables about views
using stored functions.

It was caused by the fact that we were using LEX representing
statement which were doing select from I_S tables as active LEX
when contents of I_S table were built. So state of this LEX both
affected and was affected by open_tables() calls which happened
during this process. This resulted in wrong behavior and in
violations of some of invariants which caused crashes.

This fix tries to solve this problem by properly saving/resetting
and restoring part of LEX which affects and is affected by the
process of opening tables and views in get_all_tables() routine.
To simplify things we separated this part of LEX in a new class
and made LEX its descendant.


mysql-test/r/information_schema_db.result:
  test case
mysql-test/t/information_schema_db.test:
  test case
sql/sql_lex.cc:
  To simplify saving/resetting and restoring part of LEX which
  affects and is affected by the process of opening tables and
  views we moved it to new class Query_tables_list and made LEX
  descendant of this class. Also introduced two LEX methods 
  which can be used to save and reset or to restore this state.
sql/sql_lex.h:
  To simplify saving/resetting and restoring part of LEX which
  affects and is affected by the process of opening tables and
  views we moved it to new class Query_tables_list and made LEX
  descendant of this class. Also introduced two LEX methods 
  which can be used to save and reset or to restore this state.
sql/sql_show.cc:
  Now in get_all_tables() routine we properly save/reset and
  restore part of LEX (statement table list and information
  about routines used) which affects and is affected by the
  process of opening tables and views.
sql/sql_table.cc:
  Now we clean-up LEX after opening table (view) in two stages.
  In the first stage we call LEX::cleanup_after_one_table_open()
  to clean-up selects lists and derived tables state. In the
  second stage which happens after close_thread_tables() is
  invoked we call Query_tables_list::reset_query_tables_list(FALSE)
  to rollback changes in Query_tables_list.

0838a57e

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 608c6972
unknown authored May 30, 2006
```
into  mysql.com:/space/pekka/ndb/version/my50
```
608c6972

29 May, 2006 20 commits
- Merge · decd1107
  unknown authored May 29, 2006
  
  decd1107
- make_win_src_distribution.sh: · bf964de1
  unknown authored May 29, 2006
```
  Convert to DOS EOL if dsp/dsw is in package


scripts/make_win_src_distribution.sh:
  Convert to DOS EOL if dsp/dsw is in package
```
  bf964de1
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 48014344
  unknown authored May 29, 2006
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
```
  48014344
- Merge bk-internal:/home/bk/mysql-5.0 · 97494a6a
  unknown authored May 29, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  97494a6a
- Fix for BUG#18023: IM: instance can be started several times; · 7d73b726
  unknown authored May 29, 2006
```
monitor interval must be > 2sec.


server-tools/instance-manager/guardian.cc:
  Start instance only if it is really crashed.
```
  7d73b726
- Fix for BUG#19391: IM fails to start after two executions · 67ddb320
  unknown authored May 29, 2006
```
server-tools/instance-manager/manager.cc:
  Start Listener-thread after all initialization.
```
  67ddb320
- Merge 192.168.0.20:mysql/yassl_import/my50-yassl_import · 9ded1707
  unknown authored May 29, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  9ded1707
- Add new file md4.cpp to VC++ project file · b4d2a8ac
  unknown authored May 29, 2006
  
  b4d2a8ac
- Import from yaSSL · 629fdd9a
  unknown authored May 29, 2006
```
extra/yassl/include/yassl_error.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/stdexcept.hpp:
  Import patch yassl.diff
extra/yassl/src/yassl_error.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_int.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff
```
  629fdd9a
- Avoid race between master and slave. · b5e1b077
  unknown authored May 29, 2006
  
  b5e1b077
- Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/mysql-5.0 · d24cfd42
  unknown authored May 29, 2006
```
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
```
  d24cfd42
- Merge 192.168.0.20:mysql/mysql-5.0 · 927745c8
  unknown authored May 29, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  927745c8
- Merge bk-internal:/home/bk/mysql-5.0 · d4715742
  unknown authored May 29, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  d4715742
- Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · 987360e8
  unknown authored May 29, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
```
  987360e8
- Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · d462e6c3
  unknown authored May 29, 2006
```
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
```
  d462e6c3
- after merge fix. · a9eae996
  unknown authored May 29, 2006
```
client/mysqldump.c:
  after merge fix.
    - 'lengths' declaration moved to the beginning of the block.
```
  a9eae996
- Update result file after merge · d3ea86a9
  unknown authored May 29, 2006
  
  d3ea86a9
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · e915dade
  unknown authored May 29, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysys/default.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge backport
mysql-test/mysql-test-run.sh:
  Merge backport
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge
```
  e915dade
- manual merge · 8c083f0a
  unknown authored May 29, 2006
  
  8c083f0a
- Merge mysql.com:/usr/home/ram/work/mysql-4.1 · 9ca946b2
  unknown authored May 29, 2006
```
into  mysql.com:/usr/home/ram/work/mysql-5.0


client/mysqldump.c:
  merge (used ul)
mysql-test/r/mysqldump.result:
  merge (used ul)
mysql-test/t/mysqldump.test:
  merge (used ul)
```
  9ca946b2
28 May, 2006 3 commits

Merge rurik.mysql.com:/home/igor/mysql-4.1 · 7e76d9af
unknown authored May 28, 2006
```
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
```
7e76d9af

BUG#14157: utf8 encoding in binlog without set character_set_client · ce8b0405

unknown authored May 28, 2006

refining the test case to exclude problems with koi8r on some platforms.

mysql-test/t/mysqlbinlog.test:
replacing unavailble on some platforms koi8r with latin1 still to preserve the essence of the testcase:
to generate utf8 names in binlog, despite client charset was different, and
to digest this binlog.

ce8b0405

Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX · 883291a2

unknown authored May 27, 2006

refers to a column name.
Added a new error message ER_INDEX_DOES_NOT_EXIST.


include/mysqld_error.h:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
include/sql_state.h:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
mysql-test/r/explain.result:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
mysql-test/r/key_cache.result:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
mysql-test/r/preload.result:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
mysql-test/r/select.result:
  Added a test case for bug #17873.
mysql-test/t/explain.test:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
mysql-test/t/select.test:
  Added a test case for bug #17873.
sql/share/czech/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/danish/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/dutch/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/english/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/estonian/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/french/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/german/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/greek/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/hungarian/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/italian/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/japanese-sjis/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/japanese/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/korean/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/norwegian-ny/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/norwegian/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/polish/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/portuguese/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/romanian/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/russian/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/serbian/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/slovak/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/spanish/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/swedish/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.
sql/share/ukrainian/errmsg.txt:
  Fixed bug #17873.
  Added a new error message ER_INDEX_DOES_NOT_EXIST.

883291a2

27 May, 2006 2 commits
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · d7dbffb0
  unknown authored May 27, 2006
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
```
  d7dbffb0
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 77e25d8a
  unknown authored May 27, 2006
```
into  mysql.com:/space/pekka/ndb/version/my50
```
  77e25d8a
26 May, 2006 3 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 317928f7
unknown authored May 26, 2006
```
into  mysql.com:/home/emurphy/iggy/mysql-5.0


sql/mysqld.cc:
  Auto merged
```
317928f7
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 62e4f81f
unknown authored May 26, 2006
```
into  mysql.com:/home/kgeorge/mysql/5.0/clean
```
62e4f81f

Merge mysql.com:/home/kgeorge/mysql/5.0/clean · c1e6606d

unknown authored May 26, 2006

into  mysql.com:/home/kgeorge/mysql/5.0/B18681


sql/sql_acl.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/view_grant.result:
  resolved conflict
mysql-test/t/view_grant.test:
  resolved merge conflict

c1e6606d