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

15535 commits

Author SHA1 Message Date
unknown
6f5cf392ff Bug #19214 running mysqld without binlog causes 10s timeout to drigger on schema ops 
- binlog thread should not wait for apply status share if binlog is not enabled
 2006-04-20 14:44:16 +02:00
unknown
eabd990341 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-20 03:20:03 +02:00
unknown
c8171434ae ndb uncomitted row count cont'd, applying new fix since last one was no good 2006-04-20 03:05:50 +02:00
unknown
9a1a9ecc00 small correction in thd_ndb hash_init 2006-04-19 23:49:51 +02:00
unknown
271cf5ed5c Merge mysql.com:/home/jimw/my/mysql-5.1-old-scripts 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-19 13:11:58 -07:00
unknown
47ba0146ec corrected wrong usage of hash 2006-04-19 21:30:22 +02:00
unknown
213a6d1031 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
 2006-04-19 19:56:52 +02:00
unknown
8f2c82b383 removed use of local data in local cache in preparation for removing local cache usage all together 2006-04-19 18:29:25 +02:00
unknown
db37c0d615 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-19 14:58:42 +02:00
unknown
37fdc23672 BUG#18094 Slave caches invalid table definition after atlters causes select failure 
- return correct object status from ndb dictionary
- check for validity of index retrieved from index, and retry if invalid
 2006-04-19 14:54:39 +02:00
unknown
1fa3cdd006 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b17400-mysql-5.1-new


mysql-test/t/disabled.def:
  Merge with mysql-5.1-new
 2006-04-19 10:58:44 +02:00
unknown
c83dce6e34 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
 2006-04-19 11:42:41 +05:00
unknown
ba67c865db item_xmlfunc.cc: 
After review minor fixes for bug#16319
  Thanks to Gluh for suggestions.


sql/item_xmlfunc.cc:
  After review minor fixes.
  Thanks Gluh for suggestions.
 2006-04-19 11:11:47 +05:00
unknown
2b49181d2f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1


include/my_sys.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysys/my_access.c:
  SCCS merged
 2006-04-19 09:50:17 +05:00
unknown
c6590081c3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
 2006-04-19 09:22:04 +05:00
unknown
afe484cba6 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
 2006-04-18 09:00:02 +02:00
unknown
c17b103ae7 Invalidate old table at rename 2006-04-18 08:57:37 +02:00
unknown
a3e60effe3 fix for Bug#18848 "SIGHUP crashes the server" (v2) 
sql/log.cc:
  check whether log tables were initialized, before trying to
  flush them during sighup processing. Then use logger THD
  for flush.
 2006-04-18 08:43:13 +04:00
unknown
2cf34e52a6 Delete unused (and unmaintained) scripts. 
BitKeeper/deleted/.del-watchdog_mysqld~279cf39e994b36e2:
  Delete: sql/watchdog_mysqld
BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
  Delete: scripts/mysqld_safe-watch.sh
BitKeeper/deleted/.del-mysql_prepare_privilege_tables_for_5.sql~76ea3c82bdbbead4:
  Delete: scripts/mysql_prepare_privilege_tables_for_5.sql
 2006-04-17 20:01:07 -07:00
unknown
58faa56994 Merge mysql.com:/home/jimw/my/mysql-5.1-19059 
into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/mysqld.cc:
  Auto merged
 2006-04-17 10:06:17 -07:00
unknown
11099ed53c Bug #19059: Failure to get version information when running from source tree 
Fix the way that instance manager finds the version number of instances,
  so that it works properly when the executable name isn't the same as what
  the instance-manager launched, such as when wrapping a libtool-wrapped
  executable from the source tree.

  This removes the 'Ver ' reported in the version column output by
  'SHOW INSTANCE STATUS ...', but the format of this column is not
  documented (and is pretty free-form to begin with).


server-tools/instance-manager/instance_options.cc:
  Look for 'Ver' to get version from running mysqld --version
server-tools/instance-manager/parse_output.cc:
  Make parse_output_and_get_value() look at the whole line to find
  the word, instead of just at the beginning of each line.
sql/mysqld.cc:
  Note that the instance manager relies on 'Ver' in mysqld --version
 2006-04-17 09:38:50 -07:00
unknown
1540407e60 Fixed a few pieces around support for data directory. 
mysql-test/r/archive.result:
  Adding test case for data directory support in create table.
mysql-test/t/archive.test:
  Added test for "data directory" support in archive.
sql/ha_archive.cc:
  Updated comments, added printable bits for support of "data directory"
sql/ha_archive.h:
  Added real_path to share (will come in handy in later code)
 2006-04-16 21:55:02 -07:00
unknown
fea1551653 Adding back support for loadable engines. 
sql/sql_plugin.cc:
  Adding back in support for loadable engines.
 2006-04-16 13:08:14 -07:00
unknown
cc62983ca2 Final patch to remove the last of the OS2 support. 
client/client_priv.h:
  OS2 removal
client/mysql.cc:
  OS2 removal
dbug/dbug.c:
  OS2 removal
include/m_string.h:
  OS2 removal
include/my_global.h:
  Cleanup for have_mit
libmysql/dll.c:
  OS2 removal
libmysql/get_password.c:
  OS2 removal
libmysql/libmysql.c:
  OS2 removal
libmysql/manager.c:
  OS2 removal
sql-common/client.c:
  OS2 removal
sql/event_executor.cc:
  OS2 removal
sql/hostname.cc:
  OS2 removal
sql/log.cc:
  OS2 removal
