Commits · 1c74210e32176726f6beb15941e466cb21a03605 · Kirill Smelkov / mariadb

27 Dec, 2005 5 commits

Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1c74210e
unknown authored Dec 27, 2005
```
into  mysql.com:/home/mydev/mysql-5.0-bug5390
```
1c74210e

unknown authored Dec 28, 2005


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  build fix for 5.0

f6910883

Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · 88ef95ff

unknown authored Dec 28, 2005

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


client/mysql.cc:
  Auto merged
myisam/mi_delete.c:
  Auto merged
mysql-test/r/fulltext2.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/mysqld.cc:
  Auto merged

88ef95ff

Merge mysql.com:/home/mydev/mysql-5.0 · d03d5a30

unknown authored Dec 27, 2005

into  mysql.com:/home/mydev/mysql-5.0-bug5390


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

d03d5a30

Avoiding conditional jump on uninitialized variable (BUG#14904). · 6759bbce
unknown authored Dec 27, 2005

6759bbce

26 Dec, 2005 1 commit

Merge mysql.com:/home/mydev/mysql-4.1-bug5390 · e049f2c8

unknown authored Dec 26, 2005

into  mysql.com:/home/mydev/mysql-5.0-bug5390


BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Auto merged
mysql-test/r/create.result:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
mysql-test/r/merge.result:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
mysql-test/t/create.test:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
mysql-test/t/merge.test:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/lock.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/mysql_priv.h:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/sql_parse.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0
sql/sql_update.cc:
  BUG#5390 - problems with merge tables
  Manual merge: ul - use local changes made for 5.0

e049f2c8

24 Dec, 2005 2 commits

remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably... · eb12c38b

unknown authored Dec 24, 2005

remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source


include/config-netware.h:
  put undef HAVE_ARCHIVE_DB where it belongs

eb12c38b

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · aa736473
unknown authored Dec 24, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
```
aa736473

23 Dec, 2005 3 commits

locking issues, · bcc1ecd3

unknown authored Dec 23, 2005

test for LONGLONG_MIN in decimal.c


myisam/mi_create.c:
  lock THR_LOCK_myisam later
mysys/thr_alarm.c:
  remove misplaced comment and "safety" if()
server-tools/instance-manager/instance.cc:
  add unlock
strings/decimal.c:
  correct the test for LONGLONG_MIN. fix debug sprintf

bcc1ecd3

correct help text · c2ac0891
unknown authored Dec 23, 2005

c2ac0891

ctype_uca.result, ctype_uca.test: · c885fb04

unknown authored Dec 23, 2005

  Adding test case.
charset-def.c:
  Initialize new collation.
ctype-uca.c:
  Adding simplified Hungarian collation.


strings/ctype-uca.c:
  Adding simplified Hungarian collation.
mysys/charset-def.c:
  Initialize new collation.
mysql-test/t/ctype_uca.test:
  Adding test case.
mysql-test/r/ctype_uca.result:
  Adding test case.

c885fb04

22 Dec, 2005 2 commits

Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · 115a1d3f
unknown authored Dec 22, 2005
```
into  frost.snake.net:/Users/paul/bk/mysql-5.0


client/mysqltest.c:
  Auto merged
```
115a1d3f

mysqltest.c: · 6de9d67d

unknown authored Dec 22, 2005

  Put options in order.
  Add #ifdef around --debug for non-debug builds.


client/mysqltest.c:
  Put options in order.
  Add #ifdef around --debug for non-debug builds.

6de9d67d

21 Dec, 2005 5 commits
- Increment the version number to 5.0.19 · 13049f4a
  unknown authored Dec 21, 2005
  
  13049f4a
- Merge bk-internal:/home/bk/mysql-5.0 · b479c27f
  unknown authored Dec 21, 2005
```
into  mysql.com:/usr/local/mysql/mysql-5.0


sql/sql_trigger.cc:
  Auto merged
```
  b479c27f
- BUG#15842: Change in "item.cc" adding Item_sp_variable breaks compile on HP-UX 11.23 · 3e3b2150
  unknown authored Dec 21, 2005
```
Fix: make explicit conversion to non-constant string (char *).
Backported from 5.1 changeset 1.1968 05/12/19 17:36:20 kent@mysql.com +2 -0


sql/item.cc:
  Make explicit conversion to non-constant string (char *).
sql/sql_trigger.cc:
  Make explicit conversion to non-constant string (char *).
```
  3e3b2150
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9ae226fe
  unknown authored Dec 21, 2005
```
into  mysql.com:/home/dlenev/src/mysql-5.0-bg14836
```
  9ae226fe
- Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · 128babca
  unknown authored Dec 21, 2005
```
into  mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup
```
  128babca
20 Dec, 2005 5 commits

mysql.cc: · fd46c788

unknown authored Dec 20, 2005

  Typo in help message.


client/mysql.cc:
  Typo in help message.

fd46c788

Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · 17b32e1a
unknown authored Dec 20, 2005
```
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
```
17b32e1a
errmsg.txt: · 3b94794f
unknown authored Dec 20, 2005
```
  Fix typo.


sql/share/errmsg.txt:
  Fix typo.
```
3b94794f

BUG#5390 - problems with merge tables · 5113bdff

unknown authored Dec 20, 2005

Problem #1: INSERT...SELECT, Version for 5.0.
Extended the unique table check by a check of lock data.
Merge sub-tables cannot be detected by doing name checks only.


mysql-test/r/create.result:
  BUG#5390 - problems with merge tables
  Removed a duplicate test.
mysql-test/r/merge.result:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT
  Added test results.
mysql-test/t/create.test:
  BUG#5390 - problems with merge tables
  Removed a duplicate test.
mysql-test/t/merge.test:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT
  Added tests.
sql/lock.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added a new function to find a duplicate lock in a list of tables.
sql/mysql_priv.h:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
  Added a declaration for the new function.
sql/sql_base.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
  Added a call to the new mysql_lock_have_duplicate(),
  which needs the thread handle, to unique_table().
sql/sql_delete.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
sql/sql_insert.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
sql/sql_load.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
sql/sql_parse.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
sql/sql_update.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT, Version for 5.0.
  Added the thread handle to unique_table().
  Replaced a call to find_table_in_local_list() by
  the newly extended unique_table().

5113bdff

build fix · e54c3c88
unknown authored Dec 21, 2005

e54c3c88

19 Dec, 2005 9 commits

Bug #15772 Aborted YaSSL connections force threads into busyloops · 28999410

unknown authored Dec 20, 2005

  - Report error when there is nothing to read after wait.


extra/yassl/src/handshake.cpp:
  Report error if there is nothing to read after a blocking read

28999410

Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3823cfa9
unknown authored Dec 19, 2005
```
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
```
3823cfa9

Fix for bug#14271 I_S: columns has no size for (var)binary columns · d920097a

unknown authored Dec 19, 2005

  set character_octet_length, character_maximum_length for
  binary and varbinary field types


mysql-test/r/information_schema.result:
  Fix for bug#14271 I_S: columns has no size for (var)binary columns
    test case
mysql-test/t/information_schema.test:
  Fix for bug#14271 I_S: columns has no size for (var)binary columns
    test case

d920097a

Fix for bug#14861 aliased column names are not preserved. · c7a440d1

unknown authored Dec 19, 2005

  Create tmp table filed using original item name when it's necessary


mysql-test/r/view.result:
  Fix for bug#14861 aliased column names are not preserved.
    test case
mysql-test/t/view.test:
  Fix for bug#14861 aliased column names are not preserved.
    test case

c7a440d1

Bug#12770 DESC cannot display the info. about temporary table · 479a02fa

unknown authored Dec 19, 2005

Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
Bug#15224 SHOW INDEX from temporary table doesn't work.
  Restore thd->temporary_tables to be able to process
  temporary tables(only for 'show index' & 'show columns').
  This should be changed when processing of temporary tables for
  I_S tables will be done.


mysql-test/r/information_schema.result:
  Bug#12770 DESC cannot display the info. about temporary table
  Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
  Bug#15224 SHOW INDEX from temporary table doesn't work.
    test case
mysql-test/t/information_schema.test:
  Bug#12770 DESC cannot display the info. about temporary table
  Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
  Bug#15224 SHOW INDEX from temporary table doesn't work.
    test case

479a02fa

Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · 5da2f843

unknown authored Dec 19, 2005

into  mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

5da2f843

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · adc0c223

unknown authored Dec 19, 2005

into  mysql.com:/home/stewart/Documents/MySQL/5.0/cleanup


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

adc0c223

Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main · bdca0728

unknown authored Dec 19, 2005

into  mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

bdca0728

mysql-test-run.pl: · 21620190

unknown authored Dec 19, 2005

  Script "my_print_defaults" is to be searched for as executable


mysql-test/mysql-test-run.pl:
  Script "my_print_defaults" is to be searched for as executable

21620190

18 Dec, 2005 8 commits
- Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1a2bc657
  unknown authored Dec 18, 2005
```
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
```
  1a2bc657
- Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · d0cf13f8
  unknown authored Dec 18, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  d0cf13f8
- Merge · 2de5c141
  unknown authored Dec 18, 2005
```
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_multi.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_multi.test:
  Auto merged
sql/sql_class.cc:
  Auto merged
```
  2de5c141
- Makefile.am: · a3a5df43
  unknown authored Dec 18, 2005
```
  Added 5.0 specific build scripts


BUILD/Makefile.am:
  Added 5.0 specific build scripts
```
  a3a5df43
- Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · de1c06b9
  unknown authored Dec 18, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


BUILD/Makefile.am:
  Auto merged
```
  de1c06b9
- Merge · aa6d8551
  unknown authored Dec 18, 2005
  
  aa6d8551
- Makefile.am: · e97a4a4a
  unknown authored Dec 18, 2005
```
  Adjusted listing of files to put into source TAR
```
  e97a4a4a
- Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 25f396ad
  unknown authored Dec 18, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  25f396ad