Commits · 9a71f575c78615b5806eeeae1adc40912d6e78af · nexedi / MariaDB

06 Dec, 2004 4 commits
- ndb - Use BitmaskImpl in TUP (in BitField operations) · 9a71f575
  unknown authored Dec 06, 2004
```
ndb/include/util/Bitmask.hpp:
  New methods for working with bit fields of
    arbitrary size
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Use BitmaskImpl at all time (in BitField operations)
```
  9a71f575
- Merge mysql.com:/home/jonas/src/mysql-5.0 · 6f1c6017
  unknown authored Dec 06, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  6f1c6017
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8b7b9326
  unknown authored Dec 06, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
  8b7b9326
- Fix for bugs #6955 SHOW PROCEDURE STATUS crashes the server, · bbdb2d28
  unknown authored Dec 06, 2004
```
#6950 mysql-nt.exe error when click on sql or database on mysql control center
```
  bbdb2d28
05 Dec, 2004 2 commits

unknown authored Dec 06, 2004


mysql-test/r/index_merge_ror_cpk.result:
  Portability fix
mysql-test/r/innodb.result:
  Update results
mysql-test/t/index_merge_ror_cpk.test:
  Portability fix

289d3b2e

Add general n-bitfields to ndb storage engine · ed507744

unknown authored Dec 05, 2004


ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Add bit type
  ArraySize is used to specify no of bits
ndb/include/ndbapi/NdbDictionary.hpp:
  Add bit type
ndb/include/util/NdbSqlUtil.hpp:
  Add bit type
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Add bit type
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add bit type
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Add bit type
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Add bit type

ed507744

04 Dec, 2004 2 commits

Fixing problem with case insitive file systems. · 623c7338

unknown authored Dec 04, 2004

Would you believe that I wrote all of this on a Mac? I just happen to be not using HFS for the partition I did this work on. Oops :)


config/ac-macros/alloca.m4:
  mvdir
config/ac-macros/character_sets.m4:
  mvdir
config/ac-macros/check_cpu.m4:
  mvdir
config/ac-macros/compiler_flag.m4:
  mvdir
config/ac-macros/ha_archive.m4:
  mvdir
config/ac-macros/ha_berkeley.m4:
  mvdir
config/ac-macros/ha_example.m4:
  mvdir
config/ac-macros/ha_innodb.m4:
  mvdir
config/ac-macros/ha_isam.m4:
  mvdir
config/ac-macros/ha_ndbcluster.m4:
  mvdir
config/ac-macros/ha_tina.m4:
  mvdir
config/ac-macros/large_file.m4:
  mvdir
config/ac-macros/misc.m4:
  mvdir
config/ac-macros/mysqlfs.m4:
  mvdir
config/ac-macros/openssl.m4:
  mvdir
config/ac-macros/readline.m4:
  mvdir
config/ac-macros/sanity.m4:
  mvdir
config/ac-macros/zlib.m4:
  mvdir
configure.in:
  Fix silly little problem with case insensitive filesystems.
  
  Funny thing is that I wrote all this on a Mac, but I don't use HFS on that partition so I never noticed that it would be an issue.
  
  Oops :)

623c7338

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0/ · 107ef617
unknown authored Dec 03, 2004
```
into avenger.(none):/export/brian/mysql/acinclude-5.0
```
107ef617

03 Dec, 2004 12 commits

Merge mysql.com:/home/jonas/src/mysql-5.0 · 998389e5
unknown authored Dec 04, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
998389e5
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5eac08f5
unknown authored Dec 03, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
5eac08f5

InnoDB: Fix ctype_utf8 test failure caused by the new record format. · f09c8b35

unknown authored Dec 03, 2004


innobase/btr/btr0btr.c:
  Cache the value of dtype_get_fixed_size(type) in order to avoid
  repeated calls to an external function innobase_is_mb_cset()
innobase/include/data0type.ic:
  Declare innobase_is_mb_cset().
  dtype_get_fixed_size(): Invoke innobase_is_mb_cset() for DATA_MYSQL.
innobase/row/row0ins.c:
  Cache the value of dtype_get_fixed_size(type) in order to avoid
  repeated calls to an external function innobase_is_mb_cset()
