mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
44649 commits 2781 branches 343 tags 1.6 GiB
Commit graph

44649 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
a80c9cced4 Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes 
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  add single user mode field in table definition
ndb/include/ndb_constants.h:
  new constants for single usermode option of tables
ndb/include/ndbapi/NdbDictionary.hpp:
  add single user mode field in table definition
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  add single user mode field in table definition
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  add single user mode field in table definition
  send this infor to TC
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  add single user mode field in table definition
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  single user table mode on table object
  merge some flags from uint8 to bits
  get allow transaction to also check single user mode
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  single user table mode on table object
  merge some flags from uint8 to bits
  get allow transaction to also check single user mode
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  set single user mode flag on system tables to make them always updatable
ndb/src/ndbapi/NdbDictionary.cpp:
  get/set functions for single user mode on tables
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  get/set functions for single user mode on tables
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  get/set functions for single user mode on tables
ndb/test/src/NDBT_Table.cpp:
  print single user mode
 2007-03-23 13:52:03 +01:00
unknown
c80ac29ee2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1


sql/mysqld.cc:
  merged
 2007-03-23 14:47:51 +02:00
unknown
201af2d8bd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
 2007-03-23 13:10:58 +01:00
unknown
a79e08a6e1 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-23 15:51:21 +04:00
unknown
6e1f446ae1 move thr_client_alarm initialization to mysqld.cc 
(in thr_alarm.cc it happened too late).


mysys/thr_alarm.c:
  move thr_client_alarm initialization to mysqld.cc
  (here it happened too late)
sql/mysqld.cc:
  move thr_client_alarm initialization to mysqld.cc
  (in thr_alarm.cc it happened too late).
  moved thr_kill_signal initialization to init_signals()
 2007-03-23 13:38:42 +02:00
unknown
a4b16a27c2 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_class.cc:
  Auto merged
 2007-03-23 11:31:14 +01:00
unknown
8e1d4f7256 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/push-5.0


sql/sql_class.cc:
  Auto merged
 2007-03-23 11:13:15 +01:00
unknown
b2bbfceede Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
 2007-03-23 11:10:27 +01:00
unknown
e0a8161564 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M51/push-5.1


sql/sql_class.cc:
  Auto merged
 2007-03-23 11:05:11 +01:00
unknown
4f5a822947 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1


BUILD/check-cpu:
  Auto merged
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c:
  Auto merged
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
  Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
 2007-03-23 10:57:17 +01:00
unknown
09e4d0279e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug26782
 2007-03-23 10:27:33 +01:00
unknown
ab785bfe5b Bug#26782 - Patch: myisamchk -rq creates .MYI.MYI file on packed MyISAM tables 
After merge fix
In conjunction with the newest 5.1 we always need to
create a real path name to be able to detect already
open tables.
 2007-03-23 10:26:14 +01:00
unknown
f9cf31c4df Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug26996
 2007-03-23 08:28:21 +01:00
unknown
9fb4f3cda8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
 2007-03-23 08:20:36 +01:00
unknown
6f17f42c59 Raise version number after cloning 5.1.17-beta 2007-03-23 07:27:46 +01:00
unknown
49383e87c6 fixes to make embedded-server test working 
mysql-test/r/view.result:
  result fixed
mysql-test/r/view_grant.result:
  result fixed
mysql-test/t/query_cache_sql_prepare.test:
  test fixed
mysql-test/t/view.test:
  moved to view_grant
mysql-test/t/view_grant.test:
  moved here from view.test
 2007-03-23 10:16:30 +04:00
unknown
65401f9197 WL#3704 mgmapi timeouts: fix compile warning 
storage/ndb/src/mgmapi/mgmapi.cpp:
  fix compile warning - signed and unsigned comparison
 2007-03-23 15:25:58 +11:00
unknown
cea1cf3251 Merge linux.site:/home/omer/source/bld50_0321 
into  linux.site:/home/omer/source/bld51_0322


