Commit graph

34513 commits

Author SHA1 Message Date
unknown
d948704bba one more portability fix
storage/csv/ha_tina.h:
  portability fix
2006-05-30 18:44:26 +04:00
unknown
ba67edc47c fix windows build of CSV
storage/csv/ha_tina.cc:
  portability fix
2006-05-30 10:48:32 +04:00
unknown
780e52ff92 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
2006-05-30 02:53:38 +04:00
unknown
a38acfc284 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap


storage/csv/ha_tina.cc:
  manual merge
2006-05-30 02:35:23 +04:00
unknown
e7515ef7cb Merge lmy004.:/work/mysql-5.1-new-vanilla
into lmy004.:/work/mysql-5.1-runtime
2006-05-29 20:23:44 +02:00
unknown
745a579d5d Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/information_schema.test:
  Merge
mysql-test/t/wait_timeout.test:
  Merge
sql/mysqld.cc:
  Merge
sql/slave.cc:
  Null merge
sql/sp_head.cc:
  Merge
2006-05-29 15:43:00 +02:00
unknown
f41db8b01f Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/mysqld.cc:
  Auto merged
2006-05-29 15:32:52 +02:00
unknown
f32d0ec6bf Merge lmy004.:/work/mysql-5.1-new-vanilla
into lmy004.:/work/mysql-5.1-runtime


sql/event_scheduler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2006-05-29 15:16:07 +02:00
unknown
606abf255d add missing events_grant test 2006-05-29 13:16:29 +02:00
unknown
4f295835de local variable interval to interval_tmp because it hides
Event_timed::interval
2006-05-29 13:12:34 +02:00
unknown
bdda011675 Fix for bug #17394 - Events namespace is wrong
mysql-test/lib/init_db.sql:
  remove definer from PK
mysql-test/r/events.result:
  update results
mysql-test/r/system_mysql_db.result:
  update results
mysql-test/t/events.test:
  remove I_S.EVENTS test and move it to events_grant.test
scripts/mysql_fix_privilege_tables.sql:
  change table definition
sql/event.cc:
  make events non-user specific (namespace change)
sql/event.h:
  make events non-user specific (namespace change)
sql/event_priv.h:
  make events non-user specific (namespace change)
sql/event_scheduler.cc:
  make events non-user specific (namespace change)
sql/event_timed.cc:
  make events non-user specific (namespace change)
sql/sql_parse.cc:
  make events non-user specific (namespace change)
sql/sql_show.cc:
  SHOW EVENTS is available to everyone who has EVENT on specific schema.
  No additional privileges are needed to see others' events.
  - user A has events in db1 and db2
  - user B has events in db1 and db3
  A will see all his events from db1 and db2 as well as B's events
  from db1 but not from db3.
  B will see her events from db1 and db3. In addition B will see
  only A's events from db1 but not db2.
2006-05-29 10:39:45 +02:00
unknown
e05d55de5f Merge vtkachenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  vadima.volia.com:/root/mysql-5.1-new1


sql/sql_class.cc:
  Auto merged
2006-05-27 08:08:03 +03:00
unknown
fed043a852 sql_class.cc, mysql_priv.h:
Added accessor to handler data.


sql/mysql_priv.h:
  Added accessor to handler data.
sql/sql_class.cc:
  Added accessor to handler data.
2006-05-27 08:05:39 +03:00
unknown
6848d07f74 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
2006-05-26 16:12:05 -04:00
unknown
a1955f90fe Set the Windows README file to EOLN_NATIVE so that it doesn't look
horrible when checked out on Windows.


win/README:
  Turn on EOLN_NATIVE flag
2006-05-26 16:09:39 -04:00
unknown
60fab5af5b Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


sql/sql_parse.cc:
  Auto merged
2006-05-26 15:08:24 +02:00
unknown
53949a266f Merge mysql.com:/data0/mysqldev/my/mysql-5.1-release
into  mysql.com:/data0/mysqldev/my/mysql-5.1-new


configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-05-26 13:17:09 +02:00
unknown
88d1085984 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-25 22:37:06 +02:00
unknown
f7f36fc05a Removing ./r/rpl_ndb_dd_partitions.result & ./t/rpl_ndb_dd_partitions.test since NDB only will support key partitions and moving them to the test-extra tree for safe keeping
BitKeeper/deleted/.del-rpl_ndb_dd_partitions.result~9b09a8594e474be5:
  Delete: mysql-test/r/rpl_ndb_dd_partitions.result
BitKeeper/deleted/.del-rpl_ndb_dd_partitions.test~9a3f50999ab31151:
  Delete: mysql-test/t/rpl_ndb_dd_partitions.test
2006-05-25 22:36:03 +02:00
unknown
93be6c2523 ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ] v5.1
sql/ha_ndbcluster.cc:
  compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ]
2006-05-25 20:00:36 +02:00
unknown
20334ba61e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


sql/share/errmsg.txt:
  Auto merged
2006-05-25 17:47:26 +02:00
unknown
2e0f0d2d5c Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-05-25 16:20:36 +02:00
unknown
597ceb3bc0 test fix 2006-05-25 19:20:35 +05:00
unknown
d749d90528 Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-bug14509


mysql-test/r/ndb_basic.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
2006-05-25 16:20:34 +02:00
unknown
644efa51db after merge fix
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/information_schema.test:
  manual merge