innobase/row/row0sel.c:
  row_search_for_mysql(): Added a missing rec_reget_offsets() call
  that caused an InnoDB debug assertion failure in ctype_utf8 test.
sql/ha_innodb.cc:
  Define innobase_is_mb_cset().

f09c8b35

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 917dd61c
unknown authored Dec 03, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
917dd61c
Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 56cb3daa
unknown authored Dec 03, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
56cb3daa
ndb - fix in test suite · b1f4a482
unknown authored Dec 03, 2004
```
ndb/test/src/NDBT_Test.cpp:
  clear threads when finished waiting
```
b1f4a482

strings/decimal.c · 6865b71c

unknown authored Dec 03, 2004

    decimal_round(d, -N) bug fixed


strings/decimal.c:
  decimal_round(d, -N) bug fixed

6865b71c

Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 3abf9292

unknown authored Dec 03, 2004

into mysql.com:/home/jonas/src/mysql-5.0


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

3abf9292

strings/decimal.c · 89c6cd73

unknown authored Dec 03, 2004

    fixed broken d2ll
    added checks for correct test results


strings/decimal.c:
  fixed broken d2ll
  added checks for correct test results

89c6cd73

ndb - fix abort of scan when in WAIT_AI_SCAN state · abb1963d

unknown authored Dec 03, 2004


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure to release all resources when aborting scan
    in state WAIT_AI_SCAN

abb1963d

Resolving conflict. · ae9992ec
unknown authored Dec 02, 2004
```
configure.in:
  Resolving conflict
```
ae9992ec
Syntax fix, plus an update for version. · 4fb9a5fb
unknown authored Dec 02, 2004
```
build/ac-macros/check_cpu.m4:
  Syntax fix
configure.in:
  Updated for version.
```
4fb9a5fb

02 Dec, 2004 9 commits

more decimail bugs fixed · f88e0d9c
unknown authored Dec 03, 2004

f88e0d9c
syntax error fixed · bdc4fa6e
unknown authored Dec 03, 2004

bdc4fa6e
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2d3e0ac7
unknown authored Dec 02, 2004
```
into mysql.com:/home/mysql_src/mysql-5.0-clean
```
2d3e0ac7

Making FLUSH TABLES WITH READ LOCK killable while it's waiting for running... · 75fa4c00

unknown authored Dec 02, 2004