mysql-test/mysql-test-run.pl:
  Auto merged
 2007-03-22 14:49:25 -07:00
unknown
b4efce0cde merging 2007-03-23 01:46:02 +04:00
unknown
7bc013444a Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


sql/sql_view.cc:
  Auto merged
 2007-03-23 01:05:45 +04:00
unknown
3aa9cea32f merging 2007-03-23 01:04:31 +04:00
unknown
bbcc4bb038 Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  linux.site:/home/omer/source/bld50_0321
 2007-03-22 13:49:47 -07:00
unknown
cc4a0bc4ea Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-bug26996


heap/hp_write.c:
  Auto merged
 2007-03-22 21:34:31 +01:00
unknown
eebba6a2c4 After merge fix 2007-03-22 21:28:28 +01:00
unknown
3e6787d3b7 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
 2007-03-22 23:15:30 +03:00
unknown
842eaa44e5 sql_view.cc: 
Post-fix for bug#26813.


sql/sql_view.cc:
  Post-fix for bug#26813.
 2007-03-22 23:13:40 +03:00
unknown
646b2cbb8f Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/sql_view.cc:
  Auto merged
 2007-03-23 00:09:12 +04:00
unknown
3206447b02 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-23 00:04:47 +04:00
unknown
2c5395eedb Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


mysql-test/r/insert_select.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
mysql-test/r/create.result:
  merging
mysql-test/r/temp_table.result:
  SCCS merged
mysql-test/r/type_float.result:
  merging
mysql-test/r/union.result:
  merging
mysql-test/t/temp_table.test:
  merging
 2007-03-22 23:59:20 +04:00
unknown
b8c101df1a Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-22 23:54:47 +04:00
unknown
3a222d57ad Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


sql/item_cmpfunc.cc:
  Auto merged
 2007-03-22 23:51:09 +04:00
unknown
45b556666f Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
 2007-03-22 23:50:33 +04:00
unknown
1cc700a741 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


sql/item_cmpfunc.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2007-03-22 23:49:44 +04:00
unknown
96793a9698 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


sql/item_cmpfunc.cc:
  Auto merged
 2007-03-22 23:48:39 +04:00
unknown
55f991c24d Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt
 2007-03-22 23:45:37 +04:00
unknown
9558c66c2e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
 2007-03-22 22:15:21 +03:00
unknown
9b774e8f8d Bug#26813: The SUPER privilege is wrongly required to alter a view created by 
another user.

When the DEFINER clause isn't specified in the ALTER statement then it's loaded
from the view definition. If the definer differs from the current user then
the error is thrown because only a super-user can set other users as a definers.

Now if the DEFINER clause is omitted in the ALTER VIEW statement then the
definer from the original view is used without check.


mysql-test/t/view_grant.test:
  Added a test case for the bug#27006: The SUPER privilege is wrongly required
  to alter a view created by another user.
mysql-test/r/view_grant.result:
  Added a test case for the bug#27006: The SUPER privilege is wrongly required
  to alter a view created by another user.
sql/sql_view.cc:
  Bug#26813: The SUPER privilege is wrongly required to alter a view created by
  another user.
  Now if the DEFINER clause is omitted in the ALTER VIEW statement then the
  definer from the original view is used without check.
 2007-03-22 22:05:19 +03:00
unknown
42d74b2ace Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BitKeeper/deleted/.del-fill_func_tables.sh:
  Auto merged
BitKeeper/deleted/.del-fill_help_tables.sh:
  Auto merged
 2007-03-22 19:44:14 +01:00
unknown
716d23a7f3 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


BitKeeper/deleted/.del-fill_func_tables.sh:
  Auto merged
BitKeeper/deleted/.del-fill_help_tables.sh:
  Auto merged
 2007-03-22 19:43:41 +01:00
