Fixing Item_param::safe_charset_converter to do less "new"s.
sql/item.h:
Fixing Item_param::safe_charset_converter to do less "new"s.
sql/item.cc:
Fixing Item_param::safe_charset_converter to do less "new"s.
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
myisam/ft_parser.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
earlier because of various features/checks missing (these features/checks
are now implemented).
mysql-test/r/sp.result:
Enabled back bunch of tests which were previously disabled because of various
features/checks missing (since these features/checks are now implemented).
mysql-test/t/sp.test:
Enabled back bunch of tests which were previously disabled because of various
features/checks missing (since these features/checks are now implemented).
A typo bug caused loss of a predicate of the form field=const in some cases.
mysql-test/r/select.result:
Added a test case for bug #15106.
mysql-test/t/select.test:
Added a test case for bug #15106.
by starting with an empty index set and adding indexes to it until it
becomes covering. If the set becomes covering after adding the first index,
return NULL and don't try constructing ROR-intersection of one index (which
caused a crash)
CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are
created in the statement memory root.
mysql-test/r/ps.result:
Test results has been fixed (Bug#14410)
mysql-test/t/ps.test:
A test case for Bug#14410 "Crash in Enum or Set type in CREATE
TABLE and PS/SP"
sql/mysql_priv.h:
typelib() function declaration has been changed.
sql/sql_table.cc:
Supply the statement memory root to use in typelib() and
safe_charset_converter() functions to ensure that objects
created during the first execution of CREATE TABLE statement
are allocated in persistent memory of the statement.
sql/table.cc:
Change typelib() function to require MEM_ROOT.
The previous variant where it was a specific ha_partition method
only worked for the partition handler. It was unfortunately called also
for the NDB handler and in this case it called a random method in the
NDB handler with random input.
sql/ha_ndbcluster.cc:
Moved initialisation of some handler variables to
set_part_info method called earlly in the open process
sql/ha_ndbcluster.h:
Moved initialisation of some handler variables to
set_part_info method called earlly in the open process
sql/ha_partition.h:
Made set_part_info a handler method and not a ha_partition method only
sql/handler.h:
Made set_part_info a handler method and not a ha_partition method only
sql/sql_partition.cc:
Made set_part_info a handler method and not a ha_partition method only
into zim.(none):/home/brian/mysql/mysql-5.1-new
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
REsolve
mysql-test/t/mysqldump.test:
Resolve conflict
mysql-test/t/sp.test:
Tidying up after merge.
sql/mysqld.cc:
Make sure we have thd->thread_stack set before calling store_globals().
(And fixed compiler warning.)
sql/sql_class.cc:
Init THD::tread_stack in constructor.
So, use --replace and instead of getting INSERT INTO you will INSTEAD get REPLACE INTO. Buyer beward, REPLACE is a MySQL SQL, so you will not end up with a dump that can be used for other databases.
Though I hear you could just use a sed line to modify it back :)
client/client_priv.h:
New option for --replace
client/mysqldump.c:
Added option for REPLACE INTO instead of INSERT INTO
mysql-test/r/mysqldump.result:
Updated REsultes for replace into
mysql-test/t/mysqldump.test:
Added new test for --replace
Loose index scan using only second part of multipart index was choosen, which
results in creating wrong keys and endless loop.
get_best_group_min_max() now allows loose index scan for distinct only if used
keyparts forms a prefix of the index.
mysql-test/t/group_min_max.test:
Test case for bug #13293 Wrongly used index results in endless loop.
mysql-test/r/group_min_max.result:
Test case for bug #13293 Wrongly used index results in endless loop.
sql/opt_range.cc:
Fix bug #13293 Wrongly used index results in endless loop.
get_best_group_min_max() now allows loose index scan for distinct only if used keyparts forms a prefix of the index.
