into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
into mysql.com:/home/my/mysql-5.1
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_lex.cc:
manual merge
mysql-test-run now fails in case of warnings
mysql-test/lib/mtr_report.pl:
Fail if find warnings
mysql-test/mysql-test-run.sh:
Fail if find warnings
sql/sql_lex.cc:
Initalize st_lex properly
sql/sql_view.cc:
Fixed problem with unaligned memory (wrong free)
Implemented enable/disable index routines for partition handler
mysql-test/r/partition.result:
New test case
mysql-test/t/partition.test:
New test case
sql/ha_partition.cc:
Implemented enable/disable index routines for partition handler
sql/ha_partition.h:
Implemented enable/disable index routines for partition handler
mysql-test/r/partition.result:
New test case
mysql-test/t/partition.test:
New test case
sql/ha_partition.cc:
Handle delete_length in info call (was forgotten)
"NDB replication fails when no explicit--binlog-format given"
fix initialization, storage engine initialization must occur after
logging type is configured
sql/mysqld.cc:
Bug#19536
fix initialization, storage engine initialization must occur after
logging type is configured
TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column
mysql-test/r/date_formats.result:
Added test case for Bug#11324,
"TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column"
mysql-test/t/date_formats.test:
Added test case for Bug#11324,
"TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column"
mysql-test/r/partition.result:
New test case
mysql-test/t/partition.test:
New test case
sql/sql_parse.cc:
Moved code to clone the partition info object such that also
CREATE TABLE ... AS SELECT benefits from it
Move plugin declarations after system functions have been checked
(Fixes problem with ndb_config failing becasue SHM is not declared)
Fixed some memory leaks
configure.in:
Move plugin declarations after system functions have been checked
(Fixes problem with ndb_config failing becasue SHM is not declared)
mysql-test/t/disabled.def:
Disabled ndb_load, as it is in 5.0
(Fails randomly in binlog_close_connection())
mysql-test/t/log_tables.test:
Update error numbers
mysql-test/t/ndb_config.test:
Moved test depending on SHM to ndb_config2.test
mysql-test/t/ndb_partition_error.test:
Update error numbers
sql/event_timed.cc:
Removed not needed line
sql/ha_berkeley.cc:
Fixed compiler warning
sql/ha_heap.cc:
Fixed compiler warning
sql/ha_innodb.cc:
Fixed compiler warning
sql/ha_myisam.cc:
Fixed compiler warning
sql/ha_myisammrg.cc:
Fixed compiler warning
sql/ha_ndbcluster.cc:
Fixed compiler warning
sql/ha_partition.cc:
Fixed compiler warning
sql/mysql_priv.h:
After merge fix
sql/mysqld.cc:
Fixed memory leak in skip_grant.test
sql/share/errmsg.txt:
Removed wrong error messages
sql/sql_lex.cc:
More debugging
Faster lex_end()
sql/sql_partition.cc:
Fixed memory leak
sql/sql_view.cc:
Fixed memory leak
mysql-test/r/ndb_config2.result:
New BitKeeper file ``mysql-test/r/ndb_config2.result''
mysql-test/t/ndb_config2.test:
New BitKeeper file ``mysql-test/t/ndb_config2.test''
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/ansi.result:
Merged from 4.1
mysql-test/r/auto_increment.result:
Merged from 4.1
mysql-test/r/mysqldump.result:
Merged from 4.1
mysql-test/r/symlink.result:
Merged from 4.1
mysql-test/t/auto_increment.test:
Merged from 4.1
mysql-test/t/mysqldump.test:
Merged from 4.1
sql/set_var.cc:
Merged from 4.1
sql/sql_show.cc:
Merged from 4.1
into mysql.com:/home/my/mysql-5.1
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
storage/heap/hp_delete.c:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/myisamlog.c:
Auto merged
storage/ndb/include/kernel/signaldata/TcKeyReq.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
storage/ndb/tools/delete_all.cpp:
Auto merged
VC++Files/libmysqld/libmysqld.vcproj:
Use original file (my_user.c was already added in 5.1)
mysql-test/mysql-test-run.pl:
Manual merge
sql/handler.h:
Manual merge
sql/share/errmsg.txt:
Align error messages with 5.0
sql/sql_table.cc:
Manual merge
storage/ndb/src/ndbapi/NdbBlob.cpp:
No changes
Remove compiler warnings
Fix some broken tests
Workaround for syncronization bug in NDB (Bug #16445)
client/mysqltest.c:
Added more information to output from abort_not_supported_test()
Removed compiler warnings
include/my_sys.h:
Added function to print names of open files
include/mysys_err.h:
Print names of open files
mysql-test/include/have_ndb.inc:
Added comment
mysql-test/lib/mtr_report.pl:
Only print warning once
mysql-test/r/mysqldump.result:
After merge fix
mysql-test/r/ndb_basic.result:
Workaround for syncronization bug in NDB
mysql-test/r/ndb_config.result:
Remove not portable test
mysql-test/t/ndb_basic.test:
Workaround for syncronization bug in NDB
mysql-test/t/ndb_config.test:
Remove not portable test
mysys/errors.c:
Print names of open files
mysys/my_file.c:
Ensure that structs are cleared and copyied properly so that my_print_open_files() works.
mysys/my_init.c:
In case of EXTRA_DEBUG, print names of open files
mysys/my_open.c:
Added function to print names of open files
sql/sql_table.cc:
Fixed file-not-closed error
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
mysql-test/r/subselect.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_select.cc:
Auto merged
mysqldump / SHOW CREATE TABLE will show the NEXT available value for
the PK, rather than the *first* one that was available (that named in
the original CREATE TABLE ... AUTO_INCREMENT = ... statement).
This should produce correct and robust behaviour for the obvious use
cases -- when no data were inserted, then we'll produce a statement
featuring the same value the original CREATE TABLE had; if we dump
with values, INSERTing the values on the target machine should set the
correct next_ID anyway (and if not, we'll still have our AUTO_INCREMENT =
... to do that). Lastly, just the CREATE statement (with no data) for
a table that saw inserts would still result in a table that new values
could safely be inserted to).
There seems to be no robust way however to see whether the next_ID
field is > 1 because it was set to something else with CREATE TABLE
... AUTO_INCREMENT = ..., or because there is an AUTO_INCREMENT column
in the table (but no initial value was set with AUTO_INCREMENT = ...)
and then one or more rows were INSERTed, counting up next_ID. This
means that in both cases, we'll generate an AUTO_INCREMENT =
... clause in SHOW CREATE TABLE / mysqldump. As we also show info on,
say, charsets even if the user did not explicitly give that info in
their own CREATE TABLE, this shouldn't be an issue.
As per above, the next_ID will be affected by any INSERTs that have
taken place, though. This /should/ result in correct and robust
behaviour, but it may look non-intuitive to some users if they CREATE
TABLE ... AUTO_INCREMENT = 1000 and later (after some INSERTs) have
SHOW CREATE TABLE give them a different value (say, CREATE TABLE
... AUTO_INCREMENT = 1006), so the docs should possibly feature a
caveat to that effect.
It's not very intuitive the way it works now (with the fix), but it's
*correct*. We're not storing the original value anyway, if we wanted
that, we'd have to change on-disk representation?
If we do dump/load cycles with empty DBs, nothing will change. This
changeset includes an additional test case that proves that tables
with rows will create the same next_ID for AUTO_INCREMENT = ... across
dump/restore cycles.
Confirmed by support as likely solution for client's problem.
mysql-test/r/auto_increment.result:
test for creation of AUTO_INCREMENT=... clause
mysql-test/r/gis-rtree.result:
Add AUTO_INCREMENT=... clauses where appropriate
mysql-test/r/mysqldump.result:
show that AUTO_INCREMENT=... will survive dump/restore cycles
mysql-test/r/symlink.result:
Add AUTO_INCREMENT=... clauses where appropriate
mysql-test/t/auto_increment.test:
test for creation of AUTO_INCREMENT=... clause
mysql-test/t/mysqldump.test:
show that AUTO_INCREMENT=... will survive dump/restore cycles
sql/sql_show.cc:
Add AUTO_INCREMENT=... to output of SHOW CREATE TABLE if there is an
AUTO_INCREMENT column, and NEXT_ID > 1 (the default). We must not print
the clause for engines that do not support this as it would break the
import of dumps, but as of this writing, the test for whether
AUTO_INCREMENT columns are allowed and wether AUTO_INCREMENT=...
is supported is identical, !(file->table_flags() & HA_NO_AUTO_INCREMENT))
Because of that, we do not explicitly test for the feature,
but may extrapolate its existence from that of an AUTO_INCREMENT column.
into mysql.com:/home/my/mysql-5.1
mysql-test/t/mysqldump.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_table.cc:
After merge fix
sql/sql_show.cc:
Auto merged
into mysql.com:/space/pekka/ndb/version/my50
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/t/ndb_blob.test:
Auto merged
ndb/include/kernel/signaldata/TcKeyReq.hpp:
Auto merged
ndb/include/ndbapi/NdbBlob.hpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/sql_table.cc:
Auto merged
ndb/tools/delete_all.cpp:
nuts
Fixed warnings from test suite
Some fixes in mysql-test-run script to catch more warnings
mysql-test/lib/mtr_report.pl:
Catch more warnings
mysql-test/mysql-test-run.sh:
Catch warnings from mysqld
mysql-test/t/mysqldump.test:
Add key_block_size to catch future changes in information schema
mysys/errors.c:
Ensure that mysql-test-run catches if we call my_close() too many times
sql/handler.cc:
Initialize all elements
sql/log.cc:
true -> TRUE
sql/sql_class.h:
Review change: key_info -> key_create_info
sql/sql_lex.h:
Review change: key_info -> key_create_info
sql/sql_table.cc:
Review change: key_info -> key_create_info
Don't call mysql_close() if init_ddl_log is not called.
Better error handling in init_ddl_log
sql/sql_yacc.yy:
Review change: key_info -> key_create_info
into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
VC++Files/mysql.sln:
Auto merged
VC++Files/mysys/mysys.vcproj:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/timezone2.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/tztime.cc:
Auto merged
sql/tztime.h:
Auto merged
tests/Makefile.am:
Auto merged
tests/mysql_client_test.c:
Auto merged
There were two distict bugs: parse error was returned for valid
statement and that error wasn't reported to the client.
The fix ensures that EXPLAIN SELECT..INTO is accepted by parser and any
other parse error will be reported to the client.
mysql-test/r/explain.result:
Add result for bug#15463.
mysql-test/t/explain.test:
Add test case for bug#15463.
sql/sql_parse.cc:
Assert that if parsing error has occured then apropriate error message
has been pushed into error stack.
sql/sql_yacc.yy:
If there is no lex->result in select_var_ident rule, then we have
to be in DESCRIBE mode.
supplied inside a /*!VERSION event-text */ segment. (Fixes Bug#18078
mysql-test/t/disabled.def:
Enabling 'mysqldump' test because events should load normally now.
mysql-test/t/mysqldump.test:
Add spaces and tabs to the end of statements, to prove trimming of
whitespace.
sql/event_timed.cc:
Remove */ close-comment characters at the end, just as sp_head does.
The parser should be smarter about not giving us text that jumps semantic
levels, but that's an issue for another day.
Added support for key_block_size to MyISAM.
Simplify interface to 'new Key' to make it easier to add new key options.
mysqld option --new is used to define where key options are printed.
(In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
Fixed some compiler warnings and a memory leak in ssl
include/my_base.h:
Added flag to check if block size for key was secified
include/my_sys.h:
Added new support function to round up to a power of two
include/myisam.h:
Rename block_size -> block_size_index to avoid confusion with 'block_size'
include/violite.h:
Added function to free memory after new_VioSSLAcceptorFd
(Will rename all vio_ssl functions in a future changeset)
mysql-test/mysql-test-run.pl:
Don't print port number info when we use --extern
mysql-test/r/myisam.result:
Added test for key_block_size
mysql-test/t/myisam.test:
Added test for key_block_size
mysys/mf_keycache.c:
Simplify code
mysys/my_bit.c:
Added new support function to round up to a power of two
sql/ha_myisam.cc:
Tell MyISAM to use the specified key_block_size
MyISAM also updates the global key_block_size from the used values.
sql/handler.cc:
Added 'default_key_create_info' to be used as 'dummy' argument to 'new Key'
sql/handler.h:
Added KEY_CREATE_INFO, to be used as for general options for KEY's
sql/item_func.h:
Removed compiler warning
sql/lex.h:
Added new symbol
sql/mysqld.cc:
Fixed memory leak in ssl (new_VioSSLAcceptorFd)
sql/sql_class.h:
Change 'new Key' to use KEY_CREATE_INFO instead of 'algoritm', parser, key_page_size.
This makes it easier to add new key options in the future.
sql/sql_lex.h:
Added key create options
sql/sql_parse.cc:
Use new interface to 'new Key'
sql/sql_show.cc:
Added support for key_block_size
If --new is used, key options are printed after the key part definition.
sql/sql_table.cc:
Use new interface to 'new Key'
Add support for key_block_size
sql/sql_yacc.yy:
Add support for key_block_size
Allow key options before and after key_parts (In future they should be always after the key_part defintion)
Use new interface to 'new Key'
sql/structs.h:
Added block_size to keys
sql/table.cc:
Remmeber and read key_block_size for table and key level
sql/table.h:
Added default key_block_size for table
sql/unireg.cc:
Remember key_block_size for key
storage/myisam/ft_eval.c:
Set block_length to 0 to get default key page size
storage/myisam/ft_test1.c:
Set block_length to 0 to get default key page size
storage/myisam/mi_check.c:
block_size -> block_size_index
storage/myisam/mi_create.c:
Added support for block size per key.
Block size is rounded up to next power of two and enforced between MIN and MAX KEY_BLOCK_LENGTH.
Align start of key block to start at an even offset of max_key_block_length to ensure key cache works good if all key pages are of same size.
storage/myisam/mi_open.c:
block_size -> block_size_index
storage/myisam/mi_page.c:
block_size -> block_size_index
storage/myisam/mi_test1.c:
Set block_length to 0 to get default key page size
storage/myisam/mi_test2.c:
Set block_length to 0 to get default key page size
storage/myisam/mi_test3.c:
Set block_length to 0 to get default key page size
storage/myisam/myisamdef.h:
block_size -> block_size_index to avoid confusion with 'block_size' in MySQL
Added block_size as argument to MI_BLOCK_SIZE
Added missing prototypes to get rid of compiler warnings
storage/myisam/myisampack.c:
Removed compiler warning
block_size -> block_size_index
vio/viosslfactories.c:
Fixed memory leak in ssl (new_VioSSLAcceptorFd)
mysql-test/r/myisam-system.result:
New BitKeeper file ``mysql-test/r/myisam-system.result''
mysql-test/t/myisam-system.test:
New BitKeeper file ``mysql-test/t/myisam-system.test''
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/analyze.result:
Auto merged
mysql-test/t/analyze.test:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
