Commits · 252218e954728d3d0046e2e599b6396549bb2092 · nexedi / MariaDB

03 Jan, 2005 13 commits

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

unknown authored Jan 03, 2005

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


ndb/include/ndb_global.h.in:
  Auto merged
ndb/include/ndb_types.h:
  Auto merged

252218e9

bug#7626 - post review version · dc1b538f

unknown authored Jan 03, 2005


ndb/include/ndb_global.h.in:
  move types into ndb_global.h.in
  Check sizeof of Uint8, Uint32 & Uint64
ndb/include/ndb_types.h:
  move types into ndb_global.h.in

dc1b538f

Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 0b444acb
unknown authored Jan 03, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0


ndb/include/ndb_types.h:
  Auto merged
```
0b444acb
bug#7626 - ndb UintPtr handling · 530389e6
unknown authored Jan 03, 2005
```
ndb/include/ndb_types.h:
  redo UintPtr handling
```
530389e6
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 08f1745d
unknown authored Jan 03, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
08f1745d

bug#7626 - ndb - non portable uint_ptr · 5468ac12

unknown authored Jan 03, 2005


ndb/include/ndb_types.h:
  redo UintPtr handling using SIZEOF_CHARP
ndb/test/tools/Makefile.am:
  remove unused defines

5468ac12

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b7b3275b
unknown authored Jan 03, 2005
```
into mysql.com:/home/my/mysql-5.0
```
b7b3275b

Remove clear_insert_values() because it was far from trivial to handle the cleanup in all cases · b76b2ba6

unknown authored Jan 03, 2005

(Old code failed for INSERT ... ON DUPLICATE with prepared statements) 
Instead, always reset table->insert_values on open.


mysql-test/t/trigger.test:
  Fix test for --ps-protocol
sql/sql_base.cc:
  Clear insert_values on open_table
sql/sql_insert.cc:
  Remove clear_insert_values()
sql/sql_parse.cc:
  Remove clear_insert_values()
sql/sql_prepare.cc:
  Remove clear_insert_values()
sql/table.cc:
  Remove clear_insert_values()
sql/table.h:
  Remove clear_insert_values()

b76b2ba6

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · b9916c2d
unknown authored Jan 03, 2005
```
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
```
b9916c2d
Fixed failed merge · 87f96833
unknown authored Jan 03, 2005

87f96833

configure.in: · f834b126

unknown authored Jan 03, 2005

  updated ndb version number


configure.in:
  updated ndb version number

f834b126

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 191d813b
unknown authored Jan 03, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
191d813b
Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browser · dab56c02
unknown authored Jan 03, 2005
```
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.h:
  Auto merged
