An error occurred fetching the project authors.
- 03 Feb, 2006 2 commits
-
-
unknown authored
into mysql.com:/home/kostja/mysql/mysql-5.1-merge sql/field.cc: Auto merged sql/sp_head.cc: Auto merged
-
unknown authored
into mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree The idea of this merge is to "synchronize" 5.1-release tree (5.1.6) and the main 5.1 tree. A patch for BUG#15588/BUG#16621 was copied into 5.1-release from 5.0 since it is important. This patch is expected to come into the 5.1 tree after resolving 5.0 -> 5.1 megrge logjam. storage/example/ha_example.cc: Auto merged sql/field.cc: Ignore changes in 5.1-release (5.1.6). sql/sp_head.cc: Ignore changes in 5.1-release (5.1.6).
-
- 02 Feb, 2006 26 commits
-
-
unknown authored
sql/field.cc: Use memmove() instead of memcpy() -- after implementation of WL#2984 (Make stored routine variables work according to the standard) it is possible to store in the field the value from this field. For instance, this can happen for the following statement: SET sp_var = SUBSTR(sp_var, 1, 3); sql/sp_head.cc: Work correctly with String: - String length has to be be reset before use; - qs_append() does not allocate memory, so the memory should be reserved beforehand.
-
unknown authored
into mysql.com:/home/kostja/mysql/mysql-5.1-merge BitKeeper/etc/ignore: auto-union configure.in: Auto merged libmysql/libmysql.c: Auto merged mysql-test/ndb/ndbcluster.sh: Auto merged mysql-test/r/rpl_sp.result: Auto merged mysql-test/r/sp-error.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/type_float.result: Auto merged mysql-test/t/rpl_sp.test: Auto merged mysql-test/t/sp-error.test: Auto merged mysql-test/t/sp.test: Auto merged sql/field.cc: Auto merged sql/item_func.cc: Auto merged sql/mysqld.cc: Auto merged sql/protocol.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged storage/myisam/ft_update.c: Auto merged storage/ndb/include/logger/LogHandler.hpp: Auto merged storage/ndb/include/logger/Logger.hpp: Auto merged storage/ndb/include/mgmapi/mgmapi.h: Auto merged storage/ndb/include/mgmcommon/ConfigRetriever.hpp: Auto merged storage/ndb/src/common/logger/FileLogHandler.cpp: Auto merged storage/ndb/src/common/logger/LogHandler.cpp: Auto merged storage/ndb/src/common/logger/Logger.cpp: Auto merged storage/ndb/src/common/logger/SysLogHandler.cpp: Auto merged storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged storage/ndb/src/common/util/SocketServer.cpp: Auto merged storage/ndb/src/kernel/main.cpp: Auto merged storage/ndb/src/kernel/vm/Configuration.cpp: Auto merged storage/ndb/src/kernel/vm/Configuration.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/mgmsrv/Services.hpp: Auto merged storage/ndb/src/mgmsrv/main.cpp: Auto merged storage/ndb/tools/ndb_size.pl: Auto merged zlib/Makefile.am: Auto merged mysql-test/r/information_schema.result: SCCS merged mysql-test/t/information_schema.test: Manual merge. sql/ha_archive.cc: Manual merge. sql/share/errmsg.txt: SCCS merged tests/mysql_client_test.c: Manual merge.
-
unknown authored
into mysql.com:/home/dlenev/src/mysql-5.1-merges mysql-test/t/disabled.def: SCCS merged
-
unknown authored
Copied from the general tree, to solve a build problem: ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com build fix when building with example storage engine. storage/example/ha_example.cc: Copied from the general tree, to solve a build problem: ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com build fix when building with example storage engine.
-
unknown authored
into mysql.com:/home/kostja/mysql/mysql-5.1-merge client/mysqldump.c: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql51 mysql-test/t/disabled.def: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql51
-
unknown authored
enable extra logging in ndb handler during test runs mysql-test/mysql-test-run.pl: enable extra logging in ndb handler during test runs sql/ha_ndbcluster_binlog.cc: added more logging in ndb handler
-
unknown authored
-
unknown authored
-
unknown authored
into mysql.com:/home/kostja/mysql/mysql-5.1-merge mysql-test/r/innodb.result: Manual merge: null merge, use local. mysql-test/t/innodb.test: Manual merge: null merge, use local. sql/ha_innodb.cc: Manual merge: null merge, use local. sql/ha_innodb.h: Manual merge: null merge, use local. sql/mysqld.cc: Manual merge: null merge, use local. sql/set_var.cc: Manual merge: null merge, use local. storage/innobase/include/srv0srv.h: Manual merge: null merge, use local. storage/innobase/srv/srv0srv.c: Manual merge: null merge, use local.
-
unknown authored
into mysql.com:/home/kostja/mysql/mysql-5.1-merge client/mysqlbinlog.cc: Auto merged client/mysqldump.c: Auto merged include/my_base.h: Auto merged libmysql/libmysql.c: Auto merged sql/field.h: Auto merged sql/ha_myisam.cc: Auto merged sql/log_event.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_help.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_test.cc: Auto merged sql-common/client.c: Auto merged sql/table.cc: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/sort.c: Auto merged mysys/my_bitmap.c: Manual merge sql/field.cc: e Manual merge sql/item.cc: Manual merge (new Field_bit_as_char constructor signature) sql/item_func.cc: Manual merge: use local sql/sql_insert.cc: Manual merge: add VOID() around bitmap_init
-
unknown authored
into mysql.com:/home/dlenev/src/mysql-5.1-bfix
-
unknown authored
privilege". Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script. Problem with it should have been caught by system_mysql_db/system_mysql_db_fix tests but they were disabled. Enabled them back. mysql-test/r/system_mysql_db.result: Updated test results after addition of TRIGGER privilege. mysql-test/t/disabled.def: Enabled back test system_mysql_db/system_mysql_db_fix tests. scripts/mysql_fix_privilege_tables.sql: Corrected addition of TRIGGER privilege.
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql51 sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql51
-
unknown authored
-
unknown authored
into mysql.com:/home/kostja/mysql/mysql-5.1-merge client/mysqltest.c: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/sp-error.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/type_decimal.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/r/view_grant.result: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/mysqltest.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/sp.test: Auto merged sql/ha_berkeley.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_handler.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/share/errmsg.txt: Auto merged mysql-test/mysql-test-run.pl: SCCS merged sql/sql_yacc.yy: Manual merge: resolve the conflict with moved sp_if rule
-
unknown authored
into mysql.com:/home/stewart/Documents/MySQL/5.1/new
-
unknown authored
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
-
unknown authored
into mysql.com:/usr/home/bar/mysql-5.1.new.ctype
-
unknown authored
A prerequisite for several fulltext and XML bugs. MY_CHARSET_HANDLER now has a new function "ctype" to detect a type of the next character in a string (i.e. digit, letter, space, punctuation, control, etc), which now works correctly for both 8bit and multibyte charsets. Previously only 8bit charsets worked correctly, while any multibyte character was considered as letter in multibyte charsets. Many files: Adding new function Makefile.am: Adding build rules for uctypedump, a dump tool to create my_uctype.h using Unicode Character Database file. m_ctype.h: Adding declaration of my_uni_ctype, ctype data for Unicode. Adding new member into MY_CHARSET_HANDLER Makefile.am: Adding my_uctype.h into noinst_HEADERS my_uctype.h, uctypedump.c: new files: ctype data for unicode, and the tool to generate it from a Unicode Character Database file. include/Makefile.am: Adding my_uctype.h include/m_ctype.h: Adding declaration of my_uni_ctype, ctype data for Unicode. strings/Makefile.am: Adding build rules for uctypedump, a dump tool to create my_uctype.h using Unicode Character Database file. strings/ctype-big5.c: Adding new function strings/ctype-bin.c: Adding new function strings/ctype-cp932.c: Adding new function strings/ctype-euc_kr.c: Adding new function strings/ctype-eucjpms.c: Adding new function strings/ctype-gb2312.c: Adding new function strings/ctype-gbk.c: Adding new function strings/ctype-latin1.c: Adding new function strings/ctype-mb.c: Adding new function strings/ctype-simple.c: Adding new function strings/ctype-sjis.c: Adding new function strings/ctype-tis620.c: Adding new function strings/ctype-ucs2.c: Adding new function strings/ctype-ujis.c: Adding new function strings/ctype-utf8.c: Adding new function
-
unknown authored
mysql-test/t/disabled.def: disabling new test that was added during null-merge from 5.0 the new test innodb_unsafe_binlog will be re-enabled when the 5.1 snapshot for InnoDB is applied. Disabling test rather than removing files to make future merges easier (removing the files would cause merge conflicts when the files are re-added in the 5.1 snapshot).
-
unknown authored
sql/ha_ndbcluster.cc: ndbcluster_fill_files_table should return int
-
unknown authored
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge sql/ha_innodb.cc: Auto merged
-
unknown authored
storage/example/ha_example.cc: add handlerton call for fill files table
-
- 01 Feb, 2006 12 commits
-
-
unknown authored
mysql-test/r/ndb_dd_dump.result: New BitKeeper file ``mysql-test/r/ndb_dd_dump.result'' mysql-test/t/ndb_dd_dump.test: New BitKeeper file ``mysql-test/t/ndb_dd_dump.test''
-
unknown authored
-
unknown authored
-
unknown authored
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge Null-merge InnoDB snapshots from 5.0 to 5.1 storage/innobase/include/lock0lock.h: Auto merged mysql-test/r/innodb.result: null-merge from 5.0 mysql-test/t/innodb.test: null-merge from 5.0 sql/ha_innodb.cc: null-merge from 5.0 storage/innobase/include/data0type.h: null-merge from 5.0 storage/innobase/include/data0type.ic: null-merge from 5.0 storage/innobase/include/os0file.h: null-merge from 5.0 storage/innobase/include/row0mysql.h: null-merge from 5.0 storage/innobase/lock/lock0lock.c: null-merge from 5.0 storage/innobase/os/os0file.c: null-merge from 5.0 storage/innobase/row/row0ins.c: null-merge from 5.0 storage/innobase/row/row0mysql.c: null-merge from 5.0 storage/innobase/row/row0sel.c: null-merge from 5.0 storage/innobase/trx/trx0trx.c: null-merge from 5.0
-
unknown authored
-
unknown authored
into mysql.com:/home/dlenev/src/mysql-5.1-merges
-
unknown authored
-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892 storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Auto merged
-
unknown authored
into mysql.com:/home/dlenev/src/mysql-5.1-merges
-
unknown authored
into mysql.com:/home/dlenev/src/mysql-5.1-merges sql/ha_berkeley.cc: Auto merged
-
unknown authored
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
-
unknown authored
When we add new privilege we should update mysql-test/lib/init_db.sql accordingly. mysql-test/lib/init_db.sql: Added TRIGGER privilege. sql/sql_acl.h: Updated comment describing process of addition of new privileges - added yet another script place which should be modified when new privilege is added.
-