unknown
4b4700f32f .del-fill_func_tables.sh: 
Delete: scripts/fill_func_tables.sh
.del-fill_help_tables.sh:
  Delete: scripts/fill_help_tables.sh
.del-internals.texi:
  Delete: Docs/internals.texi


BitKeeper/deleted/.del-internals.texi:
  Delete: Docs/internals.texi
BitKeeper/deleted/.del-fill_func_tables.sh:
  Delete: scripts/fill_func_tables.sh
BitKeeper/deleted/.del-fill_help_tables.sh:
  Delete: scripts/fill_help_tables.sh
 2007-03-22 19:43:15 +01:00
unknown
4ae4bb37d4 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BitKeeper/deleted/.del-algor.eps~1a57aff065918206:
  Auto merged
BitKeeper/deleted/.del-dbi.eps~7b1032f98de7736d:
  Auto merged
BitKeeper/deleted/.del-dubois.eps~f24e09a7fa420436:
  Auto merged
BitKeeper/deleted/.del-ecomm.eps~17833026ebd7656:
  Auto merged
BitKeeper/deleted/.del-in_21.eps~8150d06653dab178:
  Auto merged
BitKeeper/deleted/.del-manual.eps~1c2ebcea50b4840c:
  Auto merged
BitKeeper/deleted/.del-msql.eps~f3801b9d166ae4fc:
  Auto merged
BitKeeper/deleted/.del-prof.eps~1f54d9a56eb2b908:
  Auto merged
BitKeeper/deleted/.del-pthreads.eps~2ca8ff2d1181b2c0:
  Auto merged
BitKeeper/deleted/.del-realmen.eps~cc022325d3cb045:
  Auto merged
BitKeeper/deleted/.del-sql-99.eps~f85c06de7a016c7d:
  Auto merged
BitKeeper/deleted/.del-colspec-fix.pl~6c78d3332330b19e:
  Auto merged
BitKeeper/deleted/.del-docbook-fixup.pl~46cf3bdef147084e:
  Auto merged
BitKeeper/deleted/.del-docbook-prefix.pl~876c7d33c68c224a:
  Auto merged
BitKeeper/deleted/.del-docbook-split~be931c3922898d0:
  Auto merged
BitKeeper/deleted/.del-make-docbook~ccac1eb717e92ac9:
  Auto merged
BitKeeper/deleted/.del-make-makefile~39fd454b487126e8:
  Auto merged
BitKeeper/deleted/.del-test-make-manual-de~33cad2886311b8a:
  Auto merged
BitKeeper/deleted/.del-test-make-manual~5da458f958a424ec:
  Auto merged
BitKeeper/deleted/.del-xwf~76b97805d9146b80:
  Auto merged
BitKeeper/deleted/.del-.cvsignore~250f630140b90042:
  Auto merged
BitKeeper/deleted/.del-Tutorial-MySQL-final.txt~6e5b88fe4217504d:
  Auto merged
BitKeeper/deleted/.del-algor.gif~72c40c3bad198f2f:
  Auto merged
BitKeeper/deleted/.del-algor.txt~37d2b5c1290e3cfa:
  Auto merged
BitKeeper/deleted/.del-bk.txt~ffd510fa9531f87c:
  Auto merged
BitKeeper/deleted/.del-dubois.gif~e02d361b13b1c4a4:
  Auto merged
BitKeeper/deleted/.del-dubois.txt~998581cf9040fcc:
  Auto merged
BitKeeper/deleted/.del-ecomm.gif~f9bce6949b171613:
  Auto merged
BitKeeper/deleted/.del-ecomm.txt~27494674104ee9db:
  Auto merged
BitKeeper/deleted/.del-in_21.gif~4a0b14f6d76458a9:
  Auto merged
BitKeeper/deleted/.del-in_21.txt~448fb4b3d8c0b34e:
  Auto merged
BitKeeper/deleted/.del-manual.gif~657cf08119b1b3fc:
  Auto merged