2006-05-25 19:20:34 +05:00
unknown
52078846fc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
2006-05-25 10:20:33 -04:00
unknown
2aa3ff8eb9 ndb - bug#14509 v5.1 part 2/2 : handler level
mysql-test/r/ndb_basic.result:
  put auto-incr range under NDB_SHARE until otherwise decided..
  makes auto-incr process-global per table.  each use requires mutex
mysql-test/t/ndb_alter_table.test:
  put auto-incr range under NDB_SHARE until otherwise decided..
  makes auto-incr process-global per table.  each use requires mutex
sql/ha_ndbcluster.cc:
  put auto-incr range under NDB_SHARE until otherwise decided..
  makes auto-incr process-global per table.  each use requires mutex
sql/ha_ndbcluster.h:
  put auto-incr range under NDB_SHARE until otherwise decided..
  makes auto-incr process-global per table.  each use requires mutex
2006-05-25 12:13:47 +02:00
unknown
7583994185 ndb - bug#14509 v5.1 part 1/2 : ndb api level [requires part 2/2]
storage/ndb/src/ndbapi/ndberror.c:
  delete non-sense error 4336
storage/ndb/include/ndbapi/Ndb.hpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/DictCache.cpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/DictCache.hpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/Ndb.cpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  add auto-incr methods which take explicit Ndb::TupleIdRange & argument
  for NDB API programs the range is under local dict cache (as in 5.0)
  the handler level uses its own Ndb objects and ranges
2006-05-25 12:03:02 +02:00
unknown
a7beb30222 The previous patch fixed the csv engine to support dos, linux, and mac line endings. The patch, however, had
a problem when the table only has a single record in it.  This patch corrects that.

ha_tina.cc:
  Fix problem with previous patch when there is only one record in the table


storage/csv/ha_tina.cc:
  Fix problem with previous patch when there is only one record in the table
2006-05-24 15:41:12 -05:00
unknown
5338b25813 sql_select.cc:
After merge fix


sql/sql_select.cc:
  After merge fix
2006-05-25 00:03:35 +04:00
unknown
6b8eccfbdc review fix 2006-05-24 15:01:03 -04:00
unknown
b6553aacc2 manual merge 2006-05-24 13:57:21 -04:00
unknown
dcf8e0fe50 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17455
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304


sql/ha_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
2006-05-24 13:56:23 -04:00
unknown
4280cdc45c Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
into  big_geek.:D:/work/mysql/mysql-5.1-vc71
2006-05-24 12:46:45 -05:00
unknown
c38308dee2 some small fixups
include/config-win.h:
  force time_t to be 32 bit on Visual C++ 2005 or later
sql/net_serv.cc:
  include winsock after my_global so the time_t #define can take effect
storage/csv/ha_tina.cc:
  fix the csv engine so that it supports DOS, Unix, and Mac line endings
2006-05-24 12:43:03 -05:00
unknown
ed55bc9e6a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304


sql/partition_info.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
sql/share/errmsg.txt:
  manual merge
2006-05-24 13:41:04 -04:00
unknown
301c7e0721 BUG#19304: Merge handler not part of partitioned tables
Review fix


sql/partition_info.cc:
  Review fix
2006-05-24 13:35:52 -04:00
unknown
5c398ce055 Manually merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
2006-05-24 20:52:57 +04:00
unknown
ca4340e68b mtr_misc.pl:
Fix mtr_exe_exists to work on win32


mysql-test/lib/mtr_misc.pl:
  Fix mtr_exe_exists to work on win32
2006-05-24 08:32:08 -05:00
unknown
2380913da8 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-05-24 14:57:44 +02:00
unknown
723eed2401 Merge mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
into  mysql.com:/data0/mysqldev/my/mysql-5.1-release


extra/comp_err.c:
  Auto merged
mysql-test/r/ctype_sjis.result:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  merged
2006-05-24 14:37:18 +02:00
unknown
6355f74e4d Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
into  mysql.com:/data0/mysqldev/my/mysql-5.0.22-release


scripts/mysqld_multi.sh:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  merged
extra/comp_err.c:
  merged
2006-05-24 14:22:36 +02:00
unknown
e1227d2bd1 Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release
into  mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release


tests/mysql_client_test.c:
  Auto merged
configure.in:
  merged
sql/sql_lex.cc:
  merged
2006-05-24 12:19:39 +02:00
unknown
9972f4bf5d configure.in:
Changed version to 5.0.22


configure.in:
  Changed version to 5.0.22
2006-05-24 11:33:17 +02:00
unknown
a04d9fa947 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
2006-05-24 12:34:24 +05:00
unknown
b056eac648 Merge april.(none):/home/svoj/devel/BitKeeper/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
2006-05-24 12:31:39 +05:00
unknown
59c2b9702d Fix missing source file. 2006-05-24 09:28:37 +02:00
unknown
a3687d58f0 Merge mysql.com:/usr/local/mysql/mysql-5.0-gcov
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-05-24 09:23:45 +02:00
unknown
d4aa0b8d92 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-05-23 19:08:28 -07:00
unknown
8bd23f0725 Fix events_logs_tests so it won't fail on Windows due to appearance
of hostname in query results.


mysql-test/r/events_logs_tests.result:
  Update results
mysql-test/t/events_logs_tests.test:
  Replace user_host in results, since it is system dependent.
2006-05-23 17:51:17 -07:00