Commits · d72ffb4d7d52ca0a21aeb1d40967d098890b2183 · nexedi / MariaDB

06 Dec, 2004 3 commits
- Merge mysql.com:/home/jonas/src/mysql-5.0 · d72ffb4d
  unknown authored Dec 06, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  d72ffb4d
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2375d711
  unknown authored Dec 06, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
  2375d711
- Fix for bugs #6955 SHOW PROCEDURE STATUS crashes the server, · 09e3f438
  unknown authored Dec 06, 2004
```
#6950 mysql-nt.exe error when click on sql or database on mysql control center
```
  09e3f438
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

3c8bf4ff

Add general n-bitfields to ndb storage engine · 71b86aaa

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

71b86aaa

04 Dec, 2004 2 commits

Fixing problem with case insitive file systems. · 1b0e281a

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 :)

1b0e281a

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

03 Dec, 2004 12 commits

Merge mysql.com:/home/jonas/src/mysql-5.0 · f2be1707
unknown authored Dec 04, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
f2be1707
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9ad809ac
unknown authored Dec 03, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
9ad809ac

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

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().

ae35057b

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · fa123369
unknown authored Dec 03, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
fa123369
Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 682c239a
unknown authored Dec 03, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
682c239a
ndb - fix in test suite · 518d8a50
unknown authored Dec 03, 2004
```
ndb/test/src/NDBT_Test.cpp:
  clear threads when finished waiting
```
518d8a50

strings/decimal.c · 7acebdbd

unknown authored Dec 03, 2004

    decimal_round(d, -N) bug fixed


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

7acebdbd

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

unknown authored Dec 03, 2004

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


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

ed2b6abe

strings/decimal.c · 85b70875

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

85b70875

ndb - fix abort of scan when in WAIT_AI_SCAN state · 2fe7dcbc

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

2fe7dcbc

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

02 Dec, 2004 9 commits

more decimail bugs fixed · 50c6ea7d
unknown authored Dec 03, 2004

50c6ea7d
syntax error fixed · f94aa767
unknown authored Dec 03, 2004

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

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

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)

f3308504

Undoing change for the moment. · 00878990

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

00878990

Many files: · 0afb38a1

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.

0afb38a1

trx0xa.h: · ac398c42

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

ac398c42

configure.in: · 8ba5709b

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

8ba5709b

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

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.

c7740a86

01 Dec, 2004 9 commits

ps_7ndb.result: · 8e62832b

unknown authored Dec 01, 2004

  fixed ps_7ndb test


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

8e62832b

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3ddb4902
unknown authored Dec 01, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
3ddb4902
Remove unnecessary copyright header from trx0xa.h · 82da0b42
unknown authored Dec 01, 2004
```
innobase/include/trx0xa.h:
  Remove unnecessary copyright header from trx0xa.h.
```
82da0b42
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · c08719b1
unknown authored Dec 01, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0
```
c08719b1

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

unknown authored Dec 01, 2004

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


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

cd468410

testcase for bug#6871, ndb, replace with collations · 3887dd5b

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

3887dd5b

bug#6871 - ndb · 1c5a01e1

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

1c5a01e1

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


sql/ha_innodb.cc:
  Auto merged
```
15c9ed8e

This is a code cleanup patch for X/Open XA. · 6f99f4ef

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.

6f99f4ef

30 Nov, 2004 3 commits

strict.result: · b6e6313e

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

b6e6313e

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

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

cfa57d2b

Merge avenger.(none):/export/brian/mysql/merge/4.1 · 300ac0b8
unknown authored Nov 30, 2004
```
into avenger.(none):/export/brian/mysql/merge/5.0


sql/mysqld.cc:
  Auto merged
```
300ac0b8