Commits · 73f0ed05385a4288298ef77c5411f49df0c193e1 · nexedi / MariaDB

15 Sep, 2005 1 commit

ndb - bug#9994 backpatch fixes from 5.0 · 73f0ed05

unknown authored Sep 15, 2005

      IGNORE on merge 4.1->5.0


ndb/src/kernel/blocks/ERROR_codes.txt:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  bug#9994 backpatch fixes from 5.0

73f0ed05

14 Sep, 2005 6 commits

Merge mysql.com:/home/mydev/mysql-4.1 · c222d967
unknown authored Sep 14, 2005
```
into  mysql.com:/home/mydev/mysql-4.1-4100
```
c222d967

Improve error / process handling in the Perl script to run the test suite (patch supplied by Kent). · 21360b30

unknown authored Sep 14, 2005


mysql-test/lib/mtr_process.pl:
  Handle errors in child processes separate from the parent process (patch supplied by Kent).
mysql-test/lib/mtr_report.pl:
  New function to handle errors in child processes separate from the parent process (patch supplied by Kent).
  Expected to avoid HUP signals.

21360b30

Bug#12920 - key_read_requests counter appears to re-set · 086165ee

unknown authored Sep 14, 2005

After merge fix.


include/keycache.h:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Status variables moved into KEY_CACHE in 4.1.
  Enlarging them there.
include/my_sys.h:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Status variables moved into KEY_CACHE in 4.1.
  Removed unused global variables.
myisam/mi_test2.c:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Status variables moved into KEY_CACHE in 4.1.
  Changed to print default key cache status.
mysys/mf_keycache.c:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Status variables moved into KEY_CACHE in 4.1.
  Changed their debug printout.
sql/mysqld.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Changed to print full value.
sql/sql_show.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Added a branch for long long values.
sql/sql_test.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  changed to print full values.
sql/structs.h:
  Bug#12920 - key_read_requests counter appears to re-set
  After merge fix.
  Added a branch for long long keycache values.

086165ee

Minor output format change of the Perl test suite script (align with the shell script). · 4db3f4ff

unknown authored Sep 14, 2005

mysql-test/lib/mtr_report.pl:
Make the Perl test script output identical to that of the (old) shell script,
so that reported differences compare as equal strings (for automatic analysis).

4db3f4ff

Merge mysql.com:/home/mydev/mysql-4.0-4000 · 6bade752

unknown authored Sep 14, 2005

into  mysql.com:/home/mydev/mysql-4.1-4100


include/my_sys.h:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
myisam/mi_test2.c:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
mysys/mf_keycache.c:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
sql/mysqld.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.
sql/sql_test.cc:
  Bug#12920 - key_read_requests counter appears to re-set
  Manual merge requiring after merge fix.

6bade752

Bug#12920 - key_read_requests counter appears to re-set · e4462fd2
unknown authored Sep 14, 2005
```
Enlarged the counter variables to ulonglong.
```
e4462fd2

13 Sep, 2005 4 commits
- Merge mysql.com:/home/mydev/mysql-4.0-4000 · 7ea9226d
  unknown authored Sep 13, 2005
```
into  mysql.com:/home/mydev/mysql-4.1-4100


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
```
  7ea9226d
- Bug#12845 - Stress test: Server crashes on CREATE .. SELECT statement · c158b8a8
  unknown authored Sep 13, 2005
```
Solution for 4.0 and 4.1.
If the caller cannot re-open table(s), it gives a NULL
'refresh' argument to open_table(). We used to ignore
flushes then. Now we ignore drops too.
```
  c158b8a8
- Merged code. Removed unneccessary repeating. · 54b3c412
  unknown authored Sep 13, 2005
  
  54b3c412
- minor compile error fix · 941acd1c
  unknown authored Sep 13, 2005
  
  941acd1c
12 Sep, 2005 25 commits

Merge bk-internal:/home/bk/mysql-4.1 · 91e94b7f
unknown authored Sep 12, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
```
91e94b7f
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · 759ae8d1
unknown authored Sep 13, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged
```
759ae8d1
Merge bk-internal:/home/bk/mysql-4.1 · 253e2eef
unknown authored Sep 12, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
253e2eef
Update test result · 3311e7cd
unknown authored Sep 12, 2005
```
mysql-test/r/ndb_autodiscover.result:
  Update results
```
3311e7cd
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 631085c1
unknown authored Sep 12, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1
```
631085c1
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3e6e60f1
unknown authored Sep 12, 2005
```
into  selena.:H:/MYSQL/src/#05588-mysql-4.1


