Commits · 95051ce69864be83bc9440b476c559634f7ed38c · nexedi / MariaDB

06 Apr, 2006 1 commit
- Bug#17112 - SHOW PLUGIN should be SHOW PLUGINS · 95051ce6
  unknown authored Apr 06, 2006
```
sql/lex.h:
  SHOW PLUGINS - BUG#17112
sql/sql_yacc.yy:
  SHOW PLUGINS - BUG#17112
```
  95051ce6
05 Apr, 2006 11 commits

unknown authored Apr 05, 2006

  Recreating ctype-extra.c with additional 5.1
  charset, and with additional missing 5.0 charset
  due to bug with too small buffer MAX_BUF.


strings/ctype-extra.c:
  Recreating ctype-extra.c with additional 5.1
  charset, and with additional missing 5.0 charset
  due to bug with too small buffer MAX_BUF.

0d213bca

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · dfac2112
unknown authored Apr 05, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
dfac2112

Merge mysql.com:/usr/home/bar/mysql-5.0 · 8f77e355

unknown authored Apr 05, 2006

into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/share/charsets/Index.xml:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

8f77e355

Remove dead code from BUILD/ scripts: $debug_extra_warnings is · 6a5964be

unknown authored Apr 05, 2006

never defined.
It was used at some point to add -Wuninitialized to debug flags, 
but not any more. If there is still need to add -Wunitialized,
it can be added directly to $global_warnings.


BUILD/compile-amd64-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-amd64-debug-max:
  Remove a no-op.
BUILD/compile-darwin-mwcc:
  Remove a no-op.
BUILD/compile-pentium-debug-max-no-embedded:
  Remove a no-op.
BUILD/compile-pentium-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-pentium-debug-max:
  Remove a no-op.
BUILD/compile-pentium-debug-openssl:
  Remove a no-op.
BUILD/compile-pentium-debug-yassl:
  Remove a no-op.
BUILD/compile-pentium-debug:
  Remove a no-op.
BUILD/compile-pentium-mysqlfs-debug:
  Remove a no-op.
BUILD/compile-pentium-valgrind-max:
  Remove a no-op.
BUILD/compile-pentium64-debug-max:
  Remove a no-op.
BUILD/compile-pentium64-debug:
  Remove a no-op.
BUILD/compile-pentium64-valgrind-max:
  Remove a no-op.
BUILD/compile-ppc-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-ppc-debug-max:
  Remove a no-op.
BUILD/compile-ppc-debug:
  Remove a no-op.

6a5964be

Merge mysql.com:/home/bkroot/mysql-5.1-new · b2b98c44
unknown authored Apr 05, 2006
```
into  mysql.com:/home/bk/b18436-mysql-5.1-new
```
b2b98c44
Merge mysql.com:/home/bkroot/mysql-5.1-new · 3b0336bb
unknown authored Apr 05, 2006
```
into  mysql.com:/home/bk/b18436-mysql-5.1-new
```
3b0336bb

Remove dead code from BUILD/ scripts. · a5b16e49

unknown authored Apr 05, 2006


BUILD/SETUP.sh:
  Remove dead options.
BUILD/compile-amd64-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-amd64-debug-max:
  Remove dead options.
BUILD/compile-amd64-max:
  Remove dead options.
BUILD/compile-darwin-mwcc:
  Remove dead options.
BUILD/compile-pentium-debug-max-no-embedded:
  Remove dead options.
BUILD/compile-pentium-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-pentium-debug-max:
  Remove dead options.
BUILD/compile-pentium-icc-valgrind-max:
  Remove dead options.
BUILD/compile-pentium-max:
  Remove dead options.
BUILD/compile-pentium-valgrind-max:
  Remove dead options. There is no ISAM any more.
BUILD/compile-pentium64-debug-max:
  Remove dead options.
BUILD/compile-pentium64-valgrind-max:
  Remove dead options. There is no ISAM any more.
BUILD/compile-ppc-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-ppc-debug-max:
  Remove dead options.
BUILD/compile-ppc-max:
  Remove dead options.

a5b16e49

Makefile.am: · 8c2ef07b

unknown authored Apr 05, 2006

  After merge correction


libmysqld/Makefile.am:
  After merge correction

8c2ef07b

Merge mysql.com:/home/bkroot/mysql-5.1-new · 087a0120
unknown authored Apr 05, 2006
```
into  mysql.com:/home/bk/b18436-mysql-5.1-new
```
087a0120

Merge mysql.com:/Users/kent/mysql/bk/tmp_merge · a25758b5

unknown authored Apr 05, 2006

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


config/ac-macros/yassl.m4:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged

a25758b5

Merge mysql.com:/home/bkroot/mysql-5.1-new · 2b53cc29
unknown authored Apr 05, 2006
```
into  mysql.com:/home/bk/b18436-mysql-5.1-new
```
2b53cc29

04 Apr, 2006 20 commits

Merge · d15b31bf

unknown authored Apr 04, 2006


VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged
VC++Files/mysqldemb/mysqldemb.vcproj:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
VC++Files/storage/bdb/bdb.vcproj:
  Auto merged
