Commits · b03ba905e7de3d32fd0bbf46d8806a33d3871821 · nexedi / MariaDB

06 Jun, 2006 2 commits

Fixed some problems for Windows build · b03ba905

unknown authored Jun 06, 2006


VC++Files/client/mysql.dsp:
  Fixed omission of mysys\my_conio.c.
VC++Files/client/mysql_ia64.dsp:
  Fixed omission of mysys\my_conio.c.
client/mysqldump.c:
  VS compiler does not accept variable declarations within blocks.
  Such a behaviour complies with the Standard C.

b03ba905

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 531dc055

unknown authored Jun 06, 2006

into  mysql.com:/usr/home/ram/work/4.1.b16546


sql/item_timefunc.cc:
  Auto merged
mysql-test/r/func_time.result:
  merging
mysql-test/t/func_time.test:
  merging

531dc055

01 Jun, 2006 4 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · d67a7a40
unknown authored Jun 01, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
```
d67a7a40
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5df6fa3e
unknown authored Jun 01, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
```
5df6fa3e
Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 1a67716d
unknown authored Jun 01, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
```
1a67716d

ndb - bug#20185 · 0eb906ef

unknown authored Jun 01, 2006

  Dont be too aggressive in Dbtc::nodeFailCheckTransaction
  let it timeout by 1, so that it does not assert that it has waited too long
  old impl. set timeotu value to 0, making timeout = (ctcTimer - 0) which could be quite big.


ndb/src/kernel/blocks/ERROR_codes.txt:
  error codes
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  2 new error inserts
  7030 - delay in GCP_PREPARE until checkLocalNodefailComplete is true
  7031 - delay in GCP_PREPARE and die
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Dont set api con timer to 0, as this might trigger asserion in timeoutfound lab if state == PREPARE_TO_COMMIT
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  autotest

0eb906ef

31 May, 2006 1 commit
- Removed dead code that had been commented out · e531b42b
  unknown authored May 31, 2006
  
  e531b42b
30 May, 2006 3 commits

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 32799c6f
unknown authored May 30, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
```
32799c6f
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

29 May, 2006 2 commits

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

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 1 commit
- 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
25 May, 2006 2 commits
- updated libtool/autoconf files · 5f67ab29
  unknown authored May 25, 2006
  
  5f67ab29
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b96b4510
  unknown authored May 25, 2006
```
into  mysql.com:/usr/home/ram/work/4.1.b16900


sql/sql_class.cc:
  Auto merged
```
  b96b4510
24 May, 2006 6 commits

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 537398ca
unknown authored May 24, 2006
```
into  dl145h.mysql.com:/tmp/andrei/4.1-bug14157-utf8_binlog_testcases
```
537398ca
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · db6a9775
unknown authored May 24, 2006
```
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18351
```
db6a9775

configure.in: · 48b5e8f0

unknown authored May 24, 2006

  Update NDB version as well


configure.in:
  Update NDB version as well

48b5e8f0

configure.in: · 5cf61c49

unknown authored May 24, 2006

  Stepped up to 4.1.22


configure.in:
  Stepped up to 4.1.22

5cf61c49

Merge neptunus.(none):/home/msvensson/mysql/bug15328/my41-bug15328 · 1f482442

unknown authored May 24, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge

1f482442

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5c809132
unknown authored May 24, 2006
```
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18351
```
5c809132

23 May, 2006 3 commits
- Merge bk-internal:/home/bk/mysql-4.1 · fa6a2687
  unknown authored May 23, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
  fa6a2687
- Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711 · 96ba4397
  unknown authored May 23, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
  96ba4397
- Add comment for 'kill_server' function · b6d47850
  unknown authored May 23, 2006
  
  b6d47850
22 May, 2006 2 commits

make_sharedlib_distribution.sh: · 807f71bc

unknown authored May 23, 2006

  Solaris sh don't like {..} in file matching


scripts/make_sharedlib_distribution.sh:
  Solaris sh don't like {..} in file matching

807f71bc

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c3254eff
unknown authored May 22, 2006
```
into  mysql.com:/usr/home/ram/work/4.1.b18536
```
c3254eff

21 May, 2006 1 commit
- Merge bk@192.168.21.1:mysql-4.1 · febc5460
  unknown authored May 21, 2006
```
into mysql.com:/home/hf/work/mysql-4.1.clean
```
  febc5460
20 May, 2006 3 commits

Merge · 3d590258
unknown authored May 20, 2006
```
support-files/mysql.spec.sh:
  SCCS merged
```
3d590258

mysql.spec.sh: · 16b027ee

unknown authored May 20, 2006

  Always compile position independent


support-files/mysql.spec.sh:
  Always compile position independent

16b027ee

#14157: utf8 encoding in binlog without set character_set_client · a4aea5af

unknown authored May 20, 2006

fixing an issue with the test portability.


mysql-test/t/mysqlbinlog.test:
  BUG#14157: utf8 encoding in binlog without set character_set_client
  
  fixing koi8r specific case to run on all platforms. client does not announce in cmd line any specific
  encoding but rather set it via `set names'.

a4aea5af

19 May, 2006 4 commits

Fix for bug #18536: mysqldump does not maintain table orders as per --tables option · 985f4684

unknown authored May 19, 2006


client/mysqldump.c:
  Fix for bug #18536: mysqldump does not maintain table orders as per --tables option
    - use list to store table names instead of hash.
mysql-test/r/mysqldump.result:
  Fix for bug #18536: mysqldump does not maintain table orders as per --tables option
    - test result.
mysql-test/t/mysqldump.test:
  Fix for bug #18536: mysqldump does not maintain table orders as per --tables option
    - test case.

985f4684

Merge bk-internal:/home/bk/mysql-4.1 · 8fab0d7b
unknown authored May 19, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
8fab0d7b
Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711 · 5bf0b1aa
unknown authored May 19, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
5bf0b1aa

Bug#15869 Cannot shutdown the server - it restarts · e4bafd2f

unknown authored May 19, 2006

 - A segfault occured when the function 'kill_server' called 
   'my_sigset' with signal number 0. 'my_sigset' is a macro which
   uses 'sigaction' to install the signal handler with an invalid
   signal number will on most platforms return EINVAL but yields
   a segfauilt on IRIX 6.5
 - The server crash was detected by mysqld_safe and it was restarted although
   a shutdown was requested. 
 - Semantics of kill_server(0) is not known, leaving it intact


include/my_pthread.h:
  Check return value from sigaction with a DBUG_ASSERT
  Also DBUG_ASSERT if signal number 0 is passed
sql/mysqld.cc:
  Don't call my_sigset if signo is 0

e4bafd2f

17 May, 2006 2 commits
- Merge bk-internal:/home/bk/mysql-4.1 · 27c02a3b
  unknown authored May 17, 2006
```
into  neptunus.(none):/home/msvensson/mysql/bug18818/my41-bug18818
```
  27c02a3b
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 926ac829
  unknown authored May 17, 2006
```
into  production.mysql.com:/usersnfs/tulin/mysql-4.1
```
  926ac829
16 May, 2006 1 commit
- Merge tulin@production.mysql.com:mysql-4.1 · 40f2d4f9
  unknown authored May 17, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
```
  40f2d4f9