BitKeeper/deleted/.del-manual.txt~4702af61ea5e3c29:
  Auto merged
BitKeeper/deleted/.del-msql.gif~72ea7c6d307b9108:
  Auto merged
BitKeeper/deleted/.del-msql.txt~235ae568824f4073:
  Auto merged
BitKeeper/deleted/.del-mysql-01.gif~6f3f2e474b834ac6:
  Auto merged
BitKeeper/deleted/.del-mysql-02.gif~5e03e2ffa6bd060f:
  Auto merged
BitKeeper/deleted/.del-mysql-03.gif~a510e3599346cd5f:
  Auto merged
BitKeeper/deleted/.del-mysql-04.gif~6c3fdc91da64574:
  Auto merged
BitKeeper/deleted/.del-mysql-05.gif~230c28315136655:
  Auto merged
BitKeeper/deleted/.del-mysql-06.gif~8bb16461fd45634e:
  Auto merged
BitKeeper/deleted/.del-dbi.gif~8f6861147437298b:
  Auto merged
BitKeeper/deleted/.del-dbi.txt~f5cf3fe321168fd5:
  Auto merged
BitKeeper/deleted/.del-mysql-07.gif~b86f918998a2114e:
  Auto merged
BitKeeper/deleted/.del-mysql-08.gif~50fb4d886f82e8bc:
  Auto merged
BitKeeper/deleted/.del-mysql-09.gif~17604ce9d92cd94a:
  Auto merged
BitKeeper/deleted/.del-mysql-10.gif~a8b5306c4d911f8e:
  Auto merged
BitKeeper/deleted/.del-mysql-11.gif~8495404458978524:
  Auto merged
BitKeeper/deleted/.del-mysql-12.gif~18d47c1ad5aef481:
  Auto merged
BitKeeper/deleted/.del-mysql-13.gif~1ad2eedf58da3aaa:
  Auto merged
BitKeeper/deleted/.del-mysql-14.gif~a11e7df8653ad1b1:
  Auto merged
BitKeeper/deleted/.del-mysql-15.gif~64c998fdd6fc1ae1:
  Auto merged
BitKeeper/deleted/.del-mysql-16.gif~6a6c86de2f85f0f5:
  Auto merged
BitKeeper/deleted/.del-mysql-17.gif~b07962578d0952b1:
  Auto merged
BitKeeper/deleted/.del-mysql-compatible.jpg~56ecc684688a7382:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-01.gif~d27d4f0c1a2a6da9:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-02.gif~476224d724007343:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-03.gif~470dd9c9a8bd55fc:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-04.gif~14f429c87c0c718:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-05.gif~e63e7f003b77ad95:
  Auto merged
BitKeeper/deleted/.del-mysql_anim-06.gif~d9cffaf35d9d4719:
  Auto merged
BitKeeper/deleted/.del-prof.gif~2fa8ed201d9d05fe:
  Auto merged
BitKeeper/deleted/.del-prof.txt~9fc04ec3e5ce8361:
  Auto merged
BitKeeper/deleted/.del-pthreads.gif~2d9460dec2577859:
  Auto merged
BitKeeper/deleted/.del-pthreads.txt~fc9e17d021335a39:
  Auto merged
BitKeeper/deleted/.del-realmen.gif~86113e3b1fcbd597:
  Auto merged
BitKeeper/deleted/.del-realmen.txt~81c30565a8f06539:
  Auto merged
BitKeeper/deleted/.del-sql-99.gif~df369376884a5689:
  Auto merged
BitKeeper/deleted/.del-sql-99.txt~eff316adac3dd5b8:
  Auto merged
BitKeeper/deleted/.del-trivial-makeinfo-4.0c.patch~40d336454ecf98db:
  Auto merged
 2007-03-22 19:42:20 +01:00
unknown
693f66bdbb Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


BitKeeper/deleted/.del-colspec-fix.pl:
  Auto merged