include/my_global.h:
  Auto merged
```
3e6e60f1
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4b000369
unknown authored Sep 12, 2005
```
into  kite-hub.kitebird.com:/tmp/merge-4.1
```
4b000369
Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0 · 523e540b
unknown authored Sep 12, 2005
```
into  kite-hub.kitebird.com:/tmp/merge-4.0
```
523e540b
Merge kite-hub.kitebird.com:/tmp/merge-4.0 · 9f1899bd
unknown authored Sep 12, 2005
```
into  kite-hub.kitebird.com:/tmp/merge-4.1


README:
  Auto merged
```
9f1899bd

README: · 8c5100ad

unknown authored Sep 12, 2005

  Update README (2nd try)


README:
  Update README (2nd try)

8c5100ad

Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco · 45f8e11c

unknown authored Sep 12, 2005

into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged

45f8e11c

Corrected construct of faked Node fail signals in ndb SignalSender · ccf92b19
unknown authored Sep 12, 2005

ccf92b19
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 18e64550
unknown authored Sep 12, 2005
```
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
```
18e64550
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 7fa20cbc
unknown authored Sep 12, 2005
```
into  mishka.mysql.com:/home/my/mysql-4.1
```
7fa20cbc

Review fixes since last pull · d860c0f0

unknown authored Sep 12, 2005

Fix for bug #13025; Server crash in filesort because wrong call to handler::position()


client/mysqltest.c:
  Code cleanup during review
mysql-test/r/innodb.result:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
mysql-test/t/innodb.test:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
sql/filesort.cc:
  Don't call handler::position() if row was not found
sql/item_cmpfunc.cc:
  Indentation changes
sql/sql_select.cc:
  Moved variable to outer level

d860c0f0

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6c5c2c0b
unknown authored Sep 12, 2005
```
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
```
6c5c2c0b
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · fd97d163
unknown authored Sep 12, 2005
```
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
```
fd97d163
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · b1696220
unknown authored Sep 12, 2005
```
into  eel.(none):/home/jonas/src/mysql-4.1-push
```
b1696220

Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS · 6a852bde

unknown authored Sep 12, 2005

  produce warning for 'create database if not exists' if database exists
  do not update database options in this case  
  produce warning for 'create table if not exists' if table exists



mysql-test/r/create.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/temp_table.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/warnings.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/t/create.test:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    test case
sql/sql_db.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create database if not exists' if database exists
    do not update database options in this case
sql/sql_table.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create table if not exists' if table exists

6a852bde

removed a few aborts from mgmapi · 7aa7378f
unknown authored Sep 12, 2005
```
corrected typo in ndb Parser
```
7aa7378f
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · 98841859
unknown authored Sep 12, 2005
```
into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
```
98841859
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3e0b63f5
unknown authored Sep 12, 2005
```
into  eel.(none):/home/jonas/src/mysql-4.1-push
```
3e0b63f5
ps_6bdb, ps_7ndb tests failure fix · 60c480e4
unknown authored Sep 12, 2005

60c480e4
Reverted old fix with sync_slave_with_master and added a replace commands · e55089ce
unknown authored Sep 12, 2005
```
to eliminate nondeterminism in slave start
```
e55089ce
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0b126af5
unknown authored Sep 12, 2005
```
into  eel.(none):/home/jonas/src/mysql-4.1-push
```
0b126af5

11 Sep, 2005 3 commits
- Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · c21e2e74
  unknown authored Sep 11, 2005
```
into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
```
  c21e2e74
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 980b53b5
  unknown authored Sep 11, 2005
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
```
  980b53b5
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0d8377e4
  unknown authored Sep 11, 2005
```
into  eel.(none):/home/jonas/src/mysql-4.1-push
```
  0d8377e4
10 Sep, 2005 1 commit
- Removed redundant reset_one_shot_variables calls · 5bfcf9b8
  unknown authored Sep 11, 2005
```
sql/sql_parse.cc:
  Optimization, this reset is executed below anyway
```
  5bfcf9b8