```
dab56c02

02 Jan, 2005 2 commits

Streamlined code for trim, ltrim and rtrim · 549c5ea1

unknown authored Jan 02, 2005

Portability fixes


mysql-test/r/func_str.result:
  Added test for ltrim and rtrim with NULL
mysql-test/t/func_str.test:
  Added test for ltrim and rtrim with NULL
sql/item_strfunc.cc:
  Streamlined code for trim, ltrim and rtrim
tests/client_test.c:
  Fixed wrong usage of %lld (not portable)

549c5ea1

Fix the tests: allow result of concat('a', -0.0) be both 'a0.0' and 'a-0.0' · 9cec87e6

unknown authored Jan 02, 2005

(this depends on s[n]printf implementation and differs from system to system)


mysql-test/t/func_concat.test:
  Allow result of concat('a', -0.0) be both 'a0.0' and 'a-0.0'

9cec87e6

01 Jan, 2005 4 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f46770dc

unknown authored Jan 01, 2005

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged

f46770dc

make_win_src_distribution.sh, make_binary_distribution.sh, mysql-test-run.sh: · 6d8ba3c0

unknown authored Jan 01, 2005

  Removed references to ISAM and MERGE


mysql-test/mysql-test-run.sh:
  Removed references to ISAM and MERGE
scripts/make_binary_distribution.sh:
  Removed references to ISAM and MERGE
scripts/make_win_src_distribution.sh:
  Removed references to ISAM and MERGE

6d8ba3c0

Many files: · 2aca61e4

unknown authored Jan 01, 2005

  Removed references to ISAM and MERGE


netware/BUILD/compile-linux-tools:
  Removed references to ISAM and MERGE
netware/Makefile.am:
  Removed references to ISAM and MERGE
os2/ChangeLog.os2:
  Removed references to ISAM and MERGE
os2/MySQL-Source.icc:
  Removed references to ISAM and MERGE
os2/MySQL-Sql.icc:
  Removed references to ISAM and MERGE
os2/MySQL-Util.icc:
  Removed references to ISAM and MERGE
support-files/debian/gomi:
  Removed references to ISAM and MERGE

2aca61e4

prepare, winmysqladmin.cpp, mysqldmax.dsp, mysqld.dsp, mysql.dsw: · b56494d8

unknown authored Jan 01, 2005

  Removed references to ISAM and MERGE


VC++Files/mysql.dsw:
  Removed referenses to ISAM and MERGE
VC++Files/sql/mysqld.dsp:
  Removed referenses to ISAM and MERGE
VC++Files/sql/mysqldmax.dsp:
  Removed referenses to ISAM and MERGE
VC++Files/winmysqladmin/winmysqladmin.cpp:
  Removed referenses to ISAM and MERGE
VC++Files/prepare:
  Removed referenses to ISAM and MERGE

b56494d8

31 Dec, 2004 21 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e0a58730

unknown authored Dec 31, 2004

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/user_limits.result:
  Auto merged
mysql-test/t/user_limits.test:
  Auto merged

e0a58730

post-merge · 4dc5b3ac
unknown authored Dec 31, 2004

4dc5b3ac

manually merged · 032788c2

unknown authored Dec 31, 2004


configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/fil0fil.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/trx0trx.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/grant_cache.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged

032788c2

row0upd.c: · 28911df2

unknown authored Dec 31, 2004

Manually merge the little InnoDB bug fix from 4.1 to 5.0; Marko can then run tests on the fixed version

innobase/row/row0upd.c:
Manually merge the little InnoDB bug fix from 4.1 to 5.0; Marko can then run tests on the fixed version

28911df2

Make test results independent on who runs them · bfa25302
unknown authored Dec 31, 2004

bfa25302
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 958474f4
unknown authored Dec 31, 2004
```
into mysql.com:/home/psergey/mysql-5.0-debug-31dec
```
958474f4
Remove display of join buffer size, test fails when someone changes the minimum · 981e80ab
unknown authored Dec 31, 2004

981e80ab
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5f7a3554
unknown authored Dec 31, 2004
```
into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
```
5f7a3554

Fix test results to account for difference between release BDB, debug BDB and MyISAM. · 1b683277

unknown authored Dec 31, 2004


mysql-test/t/bdb.test:
  Fix test results to account for difference in results caused by different FP calculation results
  between release BDB and debug BDB

1b683277

Yet another after merge fix. · a34c7878

unknown authored Dec 31, 2004

Now max_user_connections is 36th field in mysql.user table
(two new SP-related privileges were added).

a34c7878

post-merge · 64845029

unknown authored Dec 31, 2004


mysql-test/r/grant2.result:
  new test case
mysql-test/r/variables.result:
  don't fail w/o innodb
mysql-test/t/grant2.test:
  new test case
mysql-test/t/multi_update.test:
  don't fail w/o innodb
mysql-test/t/variables.test:
  don't fail w/o innodb
sql/sql_acl.cc:
  cleanup

64845029

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · af7d5f76
unknown authored Dec 31, 2004
```
into mysql.com:/home/dlenev/src/mysql-5.0-1339
```
af7d5f76
Merge mysql.com:/dbdata/psergey/mysql-5.0-bug7264 · 5e81969b
unknown authored Dec 31, 2004
```
into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
```
5e81969b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 3345c54b
unknown authored Dec 31, 2004
```
into mysql.com:/home/my/mysql-5.0
```
3345c54b

Fix max_key_length and max_unique_length to take into account varchar and null extra lengths · 9b7bbc4a

unknown authored Dec 31, 2004

This fixes a bug found by bdb.test
Fixes a portability issue with bdb tables


mysql-test/include/varchar.inc:
  Fix test to be reproducable
  (Either key v or v_2 could be used here)
mysql-test/r/bdb.result:
  Fix test to be reproducable
  (Either key v or v_2 could be used here)
mysql-test/r/myisam.result:
  Fix test to be reproducable
  (Either key v or v_2 could be used here)
sql/table.cc:
  Fix max_key_length and max_unique_length to take into account varchar and null extra lengths
  This fixes a bug found by bdb.test

9b7bbc4a

Manual merge. · b0156f1f

unknown authored Dec 31, 2004


client/mysqltest.c:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

b0156f1f

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 064c2890
unknown authored Dec 31, 2004
```
into mysql.com:/Users/mikron/mysql-5.0


ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
```
064c2890
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · f8034fb9
unknown authored Dec 31, 2004
```
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
```
f8034fb9
merge · d11b52cd
unknown authored Dec 31, 2004

d11b52cd

Merge bk-internal:/home/bk/mysql-5.0 · 01e04e13

unknown authored Dec 31, 2004

into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

01e04e13

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · c8dc26b4

unknown authored Dec 31, 2004

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


BitKeeper/etc/logging_ok:
  auto-union
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/common/util/Makefile.am:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged
ndb/test/tools/Makefile.am:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged

c8dc26b4