BitKeeper/deleted/.del-docbook-fixup.pl:
  Auto merged
BitKeeper/deleted/.del-docbook-prefix.pl:
  Auto merged
BitKeeper/deleted/.del-docbook-split:
  Auto merged
BitKeeper/deleted/.del-make-docbook:
  Auto merged
BitKeeper/deleted/.del-make-makefile:
  Auto merged
BitKeeper/deleted/.del-test-make-manual-de:
  Auto merged
BitKeeper/deleted/.del-test-make-manual:
  Auto merged
BitKeeper/deleted/.del-xwf:
  Auto merged
 2007-03-22 19:39:54 +01:00
unknown
d3125d0a06 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build


BitKeeper/deleted/.del-net_doc.txt:
  Auto merged
 2007-03-22 19:39:23 +01:00
unknown
84536ba9e4 Deleted directories 
Docs/Books/
  Docs/MySQL-logos/
Deleted files
  Docs/Tutorial-MySQL-final.txt
  Docs/bk.txt
  Docs/Support/.cvsignore
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/trivial-makeinfo-4.0c.patch
  Docs/Support/xwf
Deleted file now in internals main text
  Docs/my_sys.txt
Deleted file now in internals svn tree
  Docs/net_doc.txt
Removed obsolete entries
  Docs/.cvsignore
Added note that info is obsolete
  Docs/linuxthreads.txt


BitKeeper/deleted/.del-colspec-fix.pl:
  Delete: Docs/Support/colspec-fix.pl
BitKeeper/deleted/.del-docbook-fixup.pl:
  Delete: Docs/Support/docbook-fixup.pl
BitKeeper/deleted/.del-docbook-prefix.pl:
  Delete: Docs/Support/docbook-prefix.pl
BitKeeper/deleted/.del-docbook-split:
  Delete: Docs/Support/docbook-split
BitKeeper/deleted/.del-make-docbook:
  Delete: Docs/Support/make-docbook
BitKeeper/deleted/.del-make-makefile:
  Delete: Docs/Support/make-makefile
BitKeeper/deleted/.del-test-make-manual-de:
  Delete: Docs/Support/test-make-manual-de
BitKeeper/deleted/.del-test-make-manual:
  Delete: Docs/Support/test-make-manual
BitKeeper/deleted/.del-trivial-makeinfo-4.0c.patch:
  Delete: Docs/Support/trivial-makeinfo-4.0c.patch
BitKeeper/deleted/.del-xwf:
  Delete: Docs/Support/xwf
BitKeeper/deleted/.del-algor.eps~1a57aff065918206:
  Delete: Docs/Books/algor.eps
BitKeeper/deleted/.del-algor.gif:
  Delete: Docs/Books/algor.gif
BitKeeper/deleted/.del-algor.txt:
  Delete: Docs/Books/algor.txt
BitKeeper/deleted/.del-dbi.eps~7b1032f98de7736d:
  Delete: Docs/Books/dbi.eps
BitKeeper/deleted/.del-dbi.gif:
  Delete: Docs/Books/dbi.gif
BitKeeper/deleted/.del-dbi.txt:
  Delete: Docs/Books/dbi.txt
BitKeeper/deleted/.del-dubois.eps~f24e09a7fa420436:
  Delete: Docs/Books/dubois.eps
BitKeeper/deleted/.del-dubois.gif:
  Delete: Docs/Books/dubois.gif
BitKeeper/deleted/.del-dubois.txt:
  Delete: Docs/Books/dubois.txt
BitKeeper/deleted/.del-ecomm.eps~17833026ebd7656:
  Delete: Docs/Books/ecomm.eps
BitKeeper/deleted/.del-ecomm.gif:
  Delete: Docs/Books/ecomm.gif
BitKeeper/deleted/.del-ecomm.txt:
  Delete: Docs/Books/ecomm.txt