sql/log_event.h:
  OS2 removal
sql/my_lock.c:
  OS2 removal
sql/mysql_priv.h:
  OS2 removal
sql/mysqld.cc:
  OS2 removal
sql/net_serv.cc:
  OS2 removal
sql/repl_failsafe.cc:
  OS2 removal
sql/slave.cc:
  OS2 removal
sql/sql_base.cc:
  OS2 removal
sql/sql_insert.cc:
  OS2 removal
sql/sql_load.cc:
  OS2 removal
sql/sql_parse.cc:
  OS2 removal
sql/sql_table.cc:
  OS2 removal
storage/myisam/myisamchk.c:
  OS2 removal
storage/ndb/src/mgmclient/main.cpp:
  OS2 removal
storage/ndb/src/mgmsrv/main.cpp:
  OS2 removal
vio/vio.c:
  OS2 removal
vio/viosocket.c:
  OS2 removal
vio/viossl.c:
  OS2 removal
 2006-04-15 18:17:32 -07:00
unknown
2ffd95c4c9 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
 2006-04-14 17:50:32 -04:00
unknown
0988e2c80f Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752


mysql-test/t/partition.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  manual merge
sql/share/errmsg.txt:
  manual merge
 2006-04-14 17:48:27 -04:00
unknown
c0b172f0b1 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

(With hand-merged tests.)


sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
 2006-04-14 11:38:09 -04:00
unknown
7280f8befb Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
 2006-04-14 13:57:46 +05:00
unknown
9faa297074 Merge mysql.com:/usr/home/bar/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319


mysql-test/r/xml.result:
  Auto merged
mysql-test/t/xml.test:
  Auto merged
sql/item_xmlfunc.cc:
  Auto merged
 2006-04-14 13:34:18 +05:00
unknown
ae040f2531 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-04-13 15:34:39 +02:00
unknown
4b277da5a2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


client/mysqltest.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/t/disabled.def:
  manual merge
 2006-04-13 10:48:24 +02:00
unknown
328778a1f1 fix for distcheck 
configure.in:
  fix the test for distcheck
 2006-04-13 09:57:51 +02:00
unknown
ce464a3dce wrong ndb object used to drop event operation causing DBUG_ASSERT in shutdown/cleanup 2006-04-13 09:37:43 +02:00
unknown
9a698169bc Bug#17400 (Cluster Replication: Delete and update of row w/o PK fails): 
Restarting scan after call to delete_row().


mysql-test/include/rpl_multi_engine3.inc:
  Injector thread was not given enough time.
mysql-test/t/disabled.def:
  Disabling some tests.
sql/log_event.cc:
  Moving scan init functions for Delete_rows_log_event.
  Restarting scan for each found row.
mysql-test/t/rpl_ndb_dd_partitions.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_dd_partitions.test''
 2006-04-12 21:19:24 +02:00
unknown
580aea9cb9 ndb: 
freeing non freed objects on server shutdown
corrected timeout handling on schema events
 2006-04-12 18:01:19 +02:00
unknown
61fe2187b4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
 2006-04-12 08:48:50 +02:00
unknown
087cae1a1e Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-11 16:03:49 -07:00
unknown
a3fb002177 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
 2006-04-11 18:25:13 -04:00
unknown
16002370c6 Merge mysql.com:/home/jimw/my/mysql-5.1-17139 
into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/sql_parse.cc:
  Auto merged
 2006-04-11 12:06:49 -07:00
unknown
0d310faac2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/marty/MySQL/mysql-5.1-new


sql/ha_partition.cc:
  Auto merged
 2006-04-11 21:06:48 +02:00
unknown
ee5e33148e Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
 2006-04-11 15:00:06 -04:00
unknown
c97aa492e5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b14360
 2006-04-11 23:46:27 +05:00
unknown
8907bf0af7 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/bugs/mysql-5.0-merge


sql/sql_insert.cc:
  Auto merged
 2006-04-11 22:46:26 +04:00
unknown
3649074e6d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
 2006-04-11 09:36:02 -04:00
unknown
aa3eb77e62 bug#17870 Table names conflict with Windows device names 
It was impossible to create some table names on Windows
(e.g. LPT1, AUX, COM1, etc).

Fixed to pad dangerous names with thee "at" signs
(e.g. LPT1@@@, AUX@@@, COM1@@@, and so on).


include/my_sys.h:
  Adding new function declaration
mysys/my_access.c:
  Adding new function check_if_legal_tablename().
  It works almost like check_if_legal_filename(),
  but accepts a table name without extension and path,
  and does not check "CLOCK$".
sql/sql_table.cc:
  Check if a dangerous table name and append @@@
strings/ctype-utf8.c:
  Treat "@@@" sequence in a table name as a end-of-line.
mysql-test/r/ctype_filename.result:
  New BitKeeper file ``mysql-test/r/ctype_filename.result''
mysql-test/t/ctype_filename.test:
  New BitKeeper file ``mysql-test/t/ctype_filename.test''
 2006-04-11 18:16:14 +05:00
unknown
961725aa51 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b14360
 2006-04-11 18:14:34 +05:00
unknown
ef9c2e8201 Merge 192.168.123.145:MySQL/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
 2006-04-11 14:29:37 +02:00
unknown
fc1f59421c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/field.cc:
  Auto merged
 2006-04-11 14:26:06 +02:00
unknown
0b5fe0f8df Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
 2006-04-11 14:21:01 +02:00
unknown
6b7e19af4f Fixes for fast alter table for ndbcluster 2006-04-11 14:06:32 +02:00