VC++Files/storage/innobase/innobase.vcproj:
  Auto merged
config/ac-macros/yassl.m4:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged

d15b31bf

Merge · 9d761b50

unknown authored Apr 04, 2006


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged

9d761b50

Merge mysql.com:/home/bkroot/mysql-5.1-new · a6e17aaf
unknown authored Apr 04, 2006
```
into  mysql.com:/home/bk/b18436-mysql-5.1-new
```
a6e17aaf

Merge mysql.com:/home/timka/mysql/src/5.0-tmp-merge · c0401ed5

unknown authored Apr 04, 2006

into  mysql.com:/home/timka/mysql/src/5.1-merge


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged

c0401ed5

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new · cc254e26
unknown authored Apr 04, 2006
```
into  rurik.mysql.com:/home/igor/mysql-5.1
```
cc254e26
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 24cf42d2
unknown authored Apr 04, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
24cf42d2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · b90637ac
unknown authored Apr 04, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-bug18659-pre
```
b90637ac
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 289c6f83
unknown authored Apr 04, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
289c6f83

After merge fix for Bug#12076 --with-extra-charsets has no effect · c573b966

unknown authored Apr 04, 2006


mysql-test/r/information_schema.result:
  IS_COMPILED is not determenistic
mysql-test/t/information_schema.test:
  IS_COMPILED is not determenistic
strings/conf_to_src.c:
  Adding dumping of extra 5.0 fields
strings/ctype-extra.c:
  Recreating sources according to 5.0 XML files using conf_to_src.

c573b966

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7030ae6b
unknown authored Apr 04, 2006
```
into  rurik.mysql.com:/home/igor/mysql-5.0
```
7030ae6b

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

unknown authored Apr 04, 2006

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

ef835df8

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 65f312aa

unknown authored Apr 04, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


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

65f312aa

Bug #18349 Wrong error message "Array index out of bounds... · b0d896e6
unknown authored Apr 04, 2006

b0d896e6
Bug #18490 cluster: binlog events lost on remote mysqld (asynchronous) · f1e5aa56
unknown authored Apr 04, 2006

f1e5aa56
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f4880ee4
unknown authored Apr 04, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
f4880ee4
Merge rurik.mysql.com:/home/igor/mysql-5.1 · a0575861
unknown authored Apr 03, 2006
```
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
```
a0575861
Merge rurik.mysql.com:/home/igor/mysql-5.0 · 4b58b8c4
unknown authored Apr 03, 2006
```
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
```
4b58b8c4
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · bbc9be75
unknown authored Apr 03, 2006
```
into  rurik.mysql.com:/home/igor/mysql-5.0


sql/item.cc:
  Auto merged
```
bbc9be75

Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 · 566a3c70

unknown authored Apr 03, 2006

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

566a3c70

Post review changes for the fix of bug #16504. · 85ef09b1
unknown authored Apr 03, 2006

85ef09b1

03 Apr, 2006 8 commits

BUG#18659: In get_part_iter_for_interval_via_walking(), when we need to · 8b348cac

unknown authored Apr 04, 2006

obtain partition number, call partition_info->get_part_partition_id() when
the table has subpartitions, and get_partition_id() otherwise. (The bug
was that we were always doing the latter)


mysql-test/r/partition_pruning.result:
  Testcase for BUG#18659
mysql-test/t/partition_pruning.test:
  Testcase for BUG#18659

8b348cac

include example storage engines in max build · 730ae99b
unknown authored Apr 03, 2006

730ae99b

Bug #18596 binlog schema event auto push causes mysqld errors · 00602717

unknown authored Apr 03, 2006

- move slock bitmask to separate hash list, object living only during query


sql/ha_ndbcluster.h:
  Bug #18596 binlog schema event auto push causes mysqld errors

00602717

.libs is no longer used when compiling netware · 45bad602
unknown authored Apr 03, 2006
```
netware/BUILD/compile-linux-tools:
  .libs/sql is no longer used when compiling netware
```
45bad602
Merge mysql.com:/home/bkroot/mysql-5.1-new · a2a7f768
unknown authored Apr 03, 2006
```
into  mysql.com:/home/bk/b18436-mysql-5.1-new
```
a2a7f768

Merge mysql.com:/usr/home/bar/mysql-4.1.12076 · b3f83d0b

unknown authored Apr 03, 2006

into  mysql.com:/usr/home/bar/mysql-5.0


sql/share/charsets/Index.xml:
  Auto merged
strings/ctype-extra.c:
  SCCS merged

b3f83d0b

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · df6288ec
unknown authored Apr 03, 2006
```
into  mysql.com:/usr/home/bar/mysql-4.1.12076
```
df6288ec

yassl link problem fixed · aa53b26d

unknown authored Apr 03, 2006


config/ac-macros/yassl.m4:
  typo
libmysql/Makefile.am:
  move common code to Makefile.shared
libmysql/Makefile.shared:
  move common code to Makefile.shared
libmysql_r/Makefile.am:
  move common code to Makefile.shared

aa53b26d