BitKeeper/deleted/.del-in_21.eps~8150d06653dab178:
  Delete: Docs/Books/in_21.eps
BitKeeper/deleted/.del-in_21.gif:
  Delete: Docs/Books/in_21.gif
BitKeeper/deleted/.del-in_21.txt:
  Delete: Docs/Books/in_21.txt
BitKeeper/deleted/.del-manual.eps~1c2ebcea50b4840c:
  Delete: Docs/Books/manual.eps
BitKeeper/deleted/.del-manual.gif:
  Delete: Docs/Books/manual.gif
BitKeeper/deleted/.del-manual.txt:
  Delete: Docs/Books/manual.txt
BitKeeper/deleted/.del-msql.eps~f3801b9d166ae4fc:
  Delete: Docs/Books/msql.eps
BitKeeper/deleted/.del-msql.gif:
  Delete: Docs/Books/msql.gif
BitKeeper/deleted/.del-msql.txt:
  Delete: Docs/Books/msql.txt
BitKeeper/deleted/.del-prof.eps~1f54d9a56eb2b908:
  Delete: Docs/Books/prof.eps
BitKeeper/deleted/.del-prof.gif:
  Delete: Docs/Books/prof.gif
BitKeeper/deleted/.del-prof.txt:
  Delete: Docs/Books/prof.txt
BitKeeper/deleted/.del-pthreads.eps~2ca8ff2d1181b2c0:
  Delete: Docs/Books/pthreads.eps
BitKeeper/deleted/.del-pthreads.gif:
  Delete: Docs/Books/pthreads.gif
BitKeeper/deleted/.del-pthreads.txt:
  Delete: Docs/Books/pthreads.txt
BitKeeper/deleted/.del-realmen.eps~cc022325d3cb045:
  Delete: Docs/Books/realmen.eps
BitKeeper/deleted/.del-realmen.gif:
  Delete: Docs/Books/realmen.gif
BitKeeper/deleted/.del-realmen.txt:
  Delete: Docs/Books/realmen.txt
BitKeeper/deleted/.del-sql-99.eps~f85c06de7a016c7d:
  Delete: Docs/Books/sql-99.eps
BitKeeper/deleted/.del-sql-99.gif:
  Delete: Docs/Books/sql-99.gif
BitKeeper/deleted/.del-sql-99.txt:
  Delete: Docs/Books/sql-99.txt
BitKeeper/deleted/.del-mysql-01.gif:
  Delete: Docs/MySQL-logos/mysql-01.gif
BitKeeper/deleted/.del-mysql-02.gif:
  Delete: Docs/MySQL-logos/mysql-02.gif
BitKeeper/deleted/.del-mysql-03.gif:
  Delete: Docs/MySQL-logos/mysql-03.gif
BitKeeper/deleted/.del-mysql-04.gif:
  Delete: Docs/MySQL-logos/mysql-04.gif
BitKeeper/deleted/.del-mysql-05.gif:
  Delete: Docs/MySQL-logos/mysql-05.gif
BitKeeper/deleted/.del-mysql-06.gif:
  Delete: Docs/MySQL-logos/mysql-06.gif
BitKeeper/deleted/.del-mysql-07.gif:
  Delete: Docs/MySQL-logos/mysql-07.gif
BitKeeper/deleted/.del-mysql-08.gif:
  Delete: Docs/MySQL-logos/mysql-08.gif
BitKeeper/deleted/.del-mysql-09.gif:
  Delete: Docs/MySQL-logos/mysql-09.gif
BitKeeper/deleted/.del-mysql-10.gif:
  Delete: Docs/MySQL-logos/mysql-10.gif
BitKeeper/deleted/.del-mysql-11.gif:
  Delete: Docs/MySQL-logos/mysql-11.gif
BitKeeper/deleted/.del-mysql-12.gif:
  Delete: Docs/MySQL-logos/mysql-12.gif