Making FLUSH TABLES WITH READ LOCK killable while it's waiting for running commits to finish. Normally this step is not long but it's still nice to be killable
(especially in case of bug like BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever").


sql/lock.cc:
  making FLUSH TABLES WITH READ LOCK killable while it's waiting for running commits to finish
sql/mysql_priv.h:
  prototype change
sql/sql_parse.cc:
  now it's possible that make_global_read_lock_block_commit fails (killed)

75fa4c00

Undoing change for the moment. · 03af7092

unknown authored Dec 02, 2004


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Delete: acinclude.m4
config.guess:
  Rename: build/config.guess -> config.guess
config.sub:
  Rename: build/config.sub -> config.sub
depcomp:
  Rename: build/depcomp -> depcomp
install-sh:
  Rename: build/install-sh -> install-sh
ltmain.sh:
  Rename: build/ltmain.sh -> ltmain.sh
missing:
  Rename: build/missing -> missing

03af7092

Many files: · d2c4b545

unknown authored Dec 02, 2004

  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.


innobase/btr/btr0btr.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/btr/btr0cur.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/btr/btr0pcur.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/btr/btr0sea.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/data/data0data.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/data/data0type.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/dict/dict0boot.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/dict/dict0crea.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/dict/dict0dict.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/dict/dict0load.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/dict/dict0mem.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/fil/fil0fil.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/fsp/fsp0fsp.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/ibuf/ibuf0ibuf.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/btr0btr.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/btr0btr.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/btr0cur.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/btr0cur.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/btr0pcur.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/btr0sea.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/data0type.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/dict0dict.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/dict0dict.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/dict0mem.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/lock0lock.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/lock0lock.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/mtr0log.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/mtr0mtr.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/page0cur.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/page0cur.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/page0page.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/page0page.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/rem0cmp.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/rem0cmp.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/rem0rec.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/rem0rec.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/row0row.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/row0row.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/row0upd.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/row0upd.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/row0vers.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/row0vers.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/srv0srv.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/trx0rec.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/ut0byte.h:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/include/ut0byte.ic:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/lock/lock0lock.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/log/log0recv.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/mtr/mtr0log.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/page/page0cur.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/page/page0page.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/pars/pars0pars.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/rem/rem0cmp.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/rem/rem0rec.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0ins.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0mysql.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0purge.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0row.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0sel.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0umod.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0undo.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0upd.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/row/row0vers.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/srv/srv0srv.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/trx/trx0rec.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
innobase/trx/trx0undo.c:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
sql/ha_innodb.cc:
  Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.

d2c4b545

trx0xa.h: · 4a9ef43a

unknown authored Dec 02, 2004

  Remove compiler errors from Jan's XA header by commenting the __P macros out


innobase/include/trx0xa.h:
  Remove compiler errors from Jan's XA header by commenting the __P macros out

4a9ef43a

configure.in: · d967118f

unknown authored Dec 02, 2004

  Incremented for next version


configure.in:
  Incremented for next version
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

d967118f

First revision of changes to clean up acinclude and configure.in. Removed all... · 4b2cac56

unknown authored Dec 01, 2004

First revision of changes to clean up acinclude and configure.in. Removed all AC_DEFUN out to separate m4 files, removed rule concerning building the website, and updated SANITY rule with the latest from 1.8.

configure.in:
Removed all defines, and added include files.

4b2cac56

01 Dec, 2004 9 commits

ps_7ndb.result: · 14bc43bd

unknown authored Dec 01, 2004

  fixed ps_7ndb test


mysql-test/r/ps_7ndb.result:
  fixed ps_7ndb test

14bc43bd

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5a13ed41
unknown authored Dec 01, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
5a13ed41
Remove unnecessary copyright header from trx0xa.h · 2a6a1cba
unknown authored Dec 01, 2004
```
innobase/include/trx0xa.h:
  Remove unnecessary copyright header from trx0xa.h.
```
2a6a1cba
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · e32f7a94
unknown authored Dec 01, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
e32f7a94

Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 10a80328

unknown authored Dec 01, 2004

into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged

10a80328

testcase for bug#6871, ndb, replace with collations · e4dbc32f

unknown authored Dec 01, 2004


mysql-test/r/ndb_charset.result:
  testcase for bug#6871
mysql-test/t/ndb_charset.test:
  testcase for bug#6871

e4dbc32f

bug#6871 - ndb · 62e7f1ca

unknown authored Dec 01, 2004

  replace with charsets
  check update of primary key wo/ normalizing
  


ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Make sure tXfrmFlag is false when checking for update of primary key

62e7f1ca

Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 80d5488f
unknown authored Dec 01, 2004
```
into hundin.mysql.fi:/home/jan/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
```
80d5488f

This is a code cleanup patch for X/Open XA. · 843f38fc

unknown authored Dec 01, 2004


BitKeeper/deleted/.del-xa.h~4021d7e61ff515b:
  Delete: innobase/include/xa.h
innobase/include/trx0trx.h:
  Change xa.h to trx0ha.h.
innobase/include/trx0undo.h:
  Split TRX_UNDO_DICT_OPERATION field to two fiels: first contains
  TRX_UNDO_XID_EXISTS flag which is TRUE if log header contains
  X/Open XA XID and the second one contains TRX_UNDO_DICT_TRANS
  flag which is TRUE if the transaction is dictionary transaction.
innobase/trx/trx0trx.c:
  Remove unnecessary and erroneus code from prepare. Add some 
  informative printouts of prepared transactions.
innobase/trx/trx0undo.c:
  Split TRX_UNDO_DICT_OPERATION field to two fields: the first field
  is TRX_UNDO_XID_EXISTS flag which is true if the log header contains
  X/Open XA XID and the second field is TRX_UNDO_DICT_TRANS flag
  which is true if the transaction was a dictionary transaction.
sql/ha_innodb.cc:
  Code cleanup.

843f38fc

30 Nov, 2004 2 commits

strict.result: · 6dd87671

unknown authored Dec 01, 2004

  Add warning line to result so that test passes


mysql-test/r/strict.result:
  Add warning line to result so that test passes

6dd87671

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1e1654fe

unknown authored Nov 30, 2004

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


innobase/include/row0mysql.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

1e1654fe