BitKeeper/deleted/.del-mysql-13.gif:
  Delete: Docs/MySQL-logos/mysql-13.gif
BitKeeper/deleted/.del-mysql-14.gif:
  Delete: Docs/MySQL-logos/mysql-14.gif
BitKeeper/deleted/.del-mysql-15.gif:
  Delete: Docs/MySQL-logos/mysql-15.gif
BitKeeper/deleted/.del-mysql-16.gif:
  Delete: Docs/MySQL-logos/mysql-16.gif
BitKeeper/deleted/.del-mysql-17.gif:
  Delete: Docs/MySQL-logos/mysql-17.gif
BitKeeper/deleted/.del-mysql-compatible.jpg:
  Delete: Docs/MySQL-logos/mysql-compatible.jpg
BitKeeper/deleted/.del-mysql_anim-01.gif:
  Delete: Docs/MySQL-logos/mysql_anim-01.gif
BitKeeper/deleted/.del-mysql_anim-02.gif:
  Delete: Docs/MySQL-logos/mysql_anim-02.gif
BitKeeper/deleted/.del-mysql_anim-03.gif:
  Delete: Docs/MySQL-logos/mysql_anim-03.gif
BitKeeper/deleted/.del-mysql_anim-04.gif:
  Delete: Docs/MySQL-logos/mysql_anim-04.gif
BitKeeper/deleted/.del-mysql_anim-05.gif:
  Delete: Docs/MySQL-logos/mysql_anim-05.gif
BitKeeper/deleted/.del-mysql_anim-06.gif:
  Delete: Docs/MySQL-logos/mysql_anim-06.gif
BitKeeper/deleted/.del-Tutorial-MySQL-final.txt:
  Delete: Docs/Tutorial-MySQL-final.txt
BitKeeper/deleted/.del-net_doc.txt:
  Delete: Docs/net_doc.txt
BitKeeper/deleted/.del-my_sys.txt:
  Delete: Docs/my_sys.txt
BitKeeper/deleted/.del-bk.txt:
  Delete: Docs/bk.txt
BitKeeper/deleted/.del-.cvsignore:
  Delete: Docs/Support/.cvsignore
Docs/.cvsignore:
  Removed obsolete entries
Docs/linuxthreads.txt:
  Added note info is obsolete
 2007-03-22 19:38:56 +01:00
unknown
0b7ba9c2dc Merge siva.hindu.god:/home/tsmith/m/bk/maint/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Manual merge (res.waitNodesStartPhase -> NdbSleep_SecSleep)
 2007-03-22 11:48:49 -06:00
unknown
dc41a5ce46 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B26207-5.0-opt


sql/sql_select.h:
  Auto merged
 2007-03-22 18:49:47 +02:00
unknown
0a48cd93b4 Bug #26207: When making the key image to use 
in index search MySQL was not explicitly
 suppressing warnings. And if the context 
 happens to enable warnings (e.g. INSERT ..
 SELECT) the warnings resulting from converting 
 the data the key is compared to are 
 reported to the client.
 Fixed by suppressing warnings when converting
 the data to the same type as the key parts.


mysql-test/r/insert_select.result:
  Bug #26207: test case
mysql-test/t/insert_select.test:
  Bug #26207: test case
sql/sql_select.h:
  Bug #26207: supress warnings when converting
    data of the same type to key buffer format.
 2007-03-22 18:44:16 +02:00
unknown
0a656e0835 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BUILD/check-cpu:
  Auto merged
extra/yassl/taocrypt/benchmark/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~14:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
 2007-03-22 16:58:46 +01:00
unknown
d5414e9f06 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug26996
 2007-03-22 16:57:07 +01:00
unknown
ff7b01d8d4 Makefile.am: 
Don't install benchmark executable
CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO


extra/yassl/taocrypt/benchmark/Makefile.am:
  Don't install benchmark executable
CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO
mysys/CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO
 2007-03-22 16:53:37 +01:00