mariadb/sql/ha_federated.cc

2800 lines
83 KiB
C++
Raw Normal View History

/* Copyright (C) 2004 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/*
MySQL Federated Storage Engine
ha_federated.cc - MySQL Federated Storage Engine
Patrick Galbraith and Brian Aker, 2004
This is a handler which uses a foreign database as the data file, as
opposed to a handler like MyISAM, which uses .MYD files locally.
How this handler works
----------------------------------
Normal database files are local and as such: You create a table called
'users', a file such as 'users.MYD' is created. A handler reads, inserts,
deletes, updates data in this file. The data is stored in particular format,
so to read, that data has to be parsed into fields, to write, fields have to
be stored in this format to write to this data file.
With MySQL Federated storage engine, there will be no local files for each
table's data (such as .MYD). A foreign database will store the data that would
normally be in this file. This will necessitate the use of MySQL client API
to read, delete, update, insert this data. The data will have to be retrieve
via an SQL call "SELECT * FROM users". Then, to read this data, it will have
to be retrieved via mysql_fetch_row one row at a time, then converted from
the column in this select into the format that the handler expects.
The create table will simply create the .frm file, and within the
"CREATE TABLE" SQL, there SHALL be any of the following :
comment=scheme://username:password@hostname:port/database/tablename
comment=scheme://username@hostname/database/tablename
comment=scheme://username:password@hostname/database/tablename
comment=scheme://username:password@hostname/database/tablename
An example would be:
comment=mysql://username:password@hostname:port/database/tablename
***IMPORTANT***
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
This is a first release, conceptual release
Only 'mysql://' is supported at this release.
This comment connection string is necessary for the handler to be
able to connect to the foreign server.
The basic flow is this:
SQL calls issues locally ->
mysql handler API (data in handler format) ->
mysql client API (data converted to SQL calls) ->
foreign database -> mysql client API ->
convert result sets (if any) to handler format ->
handler API -> results or rows affected to local
What this handler does and doesn't support
------------------------------------------
* Tables MUST be created on the foreign server prior to any action on those
tables via the handler, first version. IMPORTANT: IF you MUST use the
federated storage engine type on the REMOTE end, MAKE SURE [ :) ] That
the table you connect to IS NOT a table pointing BACK to your ORIGNAL
table! You know and have heard the screaching of audio feedback? You
know putting two mirror in front of each other how the reflection
continues for eternity? Well, need I say more?!
* There will not be support for transactions.
* There is no way for the handler to know if the foreign database or table
has changed. The reason for this is that this database has to work like a
data file that would never be written to by anything other than the
database. The integrity of the data in the local table could be breached
if there was any change to the foreign database.
* Support for SELECT, INSERT, UPDATE , DELETE, indexes.
* No ALTER TABLE, DROP TABLE or any other Data Definition Language calls.
* Prepared statements will not be used in the first implementation, it
remains to to be seen whether the limited subset of the client API for the
server supports this.
* This uses SELECT, INSERT, UPDATE, DELETE and not HANDLER for its
implementation.
* This will not work with the query cache.
Method calls
A two column table, with one record:
(SELECT)
"SELECT * FROM foo"
ha_federated::info
ha_federated::scan_time:
ha_federated::rnd_init: share->select_query SELECT * FROM foo
ha_federated::extra
<for every row of data retrieved>
ha_federated::rnd_next
ha_federated::convert_row_to_internal_format
ha_federated::rnd_next
</for every row of data retrieved>
ha_federated::rnd_end
ha_federated::extra
ha_federated::reset
(INSERT)
"INSERT INTO foo (id, ts) VALUES (2, now());"
ha_federated::write_row
<for every field/column>
-Added quote_data and needs_quotes (moved from federated handler. -New tests and results logging_ok: Logging to logging@openlogging.org accepted ha_federated.h: removed quote_data and type_quote (now in the Field class) ha_federated.cc: moved quote_data and type_quote to field class field.h: new methods quote_data and needs_quotes declared field.cc: new field class methods quote_data and needs_quotes (per Monty's request) federated.test: more tests, joins, index tests have_federated_db.require: new name of federated system var federated.result: new test results for federated handler have_federated_db.inc: changed name of variable in test due to change in vars sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler ha_federated.cc: implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions. sql/mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler sql/sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql-test/include/have_federated_db.inc: changed name of variable in test due to change in vars mysql-test/r/federated.result: new test results for federated handler mysql-test/r/have_federated_db.require: new name of federated system var mysql-test/t/federated.test: more tests, joins, index tests sql/field.cc: new field class methods quote_data and needs_quotes (per Monty's request) sql/field.h: new methods quote_data and needs_quotes declared sql/ha_federated.cc: moved quote_data and type_quote to field class sql/ha_federated.h: removed quote_data and type_quote (now in the Field class) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2005-01-21 03:36:40 +01:00
Field::quote_data
Field::quote_data
</for every field/column>
ha_federated::reset
(UPDATE)
"UPDATE foo SET ts = now() WHERE id = 1;"
ha_federated::index_init
ha_federated::index_read
ha_federated::index_read_idx
-Added quote_data and needs_quotes (moved from federated handler. -New tests and results logging_ok: Logging to logging@openlogging.org accepted ha_federated.h: removed quote_data and type_quote (now in the Field class) ha_federated.cc: moved quote_data and type_quote to field class field.h: new methods quote_data and needs_quotes declared field.cc: new field class methods quote_data and needs_quotes (per Monty's request) federated.test: more tests, joins, index tests have_federated_db.require: new name of federated system var federated.result: new test results for federated handler have_federated_db.inc: changed name of variable in test due to change in vars sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler ha_federated.cc: implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions. sql/mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler sql/sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql-test/include/have_federated_db.inc: changed name of variable in test due to change in vars mysql-test/r/federated.result: new test results for federated handler mysql-test/r/have_federated_db.require: new name of federated system var mysql-test/t/federated.test: more tests, joins, index tests sql/field.cc: new field class methods quote_data and needs_quotes (per Monty's request) sql/field.h: new methods quote_data and needs_quotes declared sql/ha_federated.cc: moved quote_data and type_quote to field class sql/ha_federated.h: removed quote_data and type_quote (now in the Field class) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2005-01-21 03:36:40 +01:00
Field::quote_data
ha_federated::rnd_next
ha_federated::convert_row_to_internal_format
ha_federated::update_row
<quote 3 cols, new and old data>
-Added quote_data and needs_quotes (moved from federated handler. -New tests and results logging_ok: Logging to logging@openlogging.org accepted ha_federated.h: removed quote_data and type_quote (now in the Field class) ha_federated.cc: moved quote_data and type_quote to field class field.h: new methods quote_data and needs_quotes declared field.cc: new field class methods quote_data and needs_quotes (per Monty's request) federated.test: more tests, joins, index tests have_federated_db.require: new name of federated system var federated.result: new test results for federated handler have_federated_db.inc: changed name of variable in test due to change in vars sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler ha_federated.cc: implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions. sql/mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler sql/sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql-test/include/have_federated_db.inc: changed name of variable in test due to change in vars mysql-test/r/federated.result: new test results for federated handler mysql-test/r/have_federated_db.require: new name of federated system var mysql-test/t/federated.test: more tests, joins, index tests sql/field.cc: new field class methods quote_data and needs_quotes (per Monty's request) sql/field.h: new methods quote_data and needs_quotes declared sql/ha_federated.cc: moved quote_data and type_quote to field class sql/ha_federated.h: removed quote_data and type_quote (now in the Field class) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2005-01-21 03:36:40 +01:00
Field::quote_data
Field::quote_data
Field::quote_data
Field::quote_data
Field::quote_data
Field::quote_data
</quote 3 cols, new and old data>
ha_federated::extra
ha_federated::extra
ha_federated::extra
ha_federated::external_lock
ha_federated::reset
How do I use this handler?
--------------------------
First of all, you need to build this storage engine:
./configure --with-federated-storage-engine
make
Next, to use this handler, it's very simple. You must
have two databases running, either both on the same host, or
on different hosts.
One the server that will be connecting to the foreign
host (client), you create your table as such:
CREATE TABLE test_table (
id int(20) NOT NULL auto_increment,
name varchar(32) NOT NULL default '',
other int(20) NOT NULL default '0',
PRIMARY KEY (id),
KEY name (name),
KEY other_key (other))
ENGINE="FEDERATED"
DEFAULT CHARSET=latin1
COMMENT='root@127.0.0.1:9306/federated/test_federated';
Notice the "COMMENT" and "ENGINE" field? This is where you
respectively set the engine type, "FEDERATED" and foreign
host information, this being the database your 'client' database
will connect to and use as the "data file". Obviously, the foreign
database is running on port 9306, so you want to start up your other
database so that it is indeed on port 9306, and your federated
database on a port other than that. In my setup, I use port 5554
for federated, and port 5555 for the foreign database.
Then, on the foreign database:
CREATE TABLE test_table (
id int(20) NOT NULL auto_increment,
name varchar(32) NOT NULL default '',
other int(20) NOT NULL default '0',
PRIMARY KEY (id),
KEY name (name),
KEY other_key (other))
ENGINE="<NAME>" <-- whatever you want, or not specify
DEFAULT CHARSET=latin1 ;
This table is exactly the same (and must be exactly the same),
except that it is not using the federated handler and does
not need the URL.
How to see the handler in action
--------------------------------
When developing this handler, I compiled the federated database with
debugging:
./configure --with-federated-storage-engine
--prefix=/home/mysql/mysql-build/federated/ --with-debug
Once compiled, I did a 'make install' (not for the purpose of installing
the binary, but to install all the files the binary expects to see in the
diretory I specified in the build with --prefix,
"/home/mysql/mysql-build/federated".
Then, I started the foreign server:
/usr/local/mysql/bin/mysqld_safe
--user=mysql --log=/tmp/mysqld.5555.log -P 5555
Then, I went back to the directory containing the newly compiled mysqld,
<builddir>/sql/, started up gdb:
gdb ./mysqld
Then, withn the (gdb) prompt:
(gdb) run --gdb --port=5554 --socket=/tmp/mysqld.5554 --skip-innodb --debug
Next, I open several windows for each:
1. Tail the debug trace: tail -f /tmp/mysqld.trace|grep ha_fed
2. Tail the SQL calls to the foreign database: tail -f /tmp/mysqld.5555.log
3. A window with a client open to the federated server on port 5554
4. A window with a client open to the federated server on port 5555
I would create a table on the client to the foreign server on port
5555, and then to the federated server on port 5554. At this point,
I would run whatever queries I wanted to on the federated server,
just always remembering that whatever changes I wanted to make on
the table, or if I created new tables, that I would have to do that
on the foreign server.
Another thing to look for is 'show variables' to show you that you have
support for federated handler support:
show variables like '%federat%'
and:
show storage engines;
Both should display the federated storage handler.
Testing
-------
There is a test for MySQL Federated Storage Handler in ./mysql-test/t,
federatedd.test It starts both a slave and master database using
the same setup that the replication tests use, with the exception that
it turns off replication, and sets replication to ignore the test tables.
After ensuring that you actually do have support for the federated storage
handler, numerous queries/inserts/updates/deletes are run, many derived
from the MyISAM tests, plus som other tests which were meant to reveal
any issues that would be most likely to affect this handler. All tests
should work! ;)
To run these tests, go into ./mysql-test (based in the directory you
built the server in)
./mysql-test-run federatedd
To run the test, or if you want to run the test and have debug info:
./mysql-test-run --debug federated
This will run the test in debug mode, and you can view the trace and
log files in the ./mysql-test/var/log directory
ls -l mysql-test/var/log/
-rw-r--r-- 1 patg patg 17 4 Dec 12:27 current_test
-rw-r--r-- 1 patg patg 692 4 Dec 12:52 manager.log
-rw-rw---- 1 patg patg 21246 4 Dec 12:51 master-bin.000001
-rw-rw---- 1 patg patg 68 4 Dec 12:28 master-bin.index
-rw-r--r-- 1 patg patg 1620 4 Dec 12:51 master.err
-rw-rw---- 1 patg patg 23179 4 Dec 12:51 master.log
-rw-rw---- 1 patg patg 16696550 4 Dec 12:51 master.trace
-rw-r--r-- 1 patg patg 0 4 Dec 12:28 mysqltest-time
-rw-r--r-- 1 patg patg 2024051 4 Dec 12:51 mysqltest.trace
-rw-rw---- 1 patg patg 94992 4 Dec 12:51 slave-bin.000001
-rw-rw---- 1 patg patg 67 4 Dec 12:28 slave-bin.index
-rw-rw---- 1 patg patg 249 4 Dec 12:52 slave-relay-bin.000003
-rw-rw---- 1 patg patg 73 4 Dec 12:28 slave-relay-bin.index
-rw-r--r-- 1 patg patg 1349 4 Dec 12:51 slave.err
-rw-rw---- 1 patg patg 96206 4 Dec 12:52 slave.log
-rw-rw---- 1 patg patg 15706355 4 Dec 12:51 slave.trace
-rw-r--r-- 1 patg patg 0 4 Dec 12:51 warnings
Of course, again, you can tail the trace log:
tail -f mysql-test/var/log/master.trace |grep ha_fed
As well as the slave query log:
tail -f mysql-test/var/log/slave.log
Files that comprise the test suit
---------------------------------
mysql-test/t/federated.test
mysql-test/r/federated.result
mysql-test/r/have_federated_db.require
mysql-test/include/have_federated_db.inc
Other tidbits
-------------
These were the files that were modified or created for this
Federated handler to work:
./configure.in
./sql/Makefile.am
./config/ac_macros/ha_federated.m4
./sql/handler.cc
./sql/mysqld.cc
./sql/set_var.cc
./sql/field.h
./sql/sql_string.h
./mysql-test/mysql-test-run(.sh)
./mysql-test/t/federated.test
./mysql-test/r/federated.result
./mysql-test/r/have_federated_db.require
./mysql-test/include/have_federated_db.inc
./sql/ha_federated.cc
./sql/ha_federated.h
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
*/
#include "mysql_priv.h"
#ifdef USE_PRAGMA_IMPLEMENTATION
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
#pragma implementation // gcc: Class implementation
#endif
WL#3201 " Configure support for server plugins " storage/blackhole/ha_blackhole.h: Rename: sql/ha_blackhole.h -> storage/blackhole/ha_blackhole.h BitKeeper/deleted/.del-storage.m4~24bf2fffdaa328ad: Delete: config/ac-macros/storage.m4 BitKeeper/deleted/.del-ha_archive.m4~a07fac7110b39294: Delete: config/ac-macros/ha_archive.m4 BitKeeper/deleted/.del-ha_blackhole.m4~8ed06eb91f6420ed: Delete: config/ac-macros/ha_blackhole.m4 BitKeeper/deleted/.del-ha_example.m4~1dfb268163297708: Delete: config/ac-macros/ha_example.m4 BitKeeper/deleted/.del-ha_federated.m4~7acddd58286acfd6: Delete: config/ac-macros/ha_federated.m4 BitKeeper/deleted/.del-ha_innodb.m4~6f141fb5b80c1f39: Delete: config/ac-macros/ha_innodb.m4 BitKeeper/deleted/.del-ha_partition.m4~bc57067550be5f89: Delete: config/ac-macros/ha_partition.m4 BitKeeper/deleted/.del-ha_tina.m4~f658506ebbc113ca: Delete: config/ac-macros/ha_tina.m4 BitKeeper/deleted/.del-handlerton.cc.in~377156e7b06067cc: Delete: sql/handlerton.cc.in BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df: Delete: sql/handlerton-win.cc BUILD/SETUP.sh: WL#3201 Changes in configure arguments Makefile.am: WL#3201 changes in build subst names config/ac-macros/ha_berkeley.m4: WL#3201 remove unused variable Makefile is always made config/ac-macros/ha_ndbcluster.m4: WL#3201 remove unused variables Split big macro configure.in: WL#3201 out with storage.m4, in with plugins.m4 change how plugins are declared include makefiles, remove handlerton.cc, add sql_builtin.cc include/mysql/plugin.h: WL#3201 support static and dynamic build - MYSQL_DYNAMIC_PLUGIN libmysqld/Makefile.am: WL#3201 Storage engine files still left in sql subdir are not conditionally compiled. Should move them out soon, plugin/Makefile.am: WL#3201 update makefile plugin/fulltext/Makefile.am: WL#3201 update makefile plugin/fulltext/plugin_example.c: WL#3201 change to mysql_declare_plugin macro sql/Makefile.am: WL#3201 Storage engine files still left in sql subdir are not conditionally compiled. Should move them out soon, sql/ha_berkeley.cc: WL#3201 make into a plugin conditionally compile content sql/ha_federated.cc: WL#3201 make into a plugin conditionally compile content sql/ha_heap.cc: WL#3201 make into a plugin sql/ha_innodb.cc: WL#3201 make into a plugin conditionally compile content sql/ha_myisam.cc: WL#3201 make into a plugin sql/ha_myisammrg.cc: WL#3201 make into a plugin sql/ha_ndbcluster.cc: WL#3201 make into a plugin conditionally compile content sql/ha_ndbcluster_binlog.cc: WL#3201 make into a plugin conditionally compile content sql/ha_partition.cc: WL#3201 make into a plugin conditionally compile content sql/handler.cc: WL#3201 Simplify how storage engines are found by db_type (hopefully we can get rid of it soon) Code cleanup sql/handler.h: WL#3201 new DB_TYPE_FIRST_DYNAMIC new func ha_finalize_handlerton() remove ha_register_builtin_plugins() sql/log.cc: WL#3201 make into a plugin sql/mysqld.cc: WL#3201 remove ha_register_builtin_plugins() alter init order so that storage engines are initialized before first use sql/partition_info.cc: WL#3201 conditionally compile content sql/sql_delete.cc: WL#3201 conditionally include ha_innodb.h sql/sql_plugin.cc: WL#3201 All compiled in plugins are in mysqld_builtins[] add funcs for plugin finalization install builtin plugins on initialization sql/sql_show.cc: WL#3201 Fix to use plugin_foreach() sql/sql_yacc.yy: WL#3201 SHOW FULL PLUGIN storage/archive/Makefile.am: WL#3201 setup as plugin makefile storage/archive/ha_archive.cc: WL#3201 Convert into a plugin storage/archive/ha_archive.h: WL#3201 azlib.h now in local dir storage/blackhole/ha_blackhole.cc: WL#3201 convert into a plugin storage/csv/Makefile.am: WL#3201 setup as plugin makefile storage/csv/ha_tina.cc: WL#3201 remove conditional compilation on MYSQL_PLUGIN mysql_declare_plugin macro change storage/example/Makefile.am: WL#3201 fix as new-style plugin makefile storage/example/ha_example.cc: WL#3201 remove conditional compilation on MYSQL_PLUGIN mysql_declare_plugin macro change storage/innobase/Makefile.am: WL#3201 Lets make life easier and reduce innodb into a single library file config/ac-macros/plugins.m4: New BitKeeper file ``config/ac-macros/plugins.m4'' sql/sql_builtin.cc.in: New BitKeeper file ``sql/sql_builtin.cc.in'' storage/blackhole/Makefile.am: New BitKeeper file ``storage/blackhole/Makefile.am''
2006-04-13 22:49:29 +02:00
#ifdef WITH_FEDERATED_STORAGE_ENGINE
#include "ha_federated.h"
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
#include "m_string.h"
WL#3201 " Configure support for server plugins " storage/blackhole/ha_blackhole.h: Rename: sql/ha_blackhole.h -> storage/blackhole/ha_blackhole.h BitKeeper/deleted/.del-storage.m4~24bf2fffdaa328ad: Delete: config/ac-macros/storage.m4 BitKeeper/deleted/.del-ha_archive.m4~a07fac7110b39294: Delete: config/ac-macros/ha_archive.m4 BitKeeper/deleted/.del-ha_blackhole.m4~8ed06eb91f6420ed: Delete: config/ac-macros/ha_blackhole.m4 BitKeeper/deleted/.del-ha_example.m4~1dfb268163297708: Delete: config/ac-macros/ha_example.m4 BitKeeper/deleted/.del-ha_federated.m4~7acddd58286acfd6: Delete: config/ac-macros/ha_federated.m4 BitKeeper/deleted/.del-ha_innodb.m4~6f141fb5b80c1f39: Delete: config/ac-macros/ha_innodb.m4 BitKeeper/deleted/.del-ha_partition.m4~bc57067550be5f89: Delete: config/ac-macros/ha_partition.m4 BitKeeper/deleted/.del-ha_tina.m4~f658506ebbc113ca: Delete: config/ac-macros/ha_tina.m4 BitKeeper/deleted/.del-handlerton.cc.in~377156e7b06067cc: Delete: sql/handlerton.cc.in BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df: Delete: sql/handlerton-win.cc BUILD/SETUP.sh: WL#3201 Changes in configure arguments Makefile.am: WL#3201 changes in build subst names config/ac-macros/ha_berkeley.m4: WL#3201 remove unused variable Makefile is always made config/ac-macros/ha_ndbcluster.m4: WL#3201 remove unused variables Split big macro configure.in: WL#3201 out with storage.m4, in with plugins.m4 change how plugins are declared include makefiles, remove handlerton.cc, add sql_builtin.cc include/mysql/plugin.h: WL#3201 support static and dynamic build - MYSQL_DYNAMIC_PLUGIN libmysqld/Makefile.am: WL#3201 Storage engine files still left in sql subdir are not conditionally compiled. Should move them out soon, plugin/Makefile.am: WL#3201 update makefile plugin/fulltext/Makefile.am: WL#3201 update makefile plugin/fulltext/plugin_example.c: WL#3201 change to mysql_declare_plugin macro sql/Makefile.am: WL#3201 Storage engine files still left in sql subdir are not conditionally compiled. Should move them out soon, sql/ha_berkeley.cc: WL#3201 make into a plugin conditionally compile content sql/ha_federated.cc: WL#3201 make into a plugin conditionally compile content sql/ha_heap.cc: WL#3201 make into a plugin sql/ha_innodb.cc: WL#3201 make into a plugin conditionally compile content sql/ha_myisam.cc: WL#3201 make into a plugin sql/ha_myisammrg.cc: WL#3201 make into a plugin sql/ha_ndbcluster.cc: WL#3201 make into a plugin conditionally compile content sql/ha_ndbcluster_binlog.cc: WL#3201 make into a plugin conditionally compile content sql/ha_partition.cc: WL#3201 make into a plugin conditionally compile content sql/handler.cc: WL#3201 Simplify how storage engines are found by db_type (hopefully we can get rid of it soon) Code cleanup sql/handler.h: WL#3201 new DB_TYPE_FIRST_DYNAMIC new func ha_finalize_handlerton() remove ha_register_builtin_plugins() sql/log.cc: WL#3201 make into a plugin sql/mysqld.cc: WL#3201 remove ha_register_builtin_plugins() alter init order so that storage engines are initialized before first use sql/partition_info.cc: WL#3201 conditionally compile content sql/sql_delete.cc: WL#3201 conditionally include ha_innodb.h sql/sql_plugin.cc: WL#3201 All compiled in plugins are in mysqld_builtins[] add funcs for plugin finalization install builtin plugins on initialization sql/sql_show.cc: WL#3201 Fix to use plugin_foreach() sql/sql_yacc.yy: WL#3201 SHOW FULL PLUGIN storage/archive/Makefile.am: WL#3201 setup as plugin makefile storage/archive/ha_archive.cc: WL#3201 Convert into a plugin storage/archive/ha_archive.h: WL#3201 azlib.h now in local dir storage/blackhole/ha_blackhole.cc: WL#3201 convert into a plugin storage/csv/Makefile.am: WL#3201 setup as plugin makefile storage/csv/ha_tina.cc: WL#3201 remove conditional compilation on MYSQL_PLUGIN mysql_declare_plugin macro change storage/example/Makefile.am: WL#3201 fix as new-style plugin makefile storage/example/ha_example.cc: WL#3201 remove conditional compilation on MYSQL_PLUGIN mysql_declare_plugin macro change storage/innobase/Makefile.am: WL#3201 Lets make life easier and reduce innodb into a single library file config/ac-macros/plugins.m4: New BitKeeper file ``config/ac-macros/plugins.m4'' sql/sql_builtin.cc.in: New BitKeeper file ``sql/sql_builtin.cc.in'' storage/blackhole/Makefile.am: New BitKeeper file ``storage/blackhole/Makefile.am''
2006-04-13 22:49:29 +02:00
#include <mysql/plugin.h>
/* Variables for federated share methods */
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
static HASH federated_open_tables; // To track open tables
pthread_mutex_t federated_mutex; // To init the hash
static int federated_init= FALSE; // Checking the state of hash
Make storage engines "pluggable", handlerton work Makefile.am: Changes to autoconf subst config/ac-macros/ha_berkeley.m4: simplify config/ac-macros/ha_ndbcluster.m4: simplify config/ac-macros/ha_partition.m4: simplify configure.in: strip configure of storage engine specific cruft and simplify extra/Makefile.am: changes to autoconf/automake subst libmysqld/Makefile.am: only compile storage engines if required. make find object file a little smarter libmysqld/examples/Makefile.am: changes to autoconf subst mysql-test/Makefile.am: remove storage engine specific cruft mysql-test/r/ps_1general.result: cannot gaurantee order of results from 'show storage engines' mysql-test/r/show_check.result: fix test - frm file fails to be deleted if it is invalid mysql-test/r/sql_mode.result: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/r/warnings.result: isam no longer exists mysql-test/t/ps_1general.test: cannot gaurantee order of results from 'show storage engines' mysql-test/t/show_check.test: fix test - frm file fails to be deleted if it is invalid mysql-test/t/sql_mode.test: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/t/system_mysql_db_fix.test: change isam to myisam mysql-test/t/view.test: change isam to myisam mysql-test/t/warnings.test: isam no longer exists sql/Makefile.am: Make storage engines "pluggable" stage 1 only compile storage engines if included sql/examples/ha_example.cc: handlerton work sql/examples/ha_example.h: handlerton work sql/examples/ha_tina.cc: handlerton work sql/examples/ha_tina.h: handlerton work sql/ha_archive.cc: handlerton work sql/ha_archive.h: handlerton work sql/ha_berkeley.cc: handlerton work sql/ha_berkeley.h: handlerton work sql/ha_blackhole.cc: handlerton work sql/ha_federated.cc: handlerton work sql/ha_federated.h: handlerton work sql/ha_heap.cc: handlerton work sql/ha_innodb.cc: handlerton work sql/ha_innodb.h: handlerton work sql/ha_myisam.cc: handlerton work sql/ha_myisammrg.cc: handlerton work sql/ha_ndbcluster.cc: handlerton work sql/ha_ndbcluster.h: handlerton work sql/ha_partition.cc: handlerton work sql/handler.cc: start removing storage engine specific cruft sql/handler.h: start removing storage engine specific cruft db_type for binlog handlerton handlerton flag for not-user-selectable storage engines sql/lex.h: start removing storage engine specific cruft sql/log.cc: handlerton work give binlog handlerton a 'real' db_type sql/mysql_priv.h: start removing storage engine specific cruft sql/mysqld.cc: start removing storage engine specific cruft sql/set_var.cc: start removing storage engine specific cruft sql/sp_head.cc: start removing storage engine specific cruft sql/sql_class.cc: start removing storage engine specific cruft sql/sql_class.h: start removing storage engine specific cruft sql/sql_lex.h: start removing storage engine specific cruft sql/sql_manager.cc: start removing storage engine specific cruft sql/sql_manager.h: start removing storage engine specific cruft sql/sql_parse.cc: start removing storage engine specific cruft sql/sql_partition.cc: start removing storage engine specific cruft sql/sql_prepare.cc: start removing storage engine specific cruft sql/sql_show.cc: start removing storage engine specific cruft sql/sql_table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE start removing storage engine specific cruft sql/sql_update.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/sql_yacc.yy: start removing storage engine specific cruft test if we should throw error sql/table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/table.h: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/unireg.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE storage/ndb/include/kernel/kernel_types.h: added my_config.h storage/ndb/include/ndb_global.h.in: added my_config.h storage/ndb/include/ndb_types.h.in: added my_config.h config/ac-macros/storage.m4: New BitKeeper file ``config/ac-macros/storage.m4'' sql/handlerton.cc.in: New BitKeeper file ``sql/handlerton.cc.in''
2005-11-07 16:25:06 +01:00
/* Static declaration for handerton */
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
static handler *federated_create_handler(TABLE_SHARE *table);
static int federated_commit(THD *thd, bool all);
static int federated_rollback(THD *thd, bool all);
Make storage engines "pluggable", handlerton work Makefile.am: Changes to autoconf subst config/ac-macros/ha_berkeley.m4: simplify config/ac-macros/ha_ndbcluster.m4: simplify config/ac-macros/ha_partition.m4: simplify configure.in: strip configure of storage engine specific cruft and simplify extra/Makefile.am: changes to autoconf/automake subst libmysqld/Makefile.am: only compile storage engines if required. make find object file a little smarter libmysqld/examples/Makefile.am: changes to autoconf subst mysql-test/Makefile.am: remove storage engine specific cruft mysql-test/r/ps_1general.result: cannot gaurantee order of results from 'show storage engines' mysql-test/r/show_check.result: fix test - frm file fails to be deleted if it is invalid mysql-test/r/sql_mode.result: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/r/warnings.result: isam no longer exists mysql-test/t/ps_1general.test: cannot gaurantee order of results from 'show storage engines' mysql-test/t/show_check.test: fix test - frm file fails to be deleted if it is invalid mysql-test/t/sql_mode.test: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/t/system_mysql_db_fix.test: change isam to myisam mysql-test/t/view.test: change isam to myisam mysql-test/t/warnings.test: isam no longer exists sql/Makefile.am: Make storage engines "pluggable" stage 1 only compile storage engines if included sql/examples/ha_example.cc: handlerton work sql/examples/ha_example.h: handlerton work sql/examples/ha_tina.cc: handlerton work sql/examples/ha_tina.h: handlerton work sql/ha_archive.cc: handlerton work sql/ha_archive.h: handlerton work sql/ha_berkeley.cc: handlerton work sql/ha_berkeley.h: handlerton work sql/ha_blackhole.cc: handlerton work sql/ha_federated.cc: handlerton work sql/ha_federated.h: handlerton work sql/ha_heap.cc: handlerton work sql/ha_innodb.cc: handlerton work sql/ha_innodb.h: handlerton work sql/ha_myisam.cc: handlerton work sql/ha_myisammrg.cc: handlerton work sql/ha_ndbcluster.cc: handlerton work sql/ha_ndbcluster.h: handlerton work sql/ha_partition.cc: handlerton work sql/handler.cc: start removing storage engine specific cruft sql/handler.h: start removing storage engine specific cruft db_type for binlog handlerton handlerton flag for not-user-selectable storage engines sql/lex.h: start removing storage engine specific cruft sql/log.cc: handlerton work give binlog handlerton a 'real' db_type sql/mysql_priv.h: start removing storage engine specific cruft sql/mysqld.cc: start removing storage engine specific cruft sql/set_var.cc: start removing storage engine specific cruft sql/sp_head.cc: start removing storage engine specific cruft sql/sql_class.cc: start removing storage engine specific cruft sql/sql_class.h: start removing storage engine specific cruft sql/sql_lex.h: start removing storage engine specific cruft sql/sql_manager.cc: start removing storage engine specific cruft sql/sql_manager.h: start removing storage engine specific cruft sql/sql_parse.cc: start removing storage engine specific cruft sql/sql_partition.cc: start removing storage engine specific cruft sql/sql_prepare.cc: start removing storage engine specific cruft sql/sql_show.cc: start removing storage engine specific cruft sql/sql_table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE start removing storage engine specific cruft sql/sql_update.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/sql_yacc.yy: start removing storage engine specific cruft test if we should throw error sql/table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/table.h: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/unireg.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE storage/ndb/include/kernel/kernel_types.h: added my_config.h storage/ndb/include/ndb_global.h.in: added my_config.h storage/ndb/include/ndb_types.h.in: added my_config.h config/ac-macros/storage.m4: New BitKeeper file ``config/ac-macros/storage.m4'' sql/handlerton.cc.in: New BitKeeper file ``sql/handlerton.cc.in''
2005-11-07 16:25:06 +01:00
Next big patch for loadable storage engines! Handlerton array is now created instead of using sys_table_types_st. All storage engines can now have inits and giant ifdef's are now gone for startup. No compeltely clean yet, handlertons will next be merged with sys_table_types. Federated and archive now have real cleanup if their inits fail. sql/examples/ha_archive.cc: Modifications for new ha_init code. The init method now checks for errors and will not start up if the errors occur. sql/examples/ha_archive.h: Change for new init method. sql/examples/ha_example.cc: New handlerton pieces. sql/examples/ha_tina.cc: New handlerton pieces. sql/ha_berkeley.cc: New handlerton pieces, plus changes for ha_init changes. I'm not happy with our current "skip" setup. sql/ha_berkeley.h: Change in init return. sql/ha_blackhole.cc: Changes for new handlerton pieces. sql/ha_federated.cc: Changes for new handlerton and true cleanup code. sql/ha_heap.cc: Changes for new handlerton returns. sql/ha_innodb.cc: Changes for handlerton code. sql/ha_innodb.h: Change in init. sql/ha_myisam.cc: Changes for additional handlerton bits. sql/ha_myisammrg.cc: Changes for new handlerton bits. sql/ha_ndbcluster.cc: Changes for new handlerton bits. sql/ha_ndbcluster.h: Changes for handlerton bits. sql/handler.cc: Changes for ditching show_table_type_st types, and collapsing it into a handlerton array. The ha_init now just loops through all handlers to init (much cleaner...). handlertons and sys_table_types should be merged next. sql/handler.h: Additions for sys_table_types sql/log.cc: Clean up of binlog for changes in handlerton sql/mysql_priv.h: Removed unneeded define for binlog_init sql/sql_show.cc: Changes for change in handlerton to sys_table_types
2005-10-03 04:44:28 +02:00
/* Federated storage engine handlerton */
handlerton cleanup: duplicate fields removed, st_mysql_storage_engine added to support run-time handlerton initialization (no compiler warnings), handler API is now tied to MySQL version, handlerton->plugin mapping added (slot-based), dummy default_hton removed, plugin-type-specific initialization generalized, built-in plugins are now initialized too, --default-storage-engine no longer needs a list of storage engines in handle_options(). mysql-test-run.pl bugfixes include/mysql/plugin.h: added st_mysql_storage_engine made handlerton tied to MySQL version mysql-test/mysql-test-run.pl: bugfixes (umask, --no-defaults) mysql-test/r/ndb_dd_basic.result: update error message mysql-test/t/partition_mgm_err2.test: fix typo sql/ha_berkeley.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_berkeley.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_federated.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_heap.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_innodb.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_innodb.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_myisam.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_myisammrg.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster_binlog.cc: no 'name' in the handlerton anymore sql/ha_partition.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/handler.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, handlerton->plugin mapping sql/handler.h: handlerton cleanup: remove duplicate fields sql/log.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/mysql_priv.h: handler.h needs plugin.h sql/mysqld.cc: Convert --default-storage-engine to a handlerton* when all storage engines are initialized and not in getopt sql/set_var.cc: no name in the handlerton anymore sql/sql_parse.cc: no default_hton anymore sql/sql_partition.cc: no name in the handlerton anymore sql/sql_plugin.cc: generalize plugin type-specific initialization. initialize built-in plugins too sql/sql_plugin.h: generalize plugin type-specific initialization. sql/sql_show.cc: st_mysql_storage_engine structure no name in the handlerton anymore sql/sql_table.cc: no name in the handlerton anymore no default_hton anymore sql/sql_tablespace.cc: no name in the handlerton anymore no default_hton anymore sql/sql_yacc.yy: no default_hton anymore issue "unknown storage engine" warning where it is discovered storage/archive/ha_archive.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/archive/ha_archive.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/blackhole/ha_blackhole.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/csv/ha_tina.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/example/ha_example.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings
2006-05-28 14:51:01 +02:00
handlerton federated_hton;
Next big patch for loadable storage engines! Handlerton array is now created instead of using sys_table_types_st. All storage engines can now have inits and giant ifdef's are now gone for startup. No compeltely clean yet, handlertons will next be merged with sys_table_types. Federated and archive now have real cleanup if their inits fail. sql/examples/ha_archive.cc: Modifications for new ha_init code. The init method now checks for errors and will not start up if the errors occur. sql/examples/ha_archive.h: Change for new init method. sql/examples/ha_example.cc: New handlerton pieces. sql/examples/ha_tina.cc: New handlerton pieces. sql/ha_berkeley.cc: New handlerton pieces, plus changes for ha_init changes. I'm not happy with our current "skip" setup. sql/ha_berkeley.h: Change in init return. sql/ha_blackhole.cc: Changes for new handlerton pieces. sql/ha_federated.cc: Changes for new handlerton and true cleanup code. sql/ha_heap.cc: Changes for new handlerton returns. sql/ha_innodb.cc: Changes for handlerton code. sql/ha_innodb.h: Change in init. sql/ha_myisam.cc: Changes for additional handlerton bits. sql/ha_myisammrg.cc: Changes for new handlerton bits. sql/ha_ndbcluster.cc: Changes for new handlerton bits. sql/ha_ndbcluster.h: Changes for handlerton bits. sql/handler.cc: Changes for ditching show_table_type_st types, and collapsing it into a handlerton array. The ha_init now just loops through all handlers to init (much cleaner...). handlertons and sys_table_types should be merged next. sql/handler.h: Additions for sys_table_types sql/log.cc: Clean up of binlog for changes in handlerton sql/mysql_priv.h: Removed unneeded define for binlog_init sql/sql_show.cc: Changes for change in handlerton to sys_table_types
2005-10-03 04:44:28 +02:00
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
static handler *federated_create_handler(TABLE_SHARE *table)
Make storage engines "pluggable", handlerton work Makefile.am: Changes to autoconf subst config/ac-macros/ha_berkeley.m4: simplify config/ac-macros/ha_ndbcluster.m4: simplify config/ac-macros/ha_partition.m4: simplify configure.in: strip configure of storage engine specific cruft and simplify extra/Makefile.am: changes to autoconf/automake subst libmysqld/Makefile.am: only compile storage engines if required. make find object file a little smarter libmysqld/examples/Makefile.am: changes to autoconf subst mysql-test/Makefile.am: remove storage engine specific cruft mysql-test/r/ps_1general.result: cannot gaurantee order of results from 'show storage engines' mysql-test/r/show_check.result: fix test - frm file fails to be deleted if it is invalid mysql-test/r/sql_mode.result: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/r/warnings.result: isam no longer exists mysql-test/t/ps_1general.test: cannot gaurantee order of results from 'show storage engines' mysql-test/t/show_check.test: fix test - frm file fails to be deleted if it is invalid mysql-test/t/sql_mode.test: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/t/system_mysql_db_fix.test: change isam to myisam mysql-test/t/view.test: change isam to myisam mysql-test/t/warnings.test: isam no longer exists sql/Makefile.am: Make storage engines "pluggable" stage 1 only compile storage engines if included sql/examples/ha_example.cc: handlerton work sql/examples/ha_example.h: handlerton work sql/examples/ha_tina.cc: handlerton work sql/examples/ha_tina.h: handlerton work sql/ha_archive.cc: handlerton work sql/ha_archive.h: handlerton work sql/ha_berkeley.cc: handlerton work sql/ha_berkeley.h: handlerton work sql/ha_blackhole.cc: handlerton work sql/ha_federated.cc: handlerton work sql/ha_federated.h: handlerton work sql/ha_heap.cc: handlerton work sql/ha_innodb.cc: handlerton work sql/ha_innodb.h: handlerton work sql/ha_myisam.cc: handlerton work sql/ha_myisammrg.cc: handlerton work sql/ha_ndbcluster.cc: handlerton work sql/ha_ndbcluster.h: handlerton work sql/ha_partition.cc: handlerton work sql/handler.cc: start removing storage engine specific cruft sql/handler.h: start removing storage engine specific cruft db_type for binlog handlerton handlerton flag for not-user-selectable storage engines sql/lex.h: start removing storage engine specific cruft sql/log.cc: handlerton work give binlog handlerton a 'real' db_type sql/mysql_priv.h: start removing storage engine specific cruft sql/mysqld.cc: start removing storage engine specific cruft sql/set_var.cc: start removing storage engine specific cruft sql/sp_head.cc: start removing storage engine specific cruft sql/sql_class.cc: start removing storage engine specific cruft sql/sql_class.h: start removing storage engine specific cruft sql/sql_lex.h: start removing storage engine specific cruft sql/sql_manager.cc: start removing storage engine specific cruft sql/sql_manager.h: start removing storage engine specific cruft sql/sql_parse.cc: start removing storage engine specific cruft sql/sql_partition.cc: start removing storage engine specific cruft sql/sql_prepare.cc: start removing storage engine specific cruft sql/sql_show.cc: start removing storage engine specific cruft sql/sql_table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE start removing storage engine specific cruft sql/sql_update.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/sql_yacc.yy: start removing storage engine specific cruft test if we should throw error sql/table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/table.h: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/unireg.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE storage/ndb/include/kernel/kernel_types.h: added my_config.h storage/ndb/include/ndb_global.h.in: added my_config.h storage/ndb/include/ndb_types.h.in: added my_config.h config/ac-macros/storage.m4: New BitKeeper file ``config/ac-macros/storage.m4'' sql/handlerton.cc.in: New BitKeeper file ``sql/handlerton.cc.in''
2005-11-07 16:25:06 +01:00
{
return new ha_federated(table);
}
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
/* Function we use in the creation of our hash to get key */
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
static byte *federated_get_key(FEDERATED_SHARE *share, uint *length,
my_bool not_used __attribute__ ((unused)))
{
*length= share->table_name_length;
return (byte*) share->table_name;
}
WL# 2094 Federated Storage Handler This changeset/patch is on top of changesets 1.1814 and 1.1846 (for bugs 8033 and 8065) and now fixes bug 8535. These changes have been built and tested successfully on build.mysql.com handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does, per suggestion by Ingo in code review of patch 1.1846. ha_federated.h: declaration of federated_db_init() and federated_db_end() ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() - Fixed bug 8535, caused by NULL being quoted in write_row. This used to work (incorrectly) but a recent change was made in the server that exposed this sql/ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() sql/ha_federated.h: declaration of federated_db_init() and federated_db_end() sql/handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does.
2005-02-17 08:07:10 +01:00
/*
Initialize the federated handler.
SYNOPSIS
federated_db_init()
void
RETURN
FALSE OK
TRUE Error
*/
bool federated_db_init()
{
Next big patch for loadable storage engines! Handlerton array is now created instead of using sys_table_types_st. All storage engines can now have inits and giant ifdef's are now gone for startup. No compeltely clean yet, handlertons will next be merged with sys_table_types. Federated and archive now have real cleanup if their inits fail. sql/examples/ha_archive.cc: Modifications for new ha_init code. The init method now checks for errors and will not start up if the errors occur. sql/examples/ha_archive.h: Change for new init method. sql/examples/ha_example.cc: New handlerton pieces. sql/examples/ha_tina.cc: New handlerton pieces. sql/ha_berkeley.cc: New handlerton pieces, plus changes for ha_init changes. I'm not happy with our current "skip" setup. sql/ha_berkeley.h: Change in init return. sql/ha_blackhole.cc: Changes for new handlerton pieces. sql/ha_federated.cc: Changes for new handlerton and true cleanup code. sql/ha_heap.cc: Changes for new handlerton returns. sql/ha_innodb.cc: Changes for handlerton code. sql/ha_innodb.h: Change in init. sql/ha_myisam.cc: Changes for additional handlerton bits. sql/ha_myisammrg.cc: Changes for new handlerton bits. sql/ha_ndbcluster.cc: Changes for new handlerton bits. sql/ha_ndbcluster.h: Changes for handlerton bits. sql/handler.cc: Changes for ditching show_table_type_st types, and collapsing it into a handlerton array. The ha_init now just loops through all handlers to init (much cleaner...). handlertons and sys_table_types should be merged next. sql/handler.h: Additions for sys_table_types sql/log.cc: Clean up of binlog for changes in handlerton sql/mysql_priv.h: Removed unneeded define for binlog_init sql/sql_show.cc: Changes for change in handlerton to sys_table_types
2005-10-03 04:44:28 +02:00
DBUG_ENTER("federated_db_init");
handlerton cleanup: duplicate fields removed, st_mysql_storage_engine added to support run-time handlerton initialization (no compiler warnings), handler API is now tied to MySQL version, handlerton->plugin mapping added (slot-based), dummy default_hton removed, plugin-type-specific initialization generalized, built-in plugins are now initialized too, --default-storage-engine no longer needs a list of storage engines in handle_options(). mysql-test-run.pl bugfixes include/mysql/plugin.h: added st_mysql_storage_engine made handlerton tied to MySQL version mysql-test/mysql-test-run.pl: bugfixes (umask, --no-defaults) mysql-test/r/ndb_dd_basic.result: update error message mysql-test/t/partition_mgm_err2.test: fix typo sql/ha_berkeley.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_berkeley.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_federated.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_heap.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_innodb.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_innodb.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_myisam.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_myisammrg.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster_binlog.cc: no 'name' in the handlerton anymore sql/ha_partition.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/handler.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, handlerton->plugin mapping sql/handler.h: handlerton cleanup: remove duplicate fields sql/log.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/mysql_priv.h: handler.h needs plugin.h sql/mysqld.cc: Convert --default-storage-engine to a handlerton* when all storage engines are initialized and not in getopt sql/set_var.cc: no name in the handlerton anymore sql/sql_parse.cc: no default_hton anymore sql/sql_partition.cc: no name in the handlerton anymore sql/sql_plugin.cc: generalize plugin type-specific initialization. initialize built-in plugins too sql/sql_plugin.h: generalize plugin type-specific initialization. sql/sql_show.cc: st_mysql_storage_engine structure no name in the handlerton anymore sql/sql_table.cc: no name in the handlerton anymore no default_hton anymore sql/sql_tablespace.cc: no name in the handlerton anymore no default_hton anymore sql/sql_yacc.yy: no default_hton anymore issue "unknown storage engine" warning where it is discovered storage/archive/ha_archive.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/archive/ha_archive.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/blackhole/ha_blackhole.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/csv/ha_tina.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/example/ha_example.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings
2006-05-28 14:51:01 +02:00
federated_hton.state= SHOW_OPTION_YES;
federated_hton.db_type= DB_TYPE_FEDERATED_DB;
federated_hton.commit= federated_commit;
federated_hton.rollback= federated_rollback;
federated_hton.create= federated_create_handler;
federated_hton.panic= federated_db_end;
federated_hton.flags= HTON_ALTER_NOT_SUPPORTED;
Next big patch for loadable storage engines! Handlerton array is now created instead of using sys_table_types_st. All storage engines can now have inits and giant ifdef's are now gone for startup. No compeltely clean yet, handlertons will next be merged with sys_table_types. Federated and archive now have real cleanup if their inits fail. sql/examples/ha_archive.cc: Modifications for new ha_init code. The init method now checks for errors and will not start up if the errors occur. sql/examples/ha_archive.h: Change for new init method. sql/examples/ha_example.cc: New handlerton pieces. sql/examples/ha_tina.cc: New handlerton pieces. sql/ha_berkeley.cc: New handlerton pieces, plus changes for ha_init changes. I'm not happy with our current "skip" setup. sql/ha_berkeley.h: Change in init return. sql/ha_blackhole.cc: Changes for new handlerton pieces. sql/ha_federated.cc: Changes for new handlerton and true cleanup code. sql/ha_heap.cc: Changes for new handlerton returns. sql/ha_innodb.cc: Changes for handlerton code. sql/ha_innodb.h: Change in init. sql/ha_myisam.cc: Changes for additional handlerton bits. sql/ha_myisammrg.cc: Changes for new handlerton bits. sql/ha_ndbcluster.cc: Changes for new handlerton bits. sql/ha_ndbcluster.h: Changes for handlerton bits. sql/handler.cc: Changes for ditching show_table_type_st types, and collapsing it into a handlerton array. The ha_init now just loops through all handlers to init (much cleaner...). handlertons and sys_table_types should be merged next. sql/handler.h: Additions for sys_table_types sql/log.cc: Clean up of binlog for changes in handlerton sql/mysql_priv.h: Removed unneeded define for binlog_init sql/sql_show.cc: Changes for change in handlerton to sys_table_types
2005-10-03 04:44:28 +02:00
if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST))
goto error;
if (!hash_init(&federated_open_tables, system_charset_info, 32, 0, 0,
Next big patch for loadable storage engines! Handlerton array is now created instead of using sys_table_types_st. All storage engines can now have inits and giant ifdef's are now gone for startup. No compeltely clean yet, handlertons will next be merged with sys_table_types. Federated and archive now have real cleanup if their inits fail. sql/examples/ha_archive.cc: Modifications for new ha_init code. The init method now checks for errors and will not start up if the errors occur. sql/examples/ha_archive.h: Change for new init method. sql/examples/ha_example.cc: New handlerton pieces. sql/examples/ha_tina.cc: New handlerton pieces. sql/ha_berkeley.cc: New handlerton pieces, plus changes for ha_init changes. I'm not happy with our current "skip" setup. sql/ha_berkeley.h: Change in init return. sql/ha_blackhole.cc: Changes for new handlerton pieces. sql/ha_federated.cc: Changes for new handlerton and true cleanup code. sql/ha_heap.cc: Changes for new handlerton returns. sql/ha_innodb.cc: Changes for handlerton code. sql/ha_innodb.h: Change in init. sql/ha_myisam.cc: Changes for additional handlerton bits. sql/ha_myisammrg.cc: Changes for new handlerton bits. sql/ha_ndbcluster.cc: Changes for new handlerton bits. sql/ha_ndbcluster.h: Changes for handlerton bits. sql/handler.cc: Changes for ditching show_table_type_st types, and collapsing it into a handlerton array. The ha_init now just loops through all handlers to init (much cleaner...). handlertons and sys_table_types should be merged next. sql/handler.h: Additions for sys_table_types sql/log.cc: Clean up of binlog for changes in handlerton sql/mysql_priv.h: Removed unneeded define for binlog_init sql/sql_show.cc: Changes for change in handlerton to sys_table_types
2005-10-03 04:44:28 +02:00
(hash_get_key) federated_get_key, 0, 0))
{
federated_init= TRUE;
DBUG_RETURN(FALSE);
}
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
VOID(pthread_mutex_destroy(&federated_mutex));
Next big patch for loadable storage engines! Handlerton array is now created instead of using sys_table_types_st. All storage engines can now have inits and giant ifdef's are now gone for startup. No compeltely clean yet, handlertons will next be merged with sys_table_types. Federated and archive now have real cleanup if their inits fail. sql/examples/ha_archive.cc: Modifications for new ha_init code. The init method now checks for errors and will not start up if the errors occur. sql/examples/ha_archive.h: Change for new init method. sql/examples/ha_example.cc: New handlerton pieces. sql/examples/ha_tina.cc: New handlerton pieces. sql/ha_berkeley.cc: New handlerton pieces, plus changes for ha_init changes. I'm not happy with our current "skip" setup. sql/ha_berkeley.h: Change in init return. sql/ha_blackhole.cc: Changes for new handlerton pieces. sql/ha_federated.cc: Changes for new handlerton and true cleanup code. sql/ha_heap.cc: Changes for new handlerton returns. sql/ha_innodb.cc: Changes for handlerton code. sql/ha_innodb.h: Change in init. sql/ha_myisam.cc: Changes for additional handlerton bits. sql/ha_myisammrg.cc: Changes for new handlerton bits. sql/ha_ndbcluster.cc: Changes for new handlerton bits. sql/ha_ndbcluster.h: Changes for handlerton bits. sql/handler.cc: Changes for ditching show_table_type_st types, and collapsing it into a handlerton array. The ha_init now just loops through all handlers to init (much cleaner...). handlertons and sys_table_types should be merged next. sql/handler.h: Additions for sys_table_types sql/log.cc: Clean up of binlog for changes in handlerton sql/mysql_priv.h: Removed unneeded define for binlog_init sql/sql_show.cc: Changes for change in handlerton to sys_table_types
2005-10-03 04:44:28 +02:00
error:
have_federated_db= SHOW_OPTION_DISABLED; // If we couldn't use handler
DBUG_RETURN(TRUE);
WL# 2094 Federated Storage Handler This changeset/patch is on top of changesets 1.1814 and 1.1846 (for bugs 8033 and 8065) and now fixes bug 8535. These changes have been built and tested successfully on build.mysql.com handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does, per suggestion by Ingo in code review of patch 1.1846. ha_federated.h: declaration of federated_db_init() and federated_db_end() ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() - Fixed bug 8535, caused by NULL being quoted in write_row. This used to work (incorrectly) but a recent change was made in the server that exposed this sql/ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() sql/ha_federated.h: declaration of federated_db_init() and federated_db_end() sql/handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does.
2005-02-17 08:07:10 +01:00
}
/*
Release the federated handler.
SYNOPSIS
federated_db_end()
RETURN
FALSE OK
*/
Make storage engines "pluggable", handlerton work Makefile.am: Changes to autoconf subst config/ac-macros/ha_berkeley.m4: simplify config/ac-macros/ha_ndbcluster.m4: simplify config/ac-macros/ha_partition.m4: simplify configure.in: strip configure of storage engine specific cruft and simplify extra/Makefile.am: changes to autoconf/automake subst libmysqld/Makefile.am: only compile storage engines if required. make find object file a little smarter libmysqld/examples/Makefile.am: changes to autoconf subst mysql-test/Makefile.am: remove storage engine specific cruft mysql-test/r/ps_1general.result: cannot gaurantee order of results from 'show storage engines' mysql-test/r/show_check.result: fix test - frm file fails to be deleted if it is invalid mysql-test/r/sql_mode.result: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/r/warnings.result: isam no longer exists mysql-test/t/ps_1general.test: cannot gaurantee order of results from 'show storage engines' mysql-test/t/show_check.test: fix test - frm file fails to be deleted if it is invalid mysql-test/t/sql_mode.test: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/t/system_mysql_db_fix.test: change isam to myisam mysql-test/t/view.test: change isam to myisam mysql-test/t/warnings.test: isam no longer exists sql/Makefile.am: Make storage engines "pluggable" stage 1 only compile storage engines if included sql/examples/ha_example.cc: handlerton work sql/examples/ha_example.h: handlerton work sql/examples/ha_tina.cc: handlerton work sql/examples/ha_tina.h: handlerton work sql/ha_archive.cc: handlerton work sql/ha_archive.h: handlerton work sql/ha_berkeley.cc: handlerton work sql/ha_berkeley.h: handlerton work sql/ha_blackhole.cc: handlerton work sql/ha_federated.cc: handlerton work sql/ha_federated.h: handlerton work sql/ha_heap.cc: handlerton work sql/ha_innodb.cc: handlerton work sql/ha_innodb.h: handlerton work sql/ha_myisam.cc: handlerton work sql/ha_myisammrg.cc: handlerton work sql/ha_ndbcluster.cc: handlerton work sql/ha_ndbcluster.h: handlerton work sql/ha_partition.cc: handlerton work sql/handler.cc: start removing storage engine specific cruft sql/handler.h: start removing storage engine specific cruft db_type for binlog handlerton handlerton flag for not-user-selectable storage engines sql/lex.h: start removing storage engine specific cruft sql/log.cc: handlerton work give binlog handlerton a 'real' db_type sql/mysql_priv.h: start removing storage engine specific cruft sql/mysqld.cc: start removing storage engine specific cruft sql/set_var.cc: start removing storage engine specific cruft sql/sp_head.cc: start removing storage engine specific cruft sql/sql_class.cc: start removing storage engine specific cruft sql/sql_class.h: start removing storage engine specific cruft sql/sql_lex.h: start removing storage engine specific cruft sql/sql_manager.cc: start removing storage engine specific cruft sql/sql_manager.h: start removing storage engine specific cruft sql/sql_parse.cc: start removing storage engine specific cruft sql/sql_partition.cc: start removing storage engine specific cruft sql/sql_prepare.cc: start removing storage engine specific cruft sql/sql_show.cc: start removing storage engine specific cruft sql/sql_table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE start removing storage engine specific cruft sql/sql_update.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/sql_yacc.yy: start removing storage engine specific cruft test if we should throw error sql/table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/table.h: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/unireg.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE storage/ndb/include/kernel/kernel_types.h: added my_config.h storage/ndb/include/ndb_global.h.in: added my_config.h storage/ndb/include/ndb_types.h.in: added my_config.h config/ac-macros/storage.m4: New BitKeeper file ``config/ac-macros/storage.m4'' sql/handlerton.cc.in: New BitKeeper file ``sql/handlerton.cc.in''
2005-11-07 16:25:06 +01:00
int federated_db_end(ha_panic_function type)
WL# 2094 Federated Storage Handler This changeset/patch is on top of changesets 1.1814 and 1.1846 (for bugs 8033 and 8065) and now fixes bug 8535. These changes have been built and tested successfully on build.mysql.com handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does, per suggestion by Ingo in code review of patch 1.1846. ha_federated.h: declaration of federated_db_init() and federated_db_end() ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() - Fixed bug 8535, caused by NULL being quoted in write_row. This used to work (incorrectly) but a recent change was made in the server that exposed this sql/ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() sql/ha_federated.h: declaration of federated_db_init() and federated_db_end() sql/handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does.
2005-02-17 08:07:10 +01:00
{
if (federated_init)
{
hash_free(&federated_open_tables);
VOID(pthread_mutex_destroy(&federated_mutex));
}
federated_init= 0;
Make storage engines "pluggable", handlerton work Makefile.am: Changes to autoconf subst config/ac-macros/ha_berkeley.m4: simplify config/ac-macros/ha_ndbcluster.m4: simplify config/ac-macros/ha_partition.m4: simplify configure.in: strip configure of storage engine specific cruft and simplify extra/Makefile.am: changes to autoconf/automake subst libmysqld/Makefile.am: only compile storage engines if required. make find object file a little smarter libmysqld/examples/Makefile.am: changes to autoconf subst mysql-test/Makefile.am: remove storage engine specific cruft mysql-test/r/ps_1general.result: cannot gaurantee order of results from 'show storage engines' mysql-test/r/show_check.result: fix test - frm file fails to be deleted if it is invalid mysql-test/r/sql_mode.result: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/r/warnings.result: isam no longer exists mysql-test/t/ps_1general.test: cannot gaurantee order of results from 'show storage engines' mysql-test/t/show_check.test: fix test - frm file fails to be deleted if it is invalid mysql-test/t/sql_mode.test: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/t/system_mysql_db_fix.test: change isam to myisam mysql-test/t/view.test: change isam to myisam mysql-test/t/warnings.test: isam no longer exists sql/Makefile.am: Make storage engines "pluggable" stage 1 only compile storage engines if included sql/examples/ha_example.cc: handlerton work sql/examples/ha_example.h: handlerton work sql/examples/ha_tina.cc: handlerton work sql/examples/ha_tina.h: handlerton work sql/ha_archive.cc: handlerton work sql/ha_archive.h: handlerton work sql/ha_berkeley.cc: handlerton work sql/ha_berkeley.h: handlerton work sql/ha_blackhole.cc: handlerton work sql/ha_federated.cc: handlerton work sql/ha_federated.h: handlerton work sql/ha_heap.cc: handlerton work sql/ha_innodb.cc: handlerton work sql/ha_innodb.h: handlerton work sql/ha_myisam.cc: handlerton work sql/ha_myisammrg.cc: handlerton work sql/ha_ndbcluster.cc: handlerton work sql/ha_ndbcluster.h: handlerton work sql/ha_partition.cc: handlerton work sql/handler.cc: start removing storage engine specific cruft sql/handler.h: start removing storage engine specific cruft db_type for binlog handlerton handlerton flag for not-user-selectable storage engines sql/lex.h: start removing storage engine specific cruft sql/log.cc: handlerton work give binlog handlerton a 'real' db_type sql/mysql_priv.h: start removing storage engine specific cruft sql/mysqld.cc: start removing storage engine specific cruft sql/set_var.cc: start removing storage engine specific cruft sql/sp_head.cc: start removing storage engine specific cruft sql/sql_class.cc: start removing storage engine specific cruft sql/sql_class.h: start removing storage engine specific cruft sql/sql_lex.h: start removing storage engine specific cruft sql/sql_manager.cc: start removing storage engine specific cruft sql/sql_manager.h: start removing storage engine specific cruft sql/sql_parse.cc: start removing storage engine specific cruft sql/sql_partition.cc: start removing storage engine specific cruft sql/sql_prepare.cc: start removing storage engine specific cruft sql/sql_show.cc: start removing storage engine specific cruft sql/sql_table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE start removing storage engine specific cruft sql/sql_update.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/sql_yacc.yy: start removing storage engine specific cruft test if we should throw error sql/table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/table.h: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/unireg.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE storage/ndb/include/kernel/kernel_types.h: added my_config.h storage/ndb/include/ndb_global.h.in: added my_config.h storage/ndb/include/ndb_types.h.in: added my_config.h config/ac-macros/storage.m4: New BitKeeper file ``config/ac-macros/storage.m4'' sql/handlerton.cc.in: New BitKeeper file ``sql/handlerton.cc.in''
2005-11-07 16:25:06 +01:00
return 0;
}
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
/*
Check (in create) whether the tables exists, and that it can be connected to
SYNOPSIS
check_foreign_data_source()
share pointer to FEDERATED share
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
table_create_flag tells us that ::create is the caller,
therefore, return CANT_CREATE_FEDERATED_TABLE
DESCRIPTION
This method first checks that the connection information that parse url
has populated into the share will be sufficient to connect to the foreign
table, and if so, does the foreign table exist.
*/
static int check_foreign_data_source(FEDERATED_SHARE *share,
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
bool table_create_flag)
{
char escaped_table_name[NAME_LEN*2];
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
char query_buffer[FEDERATED_QUERY_BUFFER_SIZE];
char error_buffer[FEDERATED_QUERY_BUFFER_SIZE];
uint error_code;
String query(query_buffer, sizeof(query_buffer), &my_charset_bin);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
MYSQL *mysql;
DBUG_ENTER("ha_federated::check_foreign_data_source");
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/* Zero the length, otherwise the string will have misc chars */
query.length(0);
/* error out if we can't alloc memory for mysql_init(NULL) (per Georg) */
if (!(mysql= mysql_init(NULL)))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
/* check if we can connect */
if (!mysql_real_connect(mysql,
share->hostname,
share->username,
share->password,
share->database,
share->port,
share->socket, 0))
{
/*
we want the correct error message, but it to return
ER_CANT_CREATE_FEDERATED_TABLE if called by ::create
*/
error_code= (table_create_flag ?
ER_CANT_CREATE_FEDERATED_TABLE :
ER_CONNECT_TO_FOREIGN_DATA_SOURCE);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
my_sprintf(error_buffer,
(error_buffer,
"database: '%s' username: '%s' hostname: '%s'",
share->database, share->username, share->hostname));
my_error(ER_CONNECT_TO_FOREIGN_DATA_SOURCE, MYF(0), error_buffer);
goto error;
}
else
{
/*
Since we do not support transactions at this version, we can let the
client API silently reconnect. For future versions, we will need more
logic to deal with transactions
*/
mysql->reconnect= 1;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/*
Note: I am not using INORMATION_SCHEMA because this needs to work with
versions prior to 5.0
if we can connect, then make sure the table exists
the query will be: SELECT * FROM `tablename` WHERE 1=0
*/
query.append(FEDERATED_SELECT);
query.append(FEDERATED_STAR);
query.append(FEDERATED_FROM);
query.append(FEDERATED_BTICK);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
escape_string_for_mysql(&my_charset_bin, (char *)escaped_table_name,
sizeof(escaped_table_name),
share->table_name,
share->table_name_length);
query.append(escaped_table_name);
query.append(FEDERATED_BTICK);
query.append(FEDERATED_WHERE);
query.append(FEDERATED_FALSE);
DBUG_PRINT("info", ("check_foreign_data_source query %s",
query.c_ptr_quick()));
if (mysql_real_query(mysql, query.ptr(), query.length()))
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
error_code= table_create_flag ?
ER_CANT_CREATE_FEDERATED_TABLE : ER_FOREIGN_DATA_SOURCE_DOESNT_EXIST;
my_sprintf(error_buffer, (error_buffer, "error: %d '%s'",
mysql_errno(mysql), mysql_error(mysql)));
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
my_error(error_code, MYF(0), error_buffer);
goto error;
}
}
error_code=0;
error:
mysql_close(mysql);
DBUG_RETURN(error_code);
}
static int parse_url_error(FEDERATED_SHARE *share, TABLE *table, int error_num)
{
char buf[FEDERATED_QUERY_BUFFER_SIZE];
int buf_len;
DBUG_ENTER("ha_federated parse_url_error");
if (share->scheme)
{
DBUG_PRINT("info",
("error: parse_url. Returning error code %d \
freeing share->scheme %lx", error_num, share->scheme));
my_free((gptr) share->scheme, MYF(0));
share->scheme= 0;
}
buf_len= min(table->s->connect_string.length,
FEDERATED_QUERY_BUFFER_SIZE-1);
strmake(buf, table->s->connect_string.str, buf_len);
my_error(error_num, MYF(0), buf);
DBUG_RETURN(error_num);
}
/*
Parse connection info from table->s->connect_string
SYNOPSIS
parse_url()
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
share pointer to FEDERATED share
table pointer to current TABLE class
table_create_flag determines what error to throw
DESCRIPTION
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
Populates the share with information about the connection
to the foreign database that will serve as the data source.
This string must be specified (currently) in the "comment" field,
listed in the CREATE TABLE statement.
This string MUST be in the format of any of these:
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
scheme://username:password@hostname:port/database/table
scheme://username@hostname/database/table
scheme://username@hostname:port/database/table
scheme://username:password@hostname/database/table
An Example:
mysql://joe:joespass@192.168.1.111:9308/federated/testtable
***IMPORTANT***
Currently, only "mysql://" is supported.
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
'password' and 'port' are both optional.
RETURN VALUE
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
0 success
error_num particular error code
*/
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
static int parse_url(FEDERATED_SHARE *share, TABLE *table,
uint table_create_flag)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
uint error_num= (table_create_flag ?
ER_FOREIGN_DATA_STRING_INVALID_CANT_CREATE :
ER_FOREIGN_DATA_STRING_INVALID);
DBUG_ENTER("ha_federated::parse_url");
share->port= 0;
Fixed problems found by valgrind Fixed problems in test suite where some test failed Fixed access to not initialized memory in federated Fixed access to not initialized memory when using BIT fields in internal temporary tables BitKeeper/etc/ignore: added libmysqld/sql_cursor.h mysql-test/r/information_schema.result: Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middlecd mysql-test/r/information_schema_inno.result: Remove used tables at start mysql-test/r/multi_statement.result: Remove used tables at start mysql-test/r/temp_table.result: Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle mysql-test/r/type_bit.result: More tests mysql-test/t/information_schema.test: Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle mysql-test/t/information_schema_inno.test: Remove used tables at start mysql-test/t/multi_statement.test: Remove used tables at start mysql-test/t/temp_table.test: Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle mysql-test/t/type_bit.test: More tests mysql-test/valgrind.supp: Removed some valgrind warnings that isn't errors sql/ha_federated.cc: Fixed errors discovered by valgrind: - Socket was not initialized - share->scheme was deleted while there was still pointer into it from the hash sql/item_func.h: Remove access to table object from cleanup() as the table object may have been dropped earlier (In case of temporary tables or of close_thread_tables() is run before cleanup()) This fixed a bug with access to already freed memory sql/sql_base.cc: Reset variables used by fulltext sql/sql_select.cc: Fixed various problems with bit fields when used in internal temporary tables. Calculate space needed for bit fields correctly (previously we allocated more space than needed for rows in heap/myisam tables)
2005-09-22 02:23:07 +02:00
share->socket= 0;
DBUG_PRINT("info", ("Length: %d", table->s->connect_string.length));
DBUG_PRINT("info", ("String: '%.*s'", table->s->connect_string.length,
table->s->connect_string.str));
share->scheme= my_strndup((const byte*)table->s->
Fixed problems found by valgrind Fixed problems in test suite where some test failed Fixed access to not initialized memory in federated Fixed access to not initialized memory when using BIT fields in internal temporary tables BitKeeper/etc/ignore: added libmysqld/sql_cursor.h mysql-test/r/information_schema.result: Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middlecd mysql-test/r/information_schema_inno.result: Remove used tables at start mysql-test/r/multi_statement.result: Remove used tables at start mysql-test/r/temp_table.result: Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle mysql-test/r/type_bit.result: More tests mysql-test/t/information_schema.test: Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle mysql-test/t/information_schema_inno.test: Remove used tables at start mysql-test/t/multi_statement.test: Remove used tables at start mysql-test/t/temp_table.test: Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle mysql-test/t/type_bit.test: More tests mysql-test/valgrind.supp: Removed some valgrind warnings that isn't errors sql/ha_federated.cc: Fixed errors discovered by valgrind: - Socket was not initialized - share->scheme was deleted while there was still pointer into it from the hash sql/item_func.h: Remove access to table object from cleanup() as the table object may have been dropped earlier (In case of temporary tables or of close_thread_tables() is run before cleanup()) This fixed a bug with access to already freed memory sql/sql_base.cc: Reset variables used by fulltext sql/sql_select.cc: Fixed various problems with bit fields when used in internal temporary tables. Calculate space needed for bit fields correctly (previously we allocated more space than needed for rows in heap/myisam tables)
2005-09-22 02:23:07 +02:00
connect_string.str,
table->s->connect_string.length,
MYF(0));
// Add a null for later termination of table name
share->scheme[table->s->connect_string.length]= 0;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_PRINT("info",("parse_url alloced share->scheme %lx", share->scheme));
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/*
remove addition of null terminator and store length
for each string in share
*/
if (!(share->username= strstr(share->scheme, "://")))
goto error;
share->scheme[share->username - share->scheme]= '\0';
if (strcmp(share->scheme, "mysql") != 0)
goto error;
share->username+= 3;
if (!(share->hostname= strchr(share->username, '@')))
goto error;
share->username[share->hostname - share->username]= '\0';
share->hostname++;
if ((share->password= strchr(share->username, ':')))
{
share->username[share->password - share->username]= '\0';
share->password++;
share->username= share->username;
/* make sure there isn't an extra / or @ */
if ((strchr(share->password, '/') || strchr(share->hostname, '@')))
goto error;
/*
Found that if the string is:
user:@hostname:port/database/table
Then password is a null string, so set to NULL
*/
if ((share->password[0] == '\0'))
share->password= NULL;
}
else
share->username= share->username;
/* make sure there isn't an extra / or @ */
if ((strchr(share->username, '/')) || (strchr(share->hostname, '@')))
goto error;
if (!(share->database= strchr(share->hostname, '/')))
goto error;
share->hostname[share->database - share->hostname]= '\0';
share->database++;
if ((share->sport= strchr(share->hostname, ':')))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
{
share->hostname[share->sport - share->hostname]= '\0';
share->sport++;
if (share->sport[0] == '\0')
share->sport= NULL;
else
share->port= atoi(share->sport);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
}
if (!(share->table_name= strchr(share->database, '/')))
goto error;
share->database[share->table_name - share->database]= '\0';
share->table_name++;
share->table_name_length= strlen(share->table_name);
/* make sure there's not an extra / */
if ((strchr(share->table_name, '/')))
goto error;
if (share->hostname[0] == '\0')
share->hostname= NULL;
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
if (!share->port)
{
if (strcmp(share->hostname, my_localhost) == 0)
share->socket= my_strdup(MYSQL_UNIX_ADDR, MYF(0));
else
share->port= MYSQL_PORT;
}
DBUG_PRINT("info",
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
("scheme: %s username: %s password: %s \
hostname: %s port: %d database: %s tablename: %s",
share->scheme, share->username, share->password,
share->hostname, share->port, share->database,
share->table_name));
DBUG_RETURN(0);
error:
DBUG_RETURN(parse_url_error(share, table, error_num));
}
A fix and a test case for Bug#10760 and complementary cleanups. The idea of the patch is that every cursor gets its own lock id for table level locking. Thus cursors are protected from updates performed within the same connection. Additionally a list of transient (must be closed at commit) cursors is maintained and all transient cursors are closed when necessary. Lastly, this patch adds support for deadlock timeouts to TLL locking when using cursors. + post-review fixes. include/thr_lock.h: - add a notion of lock owner to table level locking. When using cursors, lock owner can not be identified by a thread id any more, as we must protect cursors from updates issued within the same connection (thread). So, each cursor has its own lock identifier to use with table level locking. - extend return values of thr_lock and thr_multi_lock with THR_LOCK_TIMEOUT and THR_LOCK_DEADLOCK, since these conditions are now possible (see comments to thr_lock.c) mysys/thr_lock.c: Better support for cursors: - use THR_LOCK_OWNER * as lock identifier, not pthread_t. - check and return an error for a trivial deadlock case, when an update statement is issued to a table locked by a cursor which has been previously opened in the same connection. - add support for locking timeouts: with use of cursors, trivial deadlocks can occur. For now the only remedy is the lock wait timeout, which is initialized from a new global variable 'table_lock_wait_timeout' Example of a deadlock (assuming the storage engine does not downgrade locks): con1: open cursor for select * from t1; con2: open cursor for select * from t2; con1: update t2 set id=id*2; -- blocked con2: update t1 set id=id*2; -- deadlock Lock timeouts are active only if a connection is using cursors. - the check in the wait_for_lock loop has been changed from data->cond != cond to data->cond != 0. data->cond is zeroed in every place it's changed. - added comments sql/examples/ha_archive.cc: - extend the handlerton with the info about cursor behaviour at commit. sql/examples/ha_archive.h: - ctor moved to .cc to make use of archive handlerton sql/examples/ha_example.cc: - add handlerton instance, init handler::ht with it sql/examples/ha_example.h: - ctor moved to .cc to make use of ha_example handlerton sql/examples/ha_tina.cc: - add handlerton instance, init handler::ht with it sql/examples/ha_tina.h: - ctor moved to .cc to make use of CSV handlerton sql/ha_berkeley.cc: - init handlerton::flags and handler::ht sql/ha_berkeley.h: - ctor moved to .cc to make use of BerkeleyDB handlerton sql/ha_blackhole.cc: - add handlerton instance, init handler::ht with it sql/ha_blackhole.h: - ctor moved to .cc to make use of blackhole handlerton sql/ha_federated.cc: - add handlerton instance, init handler::ht with it sql/ha_federated.h: - ctor moved to .cc to make use of federated handlerton sql/ha_heap.cc: - add handlerton instance, init handler::ht with it sql/ha_heap.h: - ctor moved to .cc to make use of ha_heap handlerton sql/ha_innodb.cc: - init handlerton::flags and handler::ht of innobase storage engine sql/ha_innodb.h: - ctor moved to .cc to make use of archive handlerton sql/ha_myisam.cc: - add handlerton instance, init handler::ht with it sql/ha_myisam.h: - ctor moved to .cc to make use of MyISAM handlerton sql/ha_myisammrg.cc: - init handler::ht in the ctor sql/ha_myisammrg.h: - ctor moved to .cc to make use of MyISAM MERGE handlerton sql/ha_ndbcluster.cc: - init handlerton::flags and handler::ht sql/handler.cc: - drop support for ISAM storage engine, which was removed from 5.0 - close all "transient" cursors at COMMIT/ROLLBACK. A "transient" SQL level cursor is a cursor that uses tables that have a transaction- specific state. sql/handler.h: - extend struct handlerton with flags, add handlerton *ht to every handler instance. sql/lock.cc: - extend mysql_lock_tables to send error to the client if thr_multi_lock returns a timeout or a deadlock error. sql/mysqld.cc: - add server option --table_lock_wait_timeout (in seconds) sql/set_var.cc: - add new global variable 'table_lock_wait_timeout' to specify a wait timeout for table-level locks of MySQL (in seconds). The default timeout is 50 seconds. The timeout is active only if the connection has open cursors. sql/sql_class.cc: - implement Statement_map::close_transient_cursors - safety suggests that we need an assert ensuring llock_info->n_cursors is functioning properly, adjust destruction of the Statement_map to allow such assert in THD::~THD sql/sql_class.h: - add support for Cursors registry to Statement map. sql/sql_prepare.cc: - maintain a list of cursors that must be closed at commit/rollback. sql/sql_select.cc: - extend class Cursor to support specific at-COMMIT/ROLLBACK behavior. If a cursor uses tables of a storage engine that invalidates all open tables at COMMIT/ROLLBACK, it must be closed before COMMIT/ROLLBACK is executed. sql/sql_select.h: - add an own lock_id and commit/rollback status flag to class Cursor tests/mysql_client_test.c: A test case for Bug#10760 and complementary issues: test a simple deadlock case too. mysql-test/var: New BitKeeper file ``mysql-test/var''
2005-07-19 20:21:12 +02:00
/*****************************************************************************
** FEDERATED tables
*****************************************************************************/
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
ha_federated::ha_federated(TABLE_SHARE *table_arg)
A fix and a test case for Bug#10760 and complementary cleanups. The idea of the patch is that every cursor gets its own lock id for table level locking. Thus cursors are protected from updates performed within the same connection. Additionally a list of transient (must be closed at commit) cursors is maintained and all transient cursors are closed when necessary. Lastly, this patch adds support for deadlock timeouts to TLL locking when using cursors. + post-review fixes. include/thr_lock.h: - add a notion of lock owner to table level locking. When using cursors, lock owner can not be identified by a thread id any more, as we must protect cursors from updates issued within the same connection (thread). So, each cursor has its own lock identifier to use with table level locking. - extend return values of thr_lock and thr_multi_lock with THR_LOCK_TIMEOUT and THR_LOCK_DEADLOCK, since these conditions are now possible (see comments to thr_lock.c) mysys/thr_lock.c: Better support for cursors: - use THR_LOCK_OWNER * as lock identifier, not pthread_t. - check and return an error for a trivial deadlock case, when an update statement is issued to a table locked by a cursor which has been previously opened in the same connection. - add support for locking timeouts: with use of cursors, trivial deadlocks can occur. For now the only remedy is the lock wait timeout, which is initialized from a new global variable 'table_lock_wait_timeout' Example of a deadlock (assuming the storage engine does not downgrade locks): con1: open cursor for select * from t1; con2: open cursor for select * from t2; con1: update t2 set id=id*2; -- blocked con2: update t1 set id=id*2; -- deadlock Lock timeouts are active only if a connection is using cursors. - the check in the wait_for_lock loop has been changed from data->cond != cond to data->cond != 0. data->cond is zeroed in every place it's changed. - added comments sql/examples/ha_archive.cc: - extend the handlerton with the info about cursor behaviour at commit. sql/examples/ha_archive.h: - ctor moved to .cc to make use of archive handlerton sql/examples/ha_example.cc: - add handlerton instance, init handler::ht with it sql/examples/ha_example.h: - ctor moved to .cc to make use of ha_example handlerton sql/examples/ha_tina.cc: - add handlerton instance, init handler::ht with it sql/examples/ha_tina.h: - ctor moved to .cc to make use of CSV handlerton sql/ha_berkeley.cc: - init handlerton::flags and handler::ht sql/ha_berkeley.h: - ctor moved to .cc to make use of BerkeleyDB handlerton sql/ha_blackhole.cc: - add handlerton instance, init handler::ht with it sql/ha_blackhole.h: - ctor moved to .cc to make use of blackhole handlerton sql/ha_federated.cc: - add handlerton instance, init handler::ht with it sql/ha_federated.h: - ctor moved to .cc to make use of federated handlerton sql/ha_heap.cc: - add handlerton instance, init handler::ht with it sql/ha_heap.h: - ctor moved to .cc to make use of ha_heap handlerton sql/ha_innodb.cc: - init handlerton::flags and handler::ht of innobase storage engine sql/ha_innodb.h: - ctor moved to .cc to make use of archive handlerton sql/ha_myisam.cc: - add handlerton instance, init handler::ht with it sql/ha_myisam.h: - ctor moved to .cc to make use of MyISAM handlerton sql/ha_myisammrg.cc: - init handler::ht in the ctor sql/ha_myisammrg.h: - ctor moved to .cc to make use of MyISAM MERGE handlerton sql/ha_ndbcluster.cc: - init handlerton::flags and handler::ht sql/handler.cc: - drop support for ISAM storage engine, which was removed from 5.0 - close all "transient" cursors at COMMIT/ROLLBACK. A "transient" SQL level cursor is a cursor that uses tables that have a transaction- specific state. sql/handler.h: - extend struct handlerton with flags, add handlerton *ht to every handler instance. sql/lock.cc: - extend mysql_lock_tables to send error to the client if thr_multi_lock returns a timeout or a deadlock error. sql/mysqld.cc: - add server option --table_lock_wait_timeout (in seconds) sql/set_var.cc: - add new global variable 'table_lock_wait_timeout' to specify a wait timeout for table-level locks of MySQL (in seconds). The default timeout is 50 seconds. The timeout is active only if the connection has open cursors. sql/sql_class.cc: - implement Statement_map::close_transient_cursors - safety suggests that we need an assert ensuring llock_info->n_cursors is functioning properly, adjust destruction of the Statement_map to allow such assert in THD::~THD sql/sql_class.h: - add support for Cursors registry to Statement map. sql/sql_prepare.cc: - maintain a list of cursors that must be closed at commit/rollback. sql/sql_select.cc: - extend class Cursor to support specific at-COMMIT/ROLLBACK behavior. If a cursor uses tables of a storage engine that invalidates all open tables at COMMIT/ROLLBACK, it must be closed before COMMIT/ROLLBACK is executed. sql/sql_select.h: - add an own lock_id and commit/rollback status flag to class Cursor tests/mysql_client_test.c: A test case for Bug#10760 and complementary issues: test a simple deadlock case too. mysql-test/var: New BitKeeper file ``mysql-test/var''
2005-07-19 20:21:12 +02:00
:handler(&federated_hton, table_arg),
mysql(0), stored_result(0),
A fix and a test case for Bug#10760 and complementary cleanups. The idea of the patch is that every cursor gets its own lock id for table level locking. Thus cursors are protected from updates performed within the same connection. Additionally a list of transient (must be closed at commit) cursors is maintained and all transient cursors are closed when necessary. Lastly, this patch adds support for deadlock timeouts to TLL locking when using cursors. + post-review fixes. include/thr_lock.h: - add a notion of lock owner to table level locking. When using cursors, lock owner can not be identified by a thread id any more, as we must protect cursors from updates issued within the same connection (thread). So, each cursor has its own lock identifier to use with table level locking. - extend return values of thr_lock and thr_multi_lock with THR_LOCK_TIMEOUT and THR_LOCK_DEADLOCK, since these conditions are now possible (see comments to thr_lock.c) mysys/thr_lock.c: Better support for cursors: - use THR_LOCK_OWNER * as lock identifier, not pthread_t. - check and return an error for a trivial deadlock case, when an update statement is issued to a table locked by a cursor which has been previously opened in the same connection. - add support for locking timeouts: with use of cursors, trivial deadlocks can occur. For now the only remedy is the lock wait timeout, which is initialized from a new global variable 'table_lock_wait_timeout' Example of a deadlock (assuming the storage engine does not downgrade locks): con1: open cursor for select * from t1; con2: open cursor for select * from t2; con1: update t2 set id=id*2; -- blocked con2: update t1 set id=id*2; -- deadlock Lock timeouts are active only if a connection is using cursors. - the check in the wait_for_lock loop has been changed from data->cond != cond to data->cond != 0. data->cond is zeroed in every place it's changed. - added comments sql/examples/ha_archive.cc: - extend the handlerton with the info about cursor behaviour at commit. sql/examples/ha_archive.h: - ctor moved to .cc to make use of archive handlerton sql/examples/ha_example.cc: - add handlerton instance, init handler::ht with it sql/examples/ha_example.h: - ctor moved to .cc to make use of ha_example handlerton sql/examples/ha_tina.cc: - add handlerton instance, init handler::ht with it sql/examples/ha_tina.h: - ctor moved to .cc to make use of CSV handlerton sql/ha_berkeley.cc: - init handlerton::flags and handler::ht sql/ha_berkeley.h: - ctor moved to .cc to make use of BerkeleyDB handlerton sql/ha_blackhole.cc: - add handlerton instance, init handler::ht with it sql/ha_blackhole.h: - ctor moved to .cc to make use of blackhole handlerton sql/ha_federated.cc: - add handlerton instance, init handler::ht with it sql/ha_federated.h: - ctor moved to .cc to make use of federated handlerton sql/ha_heap.cc: - add handlerton instance, init handler::ht with it sql/ha_heap.h: - ctor moved to .cc to make use of ha_heap handlerton sql/ha_innodb.cc: - init handlerton::flags and handler::ht of innobase storage engine sql/ha_innodb.h: - ctor moved to .cc to make use of archive handlerton sql/ha_myisam.cc: - add handlerton instance, init handler::ht with it sql/ha_myisam.h: - ctor moved to .cc to make use of MyISAM handlerton sql/ha_myisammrg.cc: - init handler::ht in the ctor sql/ha_myisammrg.h: - ctor moved to .cc to make use of MyISAM MERGE handlerton sql/ha_ndbcluster.cc: - init handlerton::flags and handler::ht sql/handler.cc: - drop support for ISAM storage engine, which was removed from 5.0 - close all "transient" cursors at COMMIT/ROLLBACK. A "transient" SQL level cursor is a cursor that uses tables that have a transaction- specific state. sql/handler.h: - extend struct handlerton with flags, add handlerton *ht to every handler instance. sql/lock.cc: - extend mysql_lock_tables to send error to the client if thr_multi_lock returns a timeout or a deadlock error. sql/mysqld.cc: - add server option --table_lock_wait_timeout (in seconds) sql/set_var.cc: - add new global variable 'table_lock_wait_timeout' to specify a wait timeout for table-level locks of MySQL (in seconds). The default timeout is 50 seconds. The timeout is active only if the connection has open cursors. sql/sql_class.cc: - implement Statement_map::close_transient_cursors - safety suggests that we need an assert ensuring llock_info->n_cursors is functioning properly, adjust destruction of the Statement_map to allow such assert in THD::~THD sql/sql_class.h: - add support for Cursors registry to Statement map. sql/sql_prepare.cc: - maintain a list of cursors that must be closed at commit/rollback. sql/sql_select.cc: - extend class Cursor to support specific at-COMMIT/ROLLBACK behavior. If a cursor uses tables of a storage engine that invalidates all open tables at COMMIT/ROLLBACK, it must be closed before COMMIT/ROLLBACK is executed. sql/sql_select.h: - add an own lock_id and commit/rollback status flag to class Cursor tests/mysql_client_test.c: A test case for Bug#10760 and complementary issues: test a simple deadlock case too. mysql-test/var: New BitKeeper file ``mysql-test/var''
2005-07-19 20:21:12 +02:00
ref_length(sizeof(MYSQL_ROW_OFFSET)), current_position(0)
{
trx_next= 0;
}
A fix and a test case for Bug#10760 and complementary cleanups. The idea of the patch is that every cursor gets its own lock id for table level locking. Thus cursors are protected from updates performed within the same connection. Additionally a list of transient (must be closed at commit) cursors is maintained and all transient cursors are closed when necessary. Lastly, this patch adds support for deadlock timeouts to TLL locking when using cursors. + post-review fixes. include/thr_lock.h: - add a notion of lock owner to table level locking. When using cursors, lock owner can not be identified by a thread id any more, as we must protect cursors from updates issued within the same connection (thread). So, each cursor has its own lock identifier to use with table level locking. - extend return values of thr_lock and thr_multi_lock with THR_LOCK_TIMEOUT and THR_LOCK_DEADLOCK, since these conditions are now possible (see comments to thr_lock.c) mysys/thr_lock.c: Better support for cursors: - use THR_LOCK_OWNER * as lock identifier, not pthread_t. - check and return an error for a trivial deadlock case, when an update statement is issued to a table locked by a cursor which has been previously opened in the same connection. - add support for locking timeouts: with use of cursors, trivial deadlocks can occur. For now the only remedy is the lock wait timeout, which is initialized from a new global variable 'table_lock_wait_timeout' Example of a deadlock (assuming the storage engine does not downgrade locks): con1: open cursor for select * from t1; con2: open cursor for select * from t2; con1: update t2 set id=id*2; -- blocked con2: update t1 set id=id*2; -- deadlock Lock timeouts are active only if a connection is using cursors. - the check in the wait_for_lock loop has been changed from data->cond != cond to data->cond != 0. data->cond is zeroed in every place it's changed. - added comments sql/examples/ha_archive.cc: - extend the handlerton with the info about cursor behaviour at commit. sql/examples/ha_archive.h: - ctor moved to .cc to make use of archive handlerton sql/examples/ha_example.cc: - add handlerton instance, init handler::ht with it sql/examples/ha_example.h: - ctor moved to .cc to make use of ha_example handlerton sql/examples/ha_tina.cc: - add handlerton instance, init handler::ht with it sql/examples/ha_tina.h: - ctor moved to .cc to make use of CSV handlerton sql/ha_berkeley.cc: - init handlerton::flags and handler::ht sql/ha_berkeley.h: - ctor moved to .cc to make use of BerkeleyDB handlerton sql/ha_blackhole.cc: - add handlerton instance, init handler::ht with it sql/ha_blackhole.h: - ctor moved to .cc to make use of blackhole handlerton sql/ha_federated.cc: - add handlerton instance, init handler::ht with it sql/ha_federated.h: - ctor moved to .cc to make use of federated handlerton sql/ha_heap.cc: - add handlerton instance, init handler::ht with it sql/ha_heap.h: - ctor moved to .cc to make use of ha_heap handlerton sql/ha_innodb.cc: - init handlerton::flags and handler::ht of innobase storage engine sql/ha_innodb.h: - ctor moved to .cc to make use of archive handlerton sql/ha_myisam.cc: - add handlerton instance, init handler::ht with it sql/ha_myisam.h: - ctor moved to .cc to make use of MyISAM handlerton sql/ha_myisammrg.cc: - init handler::ht in the ctor sql/ha_myisammrg.h: - ctor moved to .cc to make use of MyISAM MERGE handlerton sql/ha_ndbcluster.cc: - init handlerton::flags and handler::ht sql/handler.cc: - drop support for ISAM storage engine, which was removed from 5.0 - close all "transient" cursors at COMMIT/ROLLBACK. A "transient" SQL level cursor is a cursor that uses tables that have a transaction- specific state. sql/handler.h: - extend struct handlerton with flags, add handlerton *ht to every handler instance. sql/lock.cc: - extend mysql_lock_tables to send error to the client if thr_multi_lock returns a timeout or a deadlock error. sql/mysqld.cc: - add server option --table_lock_wait_timeout (in seconds) sql/set_var.cc: - add new global variable 'table_lock_wait_timeout' to specify a wait timeout for table-level locks of MySQL (in seconds). The default timeout is 50 seconds. The timeout is active only if the connection has open cursors. sql/sql_class.cc: - implement Statement_map::close_transient_cursors - safety suggests that we need an assert ensuring llock_info->n_cursors is functioning properly, adjust destruction of the Statement_map to allow such assert in THD::~THD sql/sql_class.h: - add support for Cursors registry to Statement map. sql/sql_prepare.cc: - maintain a list of cursors that must be closed at commit/rollback. sql/sql_select.cc: - extend class Cursor to support specific at-COMMIT/ROLLBACK behavior. If a cursor uses tables of a storage engine that invalidates all open tables at COMMIT/ROLLBACK, it must be closed before COMMIT/ROLLBACK is executed. sql/sql_select.h: - add an own lock_id and commit/rollback status flag to class Cursor tests/mysql_client_test.c: A test case for Bug#10760 and complementary issues: test a simple deadlock case too. mysql-test/var: New BitKeeper file ``mysql-test/var''
2005-07-19 20:21:12 +02:00
/*
Convert MySQL result set row to handler internal format
SYNOPSIS
convert_row_to_internal_format()
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
record Byte pointer to record
row MySQL result set row from fetchrow()
DESCRIPTION
This method simply iterates through a row returned via fetchrow with
values from a successful SELECT , and then stores each column's value
in the field object via the field object pointer (pointing to the table's
array of field object pointers). This is how the handler needs the data
to be stored to then return results back to the user
RETURN VALUE
0 After fields have had field values stored from record
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
*/
uint ha_federated::convert_row_to_internal_format(byte *record, MYSQL_ROW row)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
ulong *lengths;
Field **field;
DBUG_ENTER("ha_federated::convert_row_to_internal_format");
lengths= mysql_fetch_lengths(stored_result);
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
memset(record, 0, table->s->null_bytes);
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
for (field= table->field; *field; field++, row++, lengths++)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/*
index variable to move us through the row at the
same iterative step as the field
*/
my_ptrdiff_t old_ptr;
old_ptr= (my_ptrdiff_t) (record - table->record[0]);
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
(*field)->move_field_offset(old_ptr);
if (!*row)
(*field)->set_null();
else
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
{
(*field)->set_notnull();
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
(*field)->store(*row, *lengths, &my_charset_bin);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
}
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
(*field)->move_field_offset(-old_ptr);
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(0);
}
static bool emit_key_part_name(String *to, KEY_PART_INFO *part)
{
DBUG_ENTER("emit_key_part_name");
if (to->append(FEDERATED_BTICK) ||
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
to->append(part->field->field_name) ||
to->append(FEDERATED_BTICK))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(1); // Out of memory
DBUG_RETURN(0);
}
static bool emit_key_part_element(String *to, KEY_PART_INFO *part,
bool needs_quotes, bool is_like,
const byte *ptr, uint len)
{
Field *field= part->field;
DBUG_ENTER("emit_key_part_element");
if (needs_quotes && to->append(FEDERATED_SQUOTE))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(1);
if (part->type == HA_KEYTYPE_BIT)
{
char buff[STRING_BUFFER_USUAL_SIZE], *buf= buff;
*buf++= '0';
*buf++= 'x';
Reviewing new pushed code - CHAR() now returns binary string as default - CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR() - Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() (Some old systems returns ETIME and it's safer to test for both values than to try to write a wrapper for each old system) - Fixed new introduced bug in NOT BETWEEN X and X - Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed - Use octet2hex() for all conversion of string to hex - Simplify and optimize code client/mysqldump.c: Simple optimizations of new code Indentation fixes client/mysqltest.c: Removed not needed variable include/mysql_com.h: Made octec2hex() more usable mysql-test/r/ctype_utf8.result: CHAR() now returns binary string as default mysql-test/r/func_str.result: CHAR() now returns binary string as default mysql-test/r/range.result: Added test to verify new introduced bug in NOT BETWEEN X and X mysql-test/r/user_var-binlog.result: CHAR() now returns binary string as default mysql-test/r/view.result: More tests of view rename mysql-test/t/ctype_utf8.test: CHAR() now returns binary string as default mysql-test/t/func_str.test: CHAR() now returns binary string as default mysql-test/t/range.test: Added test to verify new introduced bug in NOT BETWEEN X and X mysql-test/t/view.test: More tests of view rename mysys/mf_keycache.c: Indentation changes Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() mysys/my_os2cond.c: Fix to MySQL coding style Optimized functions mysys/thr_lock.c: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() mysys/thr_mutex.c: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() server-tools/instance-manager/instance.cc: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() server-tools/instance-manager/thread_registry.cc: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() sql/ha_federated.cc: Use octet2hex() sql/ha_ndbcluster.cc: Removed not used variable sql/handler.cc: Simplify code Use *NONE* instead of 'none' for not existing storage engine Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed sql/item.h: Remove not needed test for *ref. (If ref is set, it should never point at 0) sql/item_func.cc: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() Simplify code More comments Require that last argument to find_and_check_access() is given (Made code shorter and faster) sql/item_strfunc.cc: Changed CHAR() to return result in binary collation CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR() Bar will shortly add the following syntax: CHAR(.... USING character_set) and ensure that CONVERT(CHAR(....) USING utf8) cuts not legal utf8 strings Use ocet2hex() sql/item_strfunc.h: CHAR() now returns a binary string sql/log_event.cc: Use octet2hex() Simplify code sql/parse_file.cc: Indentation fixes Use for() instead of while() sql/password.c: Make octet2hex() more generally usable by returning pointer to end 0 sql/slave.cc: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() sql/sql_base.cc: Indentation fixes sql/sql_insert.cc: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() sql/sql_manager.cc: Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait() sql/sql_parse.cc: Don't check thd->db when checking for function privileges sql/sql_prepare.cc: Fixed wrong merge sql/sql_select.cc: Fixed new bug for NOT BETWEEN X and X sql/sql_show.cc: Removed not used variable sql/sql_table.cc: Indentation fixed Removed DBUG_PRINT that is obvious from context sql/sql_view.cc: Simplify code sql/unireg.cc: Use octet2hex()
2005-10-11 23:58:22 +02:00
buf= octet2hex(buf, (char*) ptr, len);
if (to->append((char*) buff, (uint)(buf - buff)))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(1);
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
else if (part->key_part_flag & HA_BLOB_PART)
{
String blob;
uint blob_length= uint2korr(ptr);
blob.set_quick((char*) ptr+HA_KEY_BLOB_LENGTH,
blob_length, &my_charset_bin);
if (append_escaped(to, &blob))
DBUG_RETURN(1);
}
else if (part->key_part_flag & HA_VAR_LENGTH_PART)
{
String varchar;
uint var_length= uint2korr(ptr);
varchar.set_quick((char*) ptr+HA_KEY_BLOB_LENGTH,
var_length, &my_charset_bin);
if (append_escaped(to, &varchar))
DBUG_RETURN(1);
}
else
{
char strbuff[MAX_FIELD_WIDTH];
String str(strbuff, sizeof(strbuff), part->field->charset()), *res;
res= field->val_str(&str, (char *)ptr);
if (field->result_type() == STRING_RESULT)
{
if (append_escaped(to, res))
DBUG_RETURN(1);
}
else if (to->append(res->ptr(), res->length()))
DBUG_RETURN(1);
}
if (is_like && to->append(FEDERATED_PERCENT))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(1);
if (needs_quotes && to->append(FEDERATED_SQUOTE))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(1);
DBUG_RETURN(0);
}
/*
Create a WHERE clause based off of values in keys
Note: This code was inspired by key_copy from key.cc
SYNOPSIS
create_where_from_key ()
to String object to store WHERE clause
key_info KEY struct pointer
key byte pointer containing key
key_length length of key
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
range_type 0 - no range, 1 - min range, 2 - max range
(see enum range_operation)
DESCRIPTION
Using iteration through all the keys via a KEY_PART_INFO pointer,
This method 'extracts' the value of each key in the byte pointer
*key, and for each key found, constructs an appropriate WHERE clause
RETURN VALUE
0 After all keys have been accounted for to create the WHERE clause
1 No keys found
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
Range flags Table per Timour:
-----------------
- start_key:
* ">" -> HA_READ_AFTER_KEY
* ">=" -> HA_READ_KEY_OR_NEXT
* "=" -> HA_READ_KEY_EXACT
- end_key:
* "<" -> HA_READ_BEFORE_KEY
* "<=" -> HA_READ_AFTER_KEY
records_in_range:
-----------------
- start_key:
* ">" -> HA_READ_AFTER_KEY
* ">=" -> HA_READ_KEY_EXACT
* "=" -> HA_READ_KEY_EXACT
- end_key:
* "<" -> HA_READ_BEFORE_KEY
* "<=" -> HA_READ_AFTER_KEY
* "=" -> HA_READ_AFTER_KEY
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
0 HA_READ_KEY_EXACT, Find first record else error
1 HA_READ_KEY_OR_NEXT, Record or next record
2 HA_READ_KEY_OR_PREV, Record or previous
3 HA_READ_AFTER_KEY, Find next rec. after key-record
4 HA_READ_BEFORE_KEY, Find next rec. before key-record
5 HA_READ_PREFIX, Key which as same prefix
6 HA_READ_PREFIX_LAST, Last key with the same prefix
7 HA_READ_PREFIX_LAST_OR_PREV, Last or prev key with the same prefix
Flags that I've found:
id, primary key, varchar
id = 'ccccc'
records_in_range: start_key 0 end_key 3
read_range_first: start_key 0 end_key NULL
id > 'ccccc'
records_in_range: start_key 3 end_key NULL
read_range_first: start_key 3 end_key NULL
id < 'ccccc'
records_in_range: start_key NULL end_key 4
read_range_first: start_key NULL end_key 4
id <= 'ccccc'
records_in_range: start_key NULL end_key 3
read_range_first: start_key NULL end_key 3
id >= 'ccccc'
records_in_range: start_key 0 end_key NULL
read_range_first: start_key 1 end_key NULL
id like 'cc%cc'
records_in_range: start_key 0 end_key 3
read_range_first: start_key 1 end_key 3
id > 'aaaaa' and id < 'ccccc'
records_in_range: start_key 3 end_key 4
read_range_first: start_key 3 end_key 4
id >= 'aaaaa' and id < 'ccccc';
records_in_range: start_key 0 end_key 4
read_range_first: start_key 1 end_key 4
id >= 'aaaaa' and id <= 'ccccc';
records_in_range: start_key 0 end_key 3
read_range_first: start_key 1 end_key 3
id > 'aaaaa' and id <= 'ccccc';
records_in_range: start_key 3 end_key 3
read_range_first: start_key 3 end_key 3
numeric keys:
id = 4
index_read_idx: start_key 0 end_key NULL
id > 4
records_in_range: start_key 3 end_key NULL
read_range_first: start_key 3 end_key NULL
id >= 4
records_in_range: start_key 0 end_key NULL
read_range_first: start_key 1 end_key NULL
id < 4
records_in_range: start_key NULL end_key 4
read_range_first: start_key NULL end_key 4
id <= 4
records_in_range: start_key NULL end_key 3
read_range_first: start_key NULL end_key 3
id like 4
full table scan, select * from
id > 2 and id < 8
records_in_range: start_key 3 end_key 4
read_range_first: start_key 3 end_key 4
id >= 2 and id < 8
records_in_range: start_key 0 end_key 4
read_range_first: start_key 1 end_key 4
id >= 2 and id <= 8
records_in_range: start_key 0 end_key 3
read_range_first: start_key 1 end_key 3
id > 2 and id <= 8
records_in_range: start_key 3 end_key 3
read_range_first: start_key 3 end_key 3
multi keys (id int, name varchar, other varchar)
id = 1;
records_in_range: start_key 0 end_key 3
read_range_first: start_key 0 end_key NULL
id > 4;
id > 2 and name = '333'; remote: id > 2
id > 2 and name > '333'; remote: id > 2
id > 2 and name > '333' and other < 'ddd'; remote: id > 2 no results
id > 2 and name >= '333' and other < 'ddd'; remote: id > 2 1 result
id >= 4 and name = 'eric was here' and other > 'eeee';
records_in_range: start_key 3 end_key NULL
read_range_first: start_key 3 end_key NULL
id >= 4;
id >= 2 and name = '333' and other < 'ddd';
remote: `id` >= 2 AND `name` >= '333';
records_in_range: start_key 0 end_key NULL
read_range_first: start_key 1 end_key NULL
id < 4;
id < 3 and name = '222' and other <= 'ccc'; remote: id < 3
records_in_range: start_key NULL end_key 4
read_range_first: start_key NULL end_key 4
id <= 4;
records_in_range: start_key NULL end_key 3
read_range_first: start_key NULL end_key 3
id like 4;
full table scan
id > 2 and id < 4;
records_in_range: start_key 3 end_key 4
read_range_first: start_key 3 end_key 4
id >= 2 and id < 4;
records_in_range: start_key 0 end_key 4
read_range_first: start_key 1 end_key 4
id >= 2 and id <= 4;
records_in_range: start_key 0 end_key 3
read_range_first: start_key 1 end_key 3
id > 2 and id <= 4;
id = 6 and name = 'eric was here' and other > 'eeee';
remote: (`id` > 6 AND `name` > 'eric was here' AND `other` > 'eeee')
AND (`id` <= 6) AND ( AND `name` <= 'eric was here')
no results
records_in_range: start_key 3 end_key 3
read_range_first: start_key 3 end_key 3
Summary:
* If the start key flag is 0 the max key flag shouldn't even be set,
and if it is, the query produced would be invalid.
* Multipart keys, even if containing some or all numeric columns,
are treated the same as non-numeric keys
If the query is " = " (quotes or not):
- records in range start key flag HA_READ_KEY_EXACT,
end key flag HA_READ_AFTER_KEY (incorrect)
- any other: start key flag HA_READ_KEY_OR_NEXT,
end key flag HA_READ_AFTER_KEY (correct)
* 'like' queries (of key)
- Numeric, full table scan
- Non-numeric
records_in_range: start_key 0 end_key 3
other : start_key 1 end_key 3
* If the key flag is HA_READ_AFTER_KEY:
if start_key, append >
if end_key, append <=
* If create_where_key was called by records_in_range:
- if the key is numeric:
start key flag is 0 when end key is NULL, end key flag is 3 or 4
- if create_where_key was called by any other function:
start key flag is 1 when end key is NULL, end key flag is 3 or 4
- if the key is non-numeric, or multipart
When the query is an exact match, the start key flag is 0,
end key flag is 3 for what should be a no-range condition where
you should have 0 and max key NULL, which it is if called by
read_range_first
Conclusion:
1. Need logic to determin if a key is min or max when the flag is
HA_READ_AFTER_KEY, and handle appending correct operator accordingly
2. Need a boolean flag to pass to create_where_from_key, used in the
switch statement. Add 1 to the flag if:
- start key flag is HA_READ_KEY_EXACT and the end key is NULL
*/
bool ha_federated::create_where_from_key(String *to,
KEY *key_info,
const key_range *start_key,
const key_range *end_key,
bool records_in_range)
{
bool both_not_null=
(start_key != NULL && end_key != NULL) ? TRUE : FALSE;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
const byte *ptr;
uint remainder, length;
char tmpbuff[FEDERATED_QUERY_BUFFER_SIZE];
String tmp(tmpbuff, sizeof(tmpbuff), system_charset_info);
const key_range *ranges[2]= { start_key, end_key };
DBUG_ENTER("ha_federated::create_where_from_key");
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
tmp.length(0);
if (start_key == NULL && end_key == NULL)
DBUG_RETURN(1);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
for (int i= 0; i <= 1; i++)
{
bool needs_quotes;
KEY_PART_INFO *key_part;
if (ranges[i] == NULL)
continue;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (both_not_null)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (i > 0)
tmp.append(FEDERATED_CONJUNCTION);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
else
tmp.append(FEDERATED_OPENPAREN);
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
for (key_part= key_info->key_part,
remainder= key_info->key_parts,
length= ranges[i]->length,
ptr= ranges[i]->key; ;
remainder--,
key_part++)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
Field *field= key_part->field;
uint store_length= key_part->store_length;
uint part_length= min(store_length, length);
needs_quotes= field->needs_quotes();
DBUG_DUMP("key, start of loop", (char *) ptr, length);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (key_part->null_bit)
{
if (*ptr++)
{
if (emit_key_part_name(&tmp, key_part) ||
tmp.append(FEDERATED_ISNULL))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(1);
continue;
}
}
-Added quote_data and needs_quotes (moved from federated handler. -New tests and results logging_ok: Logging to logging@openlogging.org accepted ha_federated.h: removed quote_data and type_quote (now in the Field class) ha_federated.cc: moved quote_data and type_quote to field class field.h: new methods quote_data and needs_quotes declared field.cc: new field class methods quote_data and needs_quotes (per Monty's request) federated.test: more tests, joins, index tests have_federated_db.require: new name of federated system var federated.result: new test results for federated handler have_federated_db.inc: changed name of variable in test due to change in vars sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler ha_federated.cc: implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions. sql/mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler sql/sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql-test/include/have_federated_db.inc: changed name of variable in test due to change in vars mysql-test/r/federated.result: new test results for federated handler mysql-test/r/have_federated_db.require: new name of federated system var mysql-test/t/federated.test: more tests, joins, index tests sql/field.cc: new field class methods quote_data and needs_quotes (per Monty's request) sql/field.h: new methods quote_data and needs_quotes declared sql/ha_federated.cc: moved quote_data and type_quote to field class sql/ha_federated.h: removed quote_data and type_quote (now in the Field class) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2005-01-21 03:36:40 +01:00
if (tmp.append(FEDERATED_OPENPAREN))
DBUG_RETURN(1);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
switch(ranges[i]->flag) {
case(HA_READ_KEY_EXACT):
DBUG_PRINT("info", ("federated HA_READ_KEY_EXACT %d", i));
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (store_length >= length ||
!needs_quotes ||
key_part->type == HA_KEYTYPE_BIT ||
field->result_type() != STRING_RESULT)
{
if (emit_key_part_name(&tmp, key_part))
DBUG_RETURN(1);
if (records_in_range)
{
if (tmp.append(FEDERATED_GE))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(1);
}
else
{
if (tmp.append(FEDERATED_EQ))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(1);
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
part_length))
DBUG_RETURN(1);
}
else
{
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
/* LIKE */
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (emit_key_part_name(&tmp, key_part) ||
tmp.append(FEDERATED_LIKE) ||
emit_key_part_element(&tmp, key_part, needs_quotes, 1, ptr,
part_length))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(1);
}
break;
case(HA_READ_AFTER_KEY):
DBUG_PRINT("info", ("federated HA_READ_AFTER_KEY %d", i));
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (store_length >= length) /* end key */
{
if (emit_key_part_name(&tmp, key_part))
DBUG_RETURN(1);
if (i > 0) /* end key */
{
if (tmp.append(FEDERATED_LE))
DBUG_RETURN(1);
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
else /* start key */
{
if (tmp.append(FEDERATED_GT))
DBUG_RETURN(1);
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
part_length))
{
DBUG_RETURN(1);
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
break;
}
case(HA_READ_KEY_OR_NEXT):
DBUG_PRINT("info", ("federated HA_READ_KEY_OR_NEXT %d", i));
if (emit_key_part_name(&tmp, key_part) ||
tmp.append(FEDERATED_GE) ||
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
part_length))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(1);
break;
case(HA_READ_BEFORE_KEY):
DBUG_PRINT("info", ("federated HA_READ_BEFORE_KEY %d", i));
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (store_length >= length)
{
if (emit_key_part_name(&tmp, key_part) ||
tmp.append(FEDERATED_LT) ||
emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
part_length))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(1);
break;
}
case(HA_READ_KEY_OR_PREV):
DBUG_PRINT("info", ("federated HA_READ_KEY_OR_PREV %d", i));
if (emit_key_part_name(&tmp, key_part) ||
tmp.append(FEDERATED_LE) ||
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
part_length))
DBUG_RETURN(1);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
break;
default:
DBUG_PRINT("info",("cannot handle flag %d", ranges[i]->flag));
DBUG_RETURN(1);
}
if (tmp.append(FEDERATED_CLOSEPAREN))
DBUG_RETURN(1);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
next_loop:
if (store_length >= length)
break;
DBUG_PRINT("info", ("remainder %d", remainder));
DBUG_ASSERT(remainder > 1);
length-= store_length;
ptr+= store_length;
if (tmp.append(FEDERATED_AND))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(1);
DBUG_PRINT("info",
("create_where_from_key WHERE clause: %s",
tmp.c_ptr_quick()));
}
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (both_not_null)
if (tmp.append(FEDERATED_CLOSEPAREN))
DBUG_RETURN(1);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (to->append(FEDERATED_WHERE))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(1);
if (to->append(tmp))
DBUG_RETURN(1);
DBUG_RETURN(0);
}
/*
Example of simple lock controls. The "share" it creates is structure we will
pass to each federated handler. Do you have to have one of these? Well, you
have pieces that are used for locking, and they are needed to function.
*/
static FEDERATED_SHARE *get_share(const char *table_name, TABLE *table)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
char *select_query, *tmp_table_name;
char query_buffer[FEDERATED_QUERY_BUFFER_SIZE];
uint tmp_table_name_length;
Field **field;
String query(query_buffer, sizeof(query_buffer), &my_charset_bin);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
FEDERATED_SHARE *share;
/*
In order to use this string, we must first zero it's length,
or it will contain garbage
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
*/
query.length(0);
pthread_mutex_lock(&federated_mutex);
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
tmp_table_name= table->s->table_name.str;
tmp_table_name_length= table->s->table_name.length;
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
if (!(share= (FEDERATED_SHARE *) hash_search(&federated_open_tables,
WL# 2094 Federated Storage Handler This changeset/patch is on top of changesets 1.1814 and 1.1846 (for bugs 8033 and 8065) and now fixes bug 8535. These changes have been built and tested successfully on build.mysql.com handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does, per suggestion by Ingo in code review of patch 1.1846. ha_federated.h: declaration of federated_db_init() and federated_db_end() ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() - Fixed bug 8535, caused by NULL being quoted in write_row. This used to work (incorrectly) but a recent change was made in the server that exposed this sql/ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() sql/ha_federated.h: declaration of federated_db_init() and federated_db_end() sql/handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does.
2005-02-17 08:07:10 +01:00
(byte*) table_name,
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
tmp_table_name_length)))
{
query.set_charset(system_charset_info);
query.append(FEDERATED_SELECT);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
for (field= table->field; *field; field++)
{
query.append(FEDERATED_BTICK);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
query.append((*field)->field_name);
query.append(FEDERATED_BTICK);
query.append(FEDERATED_COMMA);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
}
query.length(query.length()- (FEDERATED_COMMA_LEN - 1));
query.append(FEDERATED_FROM);
query.append(FEDERATED_BTICK);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (!(share= (FEDERATED_SHARE *)
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
my_multi_malloc(MYF(MY_WME),
&share, sizeof(*share),
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
&tmp_table_name, tmp_table_name_length+ 1,
&select_query,
query.length()+table->s->connect_string.length+1,
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
NullS)))
{
pthread_mutex_unlock(&federated_mutex);
return NULL;
}
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
if (parse_url(share, table, 0))
goto error;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
query.append(share->table_name, share->table_name_length);
query.append(FEDERATED_BTICK);
share->select_query= select_query;
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
strmov(share->select_query, query.ptr());
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
share->use_count= 0;
DBUG_PRINT("info",
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
("share->select_query %s", share->select_query));
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (my_hash_insert(&federated_open_tables, (byte*) share))
goto error;
thr_lock_init(&share->lock);
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
pthread_mutex_init(&share->mutex, MY_MUTEX_INIT_FAST);
}
share->use_count++;
pthread_mutex_unlock(&federated_mutex);
return share;
error:
pthread_mutex_unlock(&federated_mutex);
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
if (share->scheme)
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
{
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
my_free((gptr) share->scheme, MYF(0));
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
share->scheme= 0;
}
return NULL;
}
/*
Free lock controls. We call this whenever we close a table.
If the table had the last reference to the share then we
free memory associated with it.
*/
static int free_share(FEDERATED_SHARE *share)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_ENTER("free_share");
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
pthread_mutex_lock(&federated_mutex);
if (!--share->use_count)
{
hash_delete(&federated_open_tables, (byte*) share);
my_free((gptr) share->scheme, MYF(MY_ALLOW_ZERO_PTR));
Fixed problems found by valgrind Fixed problems in test suite where some test failed Fixed access to not initialized memory in federated Fixed access to not initialized memory when using BIT fields in internal temporary tables BitKeeper/etc/ignore: added libmysqld/sql_cursor.h mysql-test/r/information_schema.result: Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middlecd mysql-test/r/information_schema_inno.result: Remove used tables at start mysql-test/r/multi_statement.result: Remove used tables at start mysql-test/r/temp_table.result: Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle mysql-test/r/type_bit.result: More tests mysql-test/t/information_schema.test: Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle mysql-test/t/information_schema_inno.test: Remove used tables at start mysql-test/t/multi_statement.test: Remove used tables at start mysql-test/t/temp_table.test: Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle mysql-test/t/type_bit.test: More tests mysql-test/valgrind.supp: Removed some valgrind warnings that isn't errors sql/ha_federated.cc: Fixed errors discovered by valgrind: - Socket was not initialized - share->scheme was deleted while there was still pointer into it from the hash sql/item_func.h: Remove access to table object from cleanup() as the table object may have been dropped earlier (In case of temporary tables or of close_thread_tables() is run before cleanup()) This fixed a bug with access to already freed memory sql/sql_base.cc: Reset variables used by fulltext sql/sql_select.cc: Fixed various problems with bit fields when used in internal temporary tables. Calculate space needed for bit fields correctly (previously we allocated more space than needed for rows in heap/myisam tables)
2005-09-22 02:23:07 +02:00
share->scheme= 0;
if (share->socket)
{
my_free((gptr) share->socket, MYF(MY_ALLOW_ZERO_PTR));
share->socket= 0;
}
thr_lock_delete(&share->lock);
WL# 2094 Federated Storage Handler This changeset/patch is on top of changesets 1.1814 and 1.1846 (for bugs 8033 and 8065) and now fixes bug 8535. These changes have been built and tested successfully on build.mysql.com handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does, per suggestion by Ingo in code review of patch 1.1846. ha_federated.h: declaration of federated_db_init() and federated_db_end() ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() - Fixed bug 8535, caused by NULL being quoted in write_row. This used to work (incorrectly) but a recent change was made in the server that exposed this sql/ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() sql/ha_federated.h: declaration of federated_db_init() and federated_db_end() sql/handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does.
2005-02-17 08:07:10 +01:00
VOID(pthread_mutex_destroy(&share->mutex));
my_free((gptr) share, MYF(0));
}
pthread_mutex_unlock(&federated_mutex);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(0);
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
ha_rows ha_federated::records_in_range(uint inx, key_range *start_key,
key_range *end_key)
{
/*
We really want indexes to be used as often as possible, therefore
we just need to hard-code the return value to a very low number to
force the issue
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
*/
DBUG_ENTER("ha_federated::records_in_range");
DBUG_RETURN(FEDERATED_RECORDS_IN_RANGE);
}
/*
If frm_error() is called then we will use this to to find out
what file extentions exist for the storage engine. This is
also used by the default rename_table and delete_table method
in handler.cc.
*/
const char **ha_federated::bas_ext() const
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
static const char *ext[]=
{
NullS
};
return ext;
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
}
/*
Used for opening tables. The name will be the name of the file.
A table is opened when it needs to be opened. For instance
when a request comes in for a select on the table (tables are not
open and closed for each request, they are cached).
Called from handler.cc by handler::ha_open(). The server opens
all tables by calling ha_open() which then calls the handler
specific open().
*/
int ha_federated::open(const char *name, int mode, uint test_if_locked)
{
DBUG_ENTER("ha_federated::open");
if (!(share= get_share(name, table)))
DBUG_RETURN(1);
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
thr_lock_data_init(&share->lock, &lock, NULL);
/* Connect to foreign database mysql_real_connect() */
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
mysql= mysql_init(0);
if (!mysql_real_connect(mysql,
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
share->hostname,
share->username,
share->password,
WL# 2094 Federated Storage Handler This changeset/patch is on top of changesets 1.1814 and 1.1846 (for bugs 8033 and 8065) and now fixes bug 8535. These changes have been built and tested successfully on build.mysql.com handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does, per suggestion by Ingo in code review of patch 1.1846. ha_federated.h: declaration of federated_db_init() and federated_db_end() ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() - Fixed bug 8535, caused by NULL being quoted in write_row. This used to work (incorrectly) but a recent change was made in the server that exposed this sql/ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() sql/ha_federated.h: declaration of federated_db_init() and federated_db_end() sql/handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does.
2005-02-17 08:07:10 +01:00
share->database,
share->port,
share->socket, 0))
{
DBUG_RETURN(stash_remote_error());
}
/*
Since we do not support transactions at this version, we can let the client
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
API silently reconnect. For future versions, we will need more logic to
deal with transactions
*/
mysql->reconnect= 1;
DBUG_RETURN(0);
}
/*
Closes a table. We call the free_share() function to free any resources
that we have allocated in the "shared" structure.
Called from sql_base.cc, sql_select.cc, and table.cc.
In sql_select.cc it is only used to close up temporary tables or during
the process where a temporary table is converted over to being a
myisam table.
For sql_base.cc look at close_data_tables().
*/
int ha_federated::close(void)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
int retval;
DBUG_ENTER("ha_federated::close");
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
/* free the result set */
if (stored_result)
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
{
DBUG_PRINT("info",
("mysql_free_result result at address %lx", stored_result));
mysql_free_result(stored_result);
stored_result= 0;
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
}
/* Disconnect from mysql */
mysql_close(mysql);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
retval= free_share(share);
DBUG_RETURN(retval);
}
/*
Checks if a field in a record is SQL NULL.
SYNOPSIS
field_in_record_is_null()
table TABLE pointer, MySQL table object
field Field pointer, MySQL field object
record char pointer, contains record
DESCRIPTION
This method uses the record format information in table to track
the null bit in record.
RETURN VALUE
1 if NULL
0 otherwise
*/
inline uint field_in_record_is_null(TABLE *table,
Field *field,
char *record)
{
int null_offset;
DBUG_ENTER("ha_federated::field_in_record_is_null");
if (!field->null_ptr)
DBUG_RETURN(0);
WL# 2094 Federated Storage Handler This changeset/patch is on top of changesets 1.1814 and 1.1846 (for bugs 8033 and 8065) and now fixes bug 8535. These changes have been built and tested successfully on build.mysql.com handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does, per suggestion by Ingo in code review of patch 1.1846. ha_federated.h: declaration of federated_db_init() and federated_db_end() ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() - Fixed bug 8535, caused by NULL being quoted in write_row. This used to work (incorrectly) but a recent change was made in the server that exposed this sql/ha_federated.cc: - Fixed some indentation problems from indent-ex (mainly to do with cases where "variablename += value" - Added federated_db_init() and federated_db_end(), as done with archive, which also handler more elegantly one of the memory leaks from bug 8033 where the federated_mutex was not freed - Removed extrenous debug messages in parse_url() sql/ha_federated.h: declaration of federated_db_init() and federated_db_end() sql/handler.cc: Added hooks for federated_db_init() and federated_db_end(), as done with ha_archive_db does.
2005-02-17 08:07:10 +01:00
null_offset= (uint) ((char*)field->null_ptr - (char*)table->record[0]);
if (record[null_offset] & field->null_bit)
DBUG_RETURN(1);
DBUG_RETURN(0);
}
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
/*
write_row() inserts a row. No extra() hint is given currently if a bulk load
is happeneding. buf() is a byte array of data. You can use the field
information to extract the data from the native byte array type.
Example of this would be:
for (Field **field=table->field ; *field ; field++)
{
...
}
Called from item_sum.cc, item_sum.cc, sql_acl.cc, sql_insert.cc,
sql_insert.cc, sql_select.cc, sql_table.cc, sql_udf.cc, and sql_update.cc.
*/
int ha_federated::write_row(byte *buf)
{
bool has_fields= FALSE;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
char insert_buffer[FEDERATED_QUERY_BUFFER_SIZE];
char values_buffer[FEDERATED_QUERY_BUFFER_SIZE];
char insert_field_value_buffer[STRING_BUFFER_USUAL_SIZE];
2005-01-20 23:23:15 +01:00
Field **field;
/* The main insert query string */
String insert_string(insert_buffer, sizeof(insert_buffer), &my_charset_bin);
/* The string containing the values to be added to the insert */
String values_string(values_buffer, sizeof(values_buffer), &my_charset_bin);
/* The actual value of the field, to be added to the values_string */
String insert_field_value_string(insert_field_value_buffer,
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
sizeof(insert_field_value_buffer),
&my_charset_bin);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
values_string.length(0);
insert_string.length(0);
insert_field_value_string.length(0);
DBUG_ENTER("ha_federated::write_row");
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_PRINT("info",
("table charset name %s csname %s",
table->s->table_charset->name,
table->s->table_charset->csname));
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
statistic_increment(table->in_use->status_var.ha_write_count, &LOCK_status);
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
table->timestamp_field->set_time();
/*
start both our field and field values strings
*/
insert_string.append(FEDERATED_INSERT);
insert_string.append(FEDERATED_BTICK);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
insert_string.append(share->table_name, share->table_name_length);
insert_string.append(FEDERATED_BTICK);
insert_string.append(FEDERATED_OPENPAREN);
values_string.append(FEDERATED_VALUES);
values_string.append(FEDERATED_OPENPAREN);
/*
loop through the field pointer array, add any fields to both the values
WL 1682: Use bitvector instead of query_id to tell handler which fields to read and write Changed Server code, added new interface to handler and changed the NDB handler, InnoDB handler and Federated handler that previously used query_id Bug#10202 fix (one-liner fix for memory leak) mysys/my_bitmap.c: Debug code sql/field.cc: Initialise fieldnr to 0 if not set anywhere else sql/field.h: Introduce a fieldnr (first field = 1 and last = table->s->fields in field object to be able to quickly set appropriate bit in read/write set sql/ha_federated.cc: Changed federated handler to use write set instead of query_id sql/ha_innodb.cc: Changed InnoDB handler to use write set instead of query_id sql/ha_ndbcluster.cc: Changed NDB handler to use write set instead of query_id sql/ha_ndbcluster.h: Changed NDB handler to use write set instead of query_id sql/handler.cc: Allocate read_set and write_set either in get_new_handler or in special routine Routines used at destruction of handler object plus routine to set all primary key fields in read_set sql/handler.h: bool to keep track if read/write set allocated or not in handler Deallocate read/write set at delete of handler object New bitmap's for read/write set sql/item.cc: Set bits in read or write set (set_query_id = 2 => write_set set_query_id = 1 => read_set sql/lock.cc: Clear bit set when starting a new statement in external lock sql/mysql_priv.h: changed set_query_id from bool to ulong sql/opt_range.cc: Set primary key read set in all places where HA_EXTRA_RETRIEVE_PRIMARY_KEY is used sql/sql_acl.cc: set all bits in read set all places where HA_EXTRA_RETRIEVE_ALL_COLS are used sql/sql_base.cc: Clear all bits before start new statement when table locked already Set bit in read/write set dependent on set_query_id and fieldnr bool -> ulong for set_query_id set all bits in read set for SELECT * queries where table is not view sql/sql_class.h: Added comments + changed type of set_query_id sql/sql_insert.cc: Use 2 when setup_fields called for fields to updated in UPDATE and INSERT statements set primary key fields when EXTRA param used sql/sql_load.cc: Set all bits in write set if no fields specified in LOAD DATA FROM INFILE Otherwise use 2 to set specific fields to be updated by LOAD DATA... sql/sql_select.cc: Set primary key read set when EXTRA param specified Set fieldnr for temporary tables Set number of fields before calling get_new_handler and only set all bits if there at least one field in table sql/sql_table.cc: Set all bits in read set for old table and all bits in write set for new table for ALTER TABLE copy method Set all bits in read set when EXTRA param used sql/sql_udf.cc: Set all bits in read set when EXTRA param used sql/sql_update.cc: Set fields to UPDATE to use 2 for set_query_id Set all bits in read set when EXTRA param used sql/table.cc: Set fieldnr in openfrm Reallocate read/write set in openfrm since table->s->fields==0 at call to get_new_handler sql/unireg.cc: Fix Bug #10202
2005-04-28 14:45:27 +02:00
list and the fields list that is part of the write set
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
You might ask "Why an index variable (has_fields) ?" My answer is that
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
we need to count how many fields we actually need
*/
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
for (field= table->field; *field; field++)
{
/* if there is a query id and if it's equal to the current query id */
WL 1682: Use bitvector instead of query_id to tell handler which fields to read and write Changed Server code, added new interface to handler and changed the NDB handler, InnoDB handler and Federated handler that previously used query_id Bug#10202 fix (one-liner fix for memory leak) mysys/my_bitmap.c: Debug code sql/field.cc: Initialise fieldnr to 0 if not set anywhere else sql/field.h: Introduce a fieldnr (first field = 1 and last = table->s->fields in field object to be able to quickly set appropriate bit in read/write set sql/ha_federated.cc: Changed federated handler to use write set instead of query_id sql/ha_innodb.cc: Changed InnoDB handler to use write set instead of query_id sql/ha_ndbcluster.cc: Changed NDB handler to use write set instead of query_id sql/ha_ndbcluster.h: Changed NDB handler to use write set instead of query_id sql/handler.cc: Allocate read_set and write_set either in get_new_handler or in special routine Routines used at destruction of handler object plus routine to set all primary key fields in read_set sql/handler.h: bool to keep track if read/write set allocated or not in handler Deallocate read/write set at delete of handler object New bitmap's for read/write set sql/item.cc: Set bits in read or write set (set_query_id = 2 => write_set set_query_id = 1 => read_set sql/lock.cc: Clear bit set when starting a new statement in external lock sql/mysql_priv.h: changed set_query_id from bool to ulong sql/opt_range.cc: Set primary key read set in all places where HA_EXTRA_RETRIEVE_PRIMARY_KEY is used sql/sql_acl.cc: set all bits in read set all places where HA_EXTRA_RETRIEVE_ALL_COLS are used sql/sql_base.cc: Clear all bits before start new statement when table locked already Set bit in read/write set dependent on set_query_id and fieldnr bool -> ulong for set_query_id set all bits in read set for SELECT * queries where table is not view sql/sql_class.h: Added comments + changed type of set_query_id sql/sql_insert.cc: Use 2 when setup_fields called for fields to updated in UPDATE and INSERT statements set primary key fields when EXTRA param used sql/sql_load.cc: Set all bits in write set if no fields specified in LOAD DATA FROM INFILE Otherwise use 2 to set specific fields to be updated by LOAD DATA... sql/sql_select.cc: Set primary key read set when EXTRA param specified Set fieldnr for temporary tables Set number of fields before calling get_new_handler and only set all bits if there at least one field in table sql/sql_table.cc: Set all bits in read set for old table and all bits in write set for new table for ALTER TABLE copy method Set all bits in read set when EXTRA param used sql/sql_udf.cc: Set all bits in read set when EXTRA param used sql/sql_update.cc: Set fields to UPDATE to use 2 for set_query_id Set all bits in read set when EXTRA param used sql/table.cc: Set fieldnr in openfrm Reallocate read/write set in openfrm since table->s->fields==0 at call to get_new_handler sql/unireg.cc: Fix Bug #10202
2005-04-28 14:45:27 +02:00
if (ha_get_bit_in_write_set((*field)->fieldnr))
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/*
There are some fields. This will be used later to determine
whether to chop off commas and parens.
*/
has_fields= TRUE;
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
if ((*field)->is_null())
insert_field_value_string.append(FEDERATED_NULL);
else
{
(*field)->val_str(&insert_field_value_string);
/* quote these fields if they require it */
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
(*field)->quote_data(&insert_field_value_string);
}
/* append the field name */
insert_string.append((*field)->field_name);
/* append the value */
values_string.append(insert_field_value_string);
insert_field_value_string.length(0);
/* append commas between both fields and fieldnames */
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/*
unfortunately, we can't use the logic
if *(fields + 1) to make the following
appends conditional because we may not append
if the next field doesn't match the condition:
(((*field)->query_id && (*field)->query_id == current_query_id)
*/
insert_string.append(FEDERATED_COMMA);
values_string.append(FEDERATED_COMMA);
}
}
/*
remove trailing comma
*/
insert_string.length(insert_string.length() - strlen(FEDERATED_COMMA));
/*
if there were no fields, we don't want to add a closing paren
AND, we don't want to chop off the last char '('
insert will be "INSERT INTO t1 VALUES ();"
*/
if (has_fields)
{
/* chops off leading commas */
values_string.length(values_string.length() - strlen(FEDERATED_COMMA));
insert_string.append(FEDERATED_CLOSEPAREN);
}
/* we always want to append this, even if there aren't any fields */
values_string.append(FEDERATED_CLOSEPAREN);
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
/* add the values */
insert_string.append(values_string);
DBUG_PRINT("info", ("insert query %s", insert_string.c_ptr_quick()));
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
if (mysql_real_query(mysql, insert_string.ptr(), insert_string.length()))
{
DBUG_RETURN(stash_remote_error());
}
/*
If the table we've just written a record to contains an auto_increment field,
then store the last_insert_id() value from the foreign server
*/
if (table->next_number_field)
update_auto_increment();
DBUG_RETURN(0);
}
/*
ha_federated::update_auto_increment
This method ensures that last_insert_id() works properly. What it simply does
is calls last_insert_id() on the foreign database immediately after insert
(if the table has an auto_increment field) and sets the insert id via
thd->insert_id(ID) (as well as storing thd->prev_insert_id)
*/
void ha_federated::update_auto_increment(void)
{
THD *thd= current_thd;
DBUG_ENTER("ha_federated::update_auto_increment");
thd->insert_id(mysql->last_used_con->insert_id);
DBUG_PRINT("info",("last_insert_id %d", auto_increment_value));
DBUG_VOID_RETURN;
}
int ha_federated::optimize(THD* thd, HA_CHECK_OPT* check_opt)
{
char query_buffer[STRING_BUFFER_USUAL_SIZE];
String query(query_buffer, sizeof(query_buffer), &my_charset_bin);
DBUG_ENTER("ha_federated::optimize");
query.length(0);
query.set_charset(system_charset_info);
query.append(FEDERATED_OPTIMIZE);
query.append(FEDERATED_BTICK);
query.append(share->table_name, share->table_name_length);
query.append(FEDERATED_BTICK);
if (mysql_real_query(mysql, query.ptr(), query.length()))
{
DBUG_RETURN(stash_remote_error());
}
DBUG_RETURN(0);
}
int ha_federated::repair(THD* thd, HA_CHECK_OPT* check_opt)
{
char query_buffer[STRING_BUFFER_USUAL_SIZE];
String query(query_buffer, sizeof(query_buffer), &my_charset_bin);
DBUG_ENTER("ha_federated::repair");
query.length(0);
query.set_charset(system_charset_info);
query.append(FEDERATED_REPAIR);
query.append(FEDERATED_BTICK);
query.append(share->table_name, share->table_name_length);
query.append(FEDERATED_BTICK);
if (check_opt->flags & T_QUICK)
query.append(FEDERATED_QUICK);
if (check_opt->flags & T_EXTEND)
query.append(FEDERATED_EXTENDED);
if (check_opt->sql_flags & TT_USEFRM)
query.append(FEDERATED_USE_FRM);
if (mysql_real_query(mysql, query.ptr(), query.length()))
{
DBUG_RETURN(stash_remote_error());
}
DBUG_RETURN(0);
}
/*
Yes, update_row() does what you expect, it updates a row. old_data will have
the previous row record in it, while new_data will have the newest data in
it.
Keep in mind that the server can do updates based on ordering if an ORDER BY
clause was used. Consecutive ordering is not guarenteed.
Currently new_data will not have an updated auto_increament record, or
and updated timestamp field. You can do these for federated by doing these:
if (table->timestamp_on_update_now)
update_timestamp(new_row+table->timestamp_on_update_now-1);
if (table->next_number_field && record == table->record[0])
update_auto_increment();
Called from sql_select.cc, sql_acl.cc, sql_update.cc, and sql_insert.cc.
*/
int ha_federated::update_row(const byte *old_data, byte *new_data)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/*
This used to control how the query was built. If there was a
primary key, the query would be built such that there was a where
clause with only that column as the condition. This is flawed,
because if we have a multi-part primary key, it would only use the
first part! We don't need to do this anyway, because
read_range_first will retrieve the correct record, which is what
is used to build the WHERE clause. We can however use this to
append a LIMIT to the end if there is NOT a primary key. Why do
this? Because we only are updating one record, and LIMIT enforces
this.
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
*/
bool has_a_primary_key= (table->s->primary_key == 0 ? TRUE : FALSE);
/*
buffers for following strings
*/
char old_field_value_buffer[STRING_BUFFER_USUAL_SIZE];
char new_field_value_buffer[STRING_BUFFER_USUAL_SIZE];
char update_buffer[FEDERATED_QUERY_BUFFER_SIZE];
char where_buffer[FEDERATED_QUERY_BUFFER_SIZE];
/* stores the value to be replaced of the field were are updating */
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
String old_field_value(old_field_value_buffer,
sizeof(old_field_value_buffer),
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
&my_charset_bin);
/* stores the new value of the field */
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
String new_field_value(new_field_value_buffer,
sizeof(new_field_value_buffer),
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
&my_charset_bin);
/* stores the update query */
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
String update_string(update_buffer,
sizeof(update_buffer),
&my_charset_bin);
/* stores the WHERE clause */
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
String where_string(where_buffer,
sizeof(where_buffer),
&my_charset_bin);
DBUG_ENTER("ha_federated::update_row");
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/*
set string lengths to 0 to avoid misc chars in string
*/
old_field_value.length(0);
new_field_value.length(0);
update_string.length(0);
where_string.length(0);
update_string.append(FEDERATED_UPDATE);
update_string.append(FEDERATED_BTICK);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
update_string.append(share->table_name);
update_string.append(FEDERATED_BTICK);
update_string.append(FEDERATED_SET);
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
/*
In this loop, we want to match column names to values being inserted
(while building INSERT statement).
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
Iterate through table->field (new data) and share->old_filed (old_data)
using the same index to created an SQL UPDATE statement, new data is
used to create SET field=value and old data is used to create WHERE
field=oldvalue
*/
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
for (Field **field= table->field; *field; field++)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
where_string.append((*field)->field_name);
update_string.append((*field)->field_name);
update_string.append(FEDERATED_EQ);
if ((*field)->is_null())
new_field_value.append(FEDERATED_NULL);
else
{
/* otherwise = */
(*field)->val_str(&new_field_value);
-Added quote_data and needs_quotes (moved from federated handler. -New tests and results logging_ok: Logging to logging@openlogging.org accepted ha_federated.h: removed quote_data and type_quote (now in the Field class) ha_federated.cc: moved quote_data and type_quote to field class field.h: new methods quote_data and needs_quotes declared field.cc: new field class methods quote_data and needs_quotes (per Monty's request) federated.test: more tests, joins, index tests have_federated_db.require: new name of federated system var federated.result: new test results for federated handler have_federated_db.inc: changed name of variable in test due to change in vars sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler ha_federated.cc: implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions. sql/mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler sql/sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql-test/include/have_federated_db.inc: changed name of variable in test due to change in vars mysql-test/r/federated.result: new test results for federated handler mysql-test/r/have_federated_db.require: new name of federated system var mysql-test/t/federated.test: more tests, joins, index tests sql/field.cc: new field class methods quote_data and needs_quotes (per Monty's request) sql/field.h: new methods quote_data and needs_quotes declared sql/ha_federated.cc: moved quote_data and type_quote to field class sql/ha_federated.h: removed quote_data and type_quote (now in the Field class) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
2005-01-21 03:36:40 +01:00
(*field)->quote_data(&new_field_value);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (!field_in_record_is_null(table, *field, (char*) old_data))
where_string.append(FEDERATED_EQ);
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (field_in_record_is_null(table, *field, (char*) old_data))
where_string.append(FEDERATED_ISNULL);
else
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
(*field)->val_str(&old_field_value,
(char*) (old_data + (*field)->offset()));
(*field)->quote_data(&old_field_value);
where_string.append(old_field_value);
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
update_string.append(new_field_value);
new_field_value.length(0);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/*
Only append conjunctions if we have another field in which
to iterate
*/
if (*(field + 1))
{
update_string.append(FEDERATED_COMMA);
where_string.append(FEDERATED_AND);
}
old_field_value.length(0);
}
update_string.append(FEDERATED_WHERE);
update_string.append(where_string);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/*
If this table has not a primary key, then we could possibly
update multiple rows. We want to make sure to only update one!
*/
if (!has_a_primary_key)
update_string.append(FEDERATED_LIMIT1);
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
if (mysql_real_query(mysql, update_string.ptr(), update_string.length()))
{
DBUG_RETURN(stash_remote_error());
}
DBUG_RETURN(0);
}
/*
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
This will delete a row. 'buf' will contain a copy of the row to be =deleted.
The server will call this right after the current row has been called (from
either a previous rnd_nexT() or index call).
If you keep a pointer to the last row or can access a primary key it will
make doing the deletion quite a bit easier.
Keep in mind that the server does no guarentee consecutive deletions.
ORDER BY clauses can be used.
Called in sql_acl.cc and sql_udf.cc to manage internal table information.
Called in sql_delete.cc, sql_insert.cc, and sql_select.cc. In sql_select
it is used for removing duplicates while in insert it is used for REPLACE
calls.
*/
int ha_federated::delete_row(const byte *buf)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
char delete_buffer[FEDERATED_QUERY_BUFFER_SIZE];
char data_buffer[FEDERATED_QUERY_BUFFER_SIZE];
String delete_string(delete_buffer, sizeof(delete_buffer), &my_charset_bin);
String data_string(data_buffer, sizeof(data_buffer), &my_charset_bin);
DBUG_ENTER("ha_federated::delete_row");
delete_string.length(0);
delete_string.append(FEDERATED_DELETE);
delete_string.append(FEDERATED_FROM);
delete_string.append(FEDERATED_BTICK);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
delete_string.append(share->table_name);
delete_string.append(FEDERATED_BTICK);
delete_string.append(FEDERATED_WHERE);
for (Field **field= table->field; *field; field++)
{
Field *cur_field= *field;
data_string.length(0);
delete_string.append(cur_field->field_name);
if (cur_field->is_null())
{
delete_string.append(FEDERATED_IS);
data_string.append(FEDERATED_NULL);
}
else
{
delete_string.append(FEDERATED_EQ);
cur_field->val_str(&data_string);
cur_field->quote_data(&data_string);
}
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
delete_string.append(data_string);
delete_string.append(FEDERATED_AND);
}
delete_string.length(delete_string.length()-5); // Remove trailing AND
delete_string.append(FEDERATED_LIMIT1);
DBUG_PRINT("info",
("Delete sql: %s", delete_string.c_ptr_quick()));
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
if (mysql_real_query(mysql, delete_string.ptr(), delete_string.length()))
{
DBUG_RETURN(stash_remote_error());
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
deleted+= mysql->affected_rows;
DBUG_PRINT("info",
("rows deleted %d rows deleted for all time %d",
int(mysql->affected_rows), deleted));
DBUG_RETURN(0);
}
/*
Positions an index cursor to the index specified in the handle. Fetches the
row if available. If the key value is null, begin at the first key of the
index. This method, which is called in the case of an SQL statement having
a WHERE clause on a non-primary key index, simply calls index_read_idx.
*/
int ha_federated::index_read(byte *buf, const byte *key,
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
uint key_len, enum ha_rkey_function find_flag)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
int retval;
DBUG_ENTER("ha_federated::index_read");
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
retval= index_read_idx(buf, active_index, key, key_len, find_flag);
DBUG_RETURN(retval);
}
/*
Positions an index cursor to the index specified in key. Fetches the
row if any. This is only used to read whole keys.
This method is called via index_read in the case of a WHERE clause using
a regular non-primary key index, OR is called DIRECTLY when the WHERE clause
uses a PRIMARY KEY index.
*/
int ha_federated::index_read_idx(byte *buf, uint index, const byte *key,
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
uint key_len, enum ha_rkey_function find_flag)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
int retval;
char error_buffer[FEDERATED_QUERY_BUFFER_SIZE];
char index_value[STRING_BUFFER_USUAL_SIZE];
char sql_query_buffer[FEDERATED_QUERY_BUFFER_SIZE];
String index_string(index_value,
sizeof(index_value),
&my_charset_bin);
String sql_query(sql_query_buffer,
sizeof(sql_query_buffer),
&my_charset_bin);
key_range range;
DBUG_ENTER("ha_federated::index_read_idx");
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
index_string.length(0);
sql_query.length(0);
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
statistic_increment(table->in_use->status_var.ha_read_key_count,
&LOCK_status);
sql_query.append(share->select_query);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
range.key= key;
range.length= key_len;
range.flag= find_flag;
create_where_from_key(&index_string,
&table->key_info[index],
&range,
NULL, 0);
sql_query.append(index_string);
DBUG_PRINT("info",
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
("current key %d key value %s index_string value %s length %d",
index, (char*) key, index_string.c_ptr_quick(),
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
index_string.length()));
DBUG_PRINT("info",
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
("current position %d sql_query %s", current_position,
sql_query.c_ptr_quick()));
if (stored_result)
{
mysql_free_result(stored_result);
stored_result= 0;
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
}
if (mysql_real_query(mysql, sql_query.ptr(), sql_query.length()))
{
my_sprintf(error_buffer, (error_buffer, "error: %d '%s'",
mysql_errno(mysql), mysql_error(mysql)));
retval= ER_QUERY_ON_FOREIGN_DATA_SOURCE;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
goto error;
}
stored_result= mysql_store_result(mysql);
if (!stored_result)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
retval= HA_ERR_END_OF_FILE;
goto error;
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/*
This basically says that the record in table->record[0] is legal,
and that it is ok to use this record, for whatever reason, such
as with a join (without it, joins will not work)
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
*/
table->status= 0;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
retval= rnd_next(buf);
DBUG_RETURN(retval);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
error:
if (stored_result)
{
mysql_free_result(stored_result);
stored_result= 0;
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
table->status= STATUS_NOT_FOUND;
my_error(retval, MYF(0), error_buffer);
DBUG_RETURN(retval);
}
/* Initialized at each key walk (called multiple times unlike rnd_init()) */
2005-07-18 13:31:02 +02:00
int ha_federated::index_init(uint keynr, bool sorted)
{
DBUG_ENTER("ha_federated::index_init");
DBUG_PRINT("info",
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
("table: '%s' key: %d", table->s->table_name.str, keynr));
active_index= keynr;
DBUG_RETURN(0);
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/*
int read_range_first(const key_range *start_key,
const key_range *end_key,
bool eq_range, bool sorted);
*/
int ha_federated::read_range_first(const key_range *start_key,
const key_range *end_key,
bool eq_range, bool sorted)
{
char sql_query_buffer[FEDERATED_QUERY_BUFFER_SIZE];
int retval;
String sql_query(sql_query_buffer,
sizeof(sql_query_buffer),
&my_charset_bin);
DBUG_ENTER("ha_federated::read_range_first");
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (start_key == NULL && end_key == NULL)
DBUG_RETURN(0);
sql_query.length(0);
sql_query.append(share->select_query);
create_where_from_key(&sql_query,
&table->key_info[active_index],
start_key, end_key, 0);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (mysql_real_query(mysql, sql_query.ptr(), sql_query.length()))
{
retval= ER_QUERY_ON_FOREIGN_DATA_SOURCE;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
goto error;
}
sql_query.length(0);
if (stored_result)
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
{
DBUG_PRINT("info",
("mysql_free_result address %lx", stored_result));
mysql_free_result(stored_result);
stored_result= 0;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
}
stored_result= mysql_store_result(mysql);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (!stored_result)
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
{
retval= HA_ERR_END_OF_FILE;
goto error;
}
/* This was successful, please let it be known! */
table->status= 0;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
retval= rnd_next(table->record[0]);
DBUG_RETURN(retval);
error:
table->status= STATUS_NOT_FOUND;
if (stored_result)
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
{
DBUG_PRINT("info", ("mysql_free_result address %lx", stored_result));
mysql_free_result(stored_result);
stored_result= 0;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
}
DBUG_RETURN(retval);
}
int ha_federated::read_range_next()
{
int retval;
DBUG_ENTER("ha_federated::read_range_next");
retval= rnd_next(table->record[0]);
DBUG_RETURN(retval);
}
/* Used to read forward through the index. */
int ha_federated::index_next(byte *buf)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
int retval;
DBUG_ENTER("ha_federated::index_next");
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
statistic_increment(table->in_use->status_var.ha_read_next_count,
&LOCK_status);
retval= rnd_next(buf);
DBUG_RETURN(retval);
}
/*
rnd_init() is called when the system wants the storage engine to do a table
scan.
This is the method that gets data for the SELECT calls.
See the federated in the introduction at the top of this file to see when
rnd_init() is called.
Called from filesort.cc, records.cc, sql_handler.cc, sql_select.cc,
sql_table.cc, and sql_update.cc.
*/
int ha_federated::rnd_init(bool scan)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_ENTER("ha_federated::rnd_init");
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
/*
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
The use of the 'scan' flag is incredibly important for this handler
to work properly, especially with updates containing WHERE clauses
using indexed columns.
When the initial query contains a WHERE clause of the query using an
indexed column, it's index_read_idx that selects the exact record from
the foreign database.
When there is NO index in the query, either due to not having a WHERE
clause, or the WHERE clause is using columns that are not indexed, a
'full table scan' done by rnd_init, which in this situation simply means
a 'select * from ...' on the foreign table.
In other words, this 'scan' flag gives us the means to ensure that if
there is an index involved in the query, we want index_read_idx to
retrieve the exact record (scan flag is 0), and do not want rnd_init
to do a 'full table scan' and wipe out that result set.
Prior to using this flag, the problem was most apparent with updates.
An initial query like 'UPDATE tablename SET anything = whatever WHERE
indexedcol = someval', index_read_idx would get called, using a query
constructed with a WHERE clause built from the values of index ('indexcol'
in this case, having a value of 'someval'). mysql_store_result would
then get called (this would be the result set we want to use).
After this rnd_init (from sql_update.cc) would be called, it would then
unecessarily call "select * from table" on the foreign table, then call
mysql_store_result, which would wipe out the correct previous result set
from the previous call of index_read_idx's that had the result set
containing the correct record, hence update the wrong row!
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
*/
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
if (scan)
{
DBUG_PRINT("info", ("share->select_query %s", share->select_query));
if (stored_result)
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
{
DBUG_PRINT("info",
("mysql_free_result address %lx", stored_result));
mysql_free_result(stored_result);
stored_result= 0;
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (mysql_real_query(mysql,
share->select_query,
strlen(share->select_query)))
goto error;
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
stored_result= mysql_store_result(mysql);
if (!stored_result)
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
goto error;
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
}
DBUG_RETURN(0);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
error:
DBUG_RETURN(stash_remote_error());
}
int ha_federated::rnd_end()
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
int retval;
DBUG_ENTER("ha_federated::rnd_end");
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (stored_result)
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
{
DBUG_PRINT("info", ("mysql_free_result address %lx", stored_result));
mysql_free_result(stored_result);
stored_result= 0;
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
}
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
retval= index_end();
DBUG_RETURN(retval);
}
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
int ha_federated::index_end(void)
{
DBUG_ENTER("ha_federated::index_end");
active_index= MAX_KEY;
DBUG_RETURN(0);
}
Table definition cache, part 2 The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object Other noteworthy changes: - In TABLE_SHARE the most common strings are now LEX_STRING's - Better error message when table is not found - Variable table_cache is now renamed 'table_open_cache' - New variable 'table_definition_cache' that is the number of table defintions that will be cached - strxnmov() calls are now fixed to avoid overflows - strxnmov() will now always add one end \0 to result - engine objects are now created with a TABLE_SHARE object instead of a TABLE object. - After creating a field object one must call field->init(table) before using it - For a busy system this change will give you: - Less memory usage for table object - Faster opening of tables (if it's has been in use or is in table definition cache) - Allow you to cache many table definitions objects - Faster drop of table mysql-test/mysql-test-run.sh: Fixed some problems with --gdb option Test both with socket and tcp/ip port that all old servers are killed mysql-test/r/flush_table.result: More tests with lock table with 2 threads + flush table mysql-test/r/information_schema.result: Removed old (now wrong) result mysql-test/r/innodb.result: Better error messages (thanks to TDC patch) mysql-test/r/merge.result: Extra flush table test mysql-test/r/ndb_bitfield.result: Better error messages (thanks to TDC patch) mysql-test/r/ndb_partition_error.result: Better error messages (thanks to TDC patch) mysql-test/r/query_cache.result: Remove tables left from old tests mysql-test/r/temp_table.result: Test truncate with temporary tables mysql-test/r/variables.result: Table_cache -> Table_open_cache mysql-test/t/flush_table.test: More tests with lock table with 2 threads + flush table mysql-test/t/merge.test: Extra flush table test mysql-test/t/multi_update.test: Added 'sleep' to make test predictable mysql-test/t/query_cache.test: Remove tables left from old tests mysql-test/t/temp_table.test: Test truncate with temporary tables mysql-test/t/variables.test: Table_cache -> Table_open_cache mysql-test/valgrind.supp: Remove warning that may happens becasue threads dies in different order mysys/hash.c: Fixed wrong DBUG_PRINT mysys/mf_dirname.c: More DBUG mysys/mf_pack.c: Better comment mysys/mf_tempdir.c: More DBUG Ensure that we call cleanup_dirname() on all temporary directory paths. If we don't do this, we will get a failure when comparing temporary table names as in some cases the temporary table name is run through convert_dirname()) mysys/my_alloc.c: Indentation fix sql/examples/ha_example.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_example.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/examples/ha_tina.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/field.cc: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Use s->db instead of s->table_cache_key - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/field.h: Update for table definition cache: - Field creation now takes TABLE_SHARE instead of TABLE as argument (This is becasue field definitions are now cached in TABLE_SHARE) When a field is created, one now must call field->init(TABLE) before using it - Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE - make_field() takes TABLE_SHARE as argument instead of TABLE - move_field() -> move_field_offset() sql/ha_archive.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_archive.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_berkeley.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Changed name of argument create() to not hide internal 'table' variable. table->s -> table_share sql/ha_berkeley.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_blackhole.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_federated.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed comments Remove index variable and replace with pointers (simple optimization) move_field() -> move_field_offset() Removed some strlen() calls sql/ha_federated.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_heap.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Simplify delete_table() and create() as the given file names are now without extension sql/ha_heap.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_innodb.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisam.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Remove not needed fn_format() Fixed for new table->s structure sql/ha_myisam.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_myisammrg.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Don't set 'is_view' for MERGE tables Use new interface to find_temporary_table() sql/ha_myisammrg.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Added flag HA_NO_COPY_ON_ALTER sql/ha_ndbcluster.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers Fixed wrong calls to strxnmov() Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed drop_table -> intern_drop_table() table->s -> table_share Move part_info to TABLE Fixed comments & DBUG print's New arguments to print_error() sql/ha_ndbcluster.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers sql/ha_partition.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers We can't set up or use part_info when creating handler as there is not yet any table object New ha_intialise() to work with TDC (Done by Mikael) sql/ha_partition.h: We new use TABLE_SHARE instead of TABLE when creating engine handlers Got set_part_info() from Mikael sql/handler.cc: We new use TABLE_SHARE instead of TABLE when creating engine handlers ha_delete_table() now also takes database as an argument handler::ha_open() now takes TABLE as argument ha_open() now calls ha_allocate_read_write_set() Simplify ha_allocate_read_write_set() Remove ha_deallocate_read_write_set() Use table_share (Cached by table definition cache) sql/handler.h: New table flag: HA_NO_COPY_ON_ALTER (used by merge tables) Remove ha_deallocate_read_write_set() get_new_handler() now takes TABLE_SHARE as argument ha_delete_table() now gets database as argument sql/item.cc: table_name and db are now LEX_STRING objects When creating fields, we have now have to call field->init(table) move_field -> move_field_offset() sql/item.h: tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR instead of BLOB sql/item_cmpfunc.cc: Fixed call to tmp_table_field_from_field_type() sql/item_create.cc: Assert if new not handled cast type sql/item_func.cc: When creating fields, we have now have to call field->init(table) dummy_table used by 'sp' now needs a TABLE_SHARE object sql/item_subselect.cc: Trivial code cleanups sql/item_sum.cc: When creating fields, we have now have to call field->init(table) sql/item_timefunc.cc: Item_func_str_to_date::tmp_table_field() now replaced by call to tmp_table_field_from_field_type() (see item_timefunc.h) sql/item_timefunc.h: Simply tmp_table_field() sql/item_uniq.cc: When creating fields, we have now have to call field->init(table) sql/key.cc: Added 'KEY' argument to 'find_ref_key' to simplify code sql/lock.cc: More debugging Use create_table_def_key() to create key for table cache Allocate TABLE_SHARE properly when creating name lock Fix that locked_table_name doesn't test same table twice sql/mysql_priv.h: New functions for table definition cache New interfaces to a lot of functions. New faster interface to find_temporary_table() and close_temporary_table() sql/mysqld.cc: Added support for table definition cache of size 'table_def_size' Fixed som calls to strnmov() Changed name of 'table_cache' to 'table_open_cache' sql/opt_range.cc: Use new interfaces Fixed warnings from valgrind sql/parse_file.cc: Safer calls to strxnmov() Fixed typo sql/set_var.cc: Added variable 'table_definition_cache' Variable table_cache renamed to 'table_open_cache' sql/slave.cc: Use new interface sql/sp.cc: Proper use of TABLE_SHARE sql/sp_head.cc: Remove compiler warnings We have now to call field->init(table) sql/sp_head.h: Pointers to parsed strings are now const sql/sql_acl.cc: table_name is now a LEX_STRING sql/sql_base.cc: Main implementation of table definition cache (The #ifdef's are there for the future when table definition cache will replace open table cache) Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places Views are not yet cached; For the moment we only cache if a table is a view or not. Faster implementation of find_temorary_table() Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()' Drop table is slightly faster as we can use the table definition cache to know the type of the table sql/sql_cache.cc: table_cache_key and table_name are now LEX_STRING 'sDBUG print fixes sql/sql_class.cc: table_cache_key is now a LEX_STRING safer strxnmov() sql/sql_class.h: Added number of open table shares (table definitions) sql/sql_db.cc: safer strxnmov() sql/sql_delete.cc: Use new interface to find_temporary_table() sql/sql_derived.cc: table_name is now a LEX_STRING sql/sql_handler.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_insert.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's sql/sql_lex.cc: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_lex.h: Make parsed string a const (to quickly find out if anything is trying to change the query string) sql/sql_load.cc: Safer strxnmov() sql/sql_parse.cc: Better error if wrong DB name sql/sql_partition.cc: part_info moved to TABLE from TABLE_SHARE Indentation changes sql/sql_select.cc: Indentation fixes Call field->init(TABLE) for new created fields Update create_tmp_table() to use TABLE_SHARE properly sql/sql_select.h: Call field->init(TABLE) for new created fields sql/sql_show.cc: table_name is now a LEX_STRING part_info moved to TABLE sql/sql_table.cc: Use table definition cache to speed up delete of tables Fixed calls to functions with new interfaces Don't use 'share_not_to_be_used' Instead of doing openfrm() when doing repair, we now have to call get_table_share() followed by open_table_from_share(). Replace some fn_format() with faster unpack_filename(). Safer strxnmov() part_info is now in TABLE Added Mikaels patch for partition and ALTER TABLE Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER sql/sql_test.cc: table_name and table_cache_key are now LEX_STRING's sql/sql_trigger.cc: TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's safer strxnmov() Removed compiler warnings sql/sql_update.cc: Call field->init(TABLE) after field is created sql/sql_view.cc: safer strxnmov() Create common TABLE_SHARE object for views to allow us to cache if table is a view sql/structs.h: Added SHOW_TABLE_DEFINITIONS sql/table.cc: Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects The table opening process now works the following way: - Create common TABLE_SHARE object - Read the .frm file and unpack it into the TABLE_SHARE object - Create a TABLE object based on the information in the TABLE_SHARE object and open a handler to the table object open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats sql/table.h: TABLE objects for the same database table now share a common TABLE_SHARE object In TABLE_SHARE the most common strings are now LEX_STRING's sql/unireg.cc: Changed arguments to rea_create_table() to have same order as other functions Call field->init(table) for new created fields sql/unireg.h: Added OPEN_VIEW strings/strxnmov.c: Change strxnmov() to always add end \0 This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
2005-11-23 21:45:02 +01:00
/*
This is called for each row of the table scan. When you run out of records
you should return HA_ERR_END_OF_FILE. Fill buff up with the row information.
The Field structure for the table is the key to getting data into buf
in a manner that will allow the server to understand it.
Called from filesort.cc, records.cc, sql_handler.cc, sql_select.cc,
sql_table.cc, and sql_update.cc.
*/
int ha_federated::rnd_next(byte *buf)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
int retval;
MYSQL_ROW row;
DBUG_ENTER("ha_federated::rnd_next");
if (stored_result == 0)
{
/*
Return value of rnd_init is not always checked (see records.cc),
so we can get here _even_ if there is _no_ pre-fetched result-set!
TODO: fix it.
*/
DBUG_RETURN(1);
}
/* Fetch a row, insert it back in a row format. */
current_position= stored_result->data_cursor;
DBUG_PRINT("info", ("current position %d", current_position));
if (!(row= mysql_fetch_row(stored_result)))
DBUG_RETURN(HA_ERR_END_OF_FILE);
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
retval= convert_row_to_internal_format(buf, row);
DBUG_RETURN(retval);
}
/*
'position()' is called after each call to rnd_next() if the data needs to be
ordered. You can do something like the following to store the position:
my_store_ptr(ref, ref_length, current_position);
The server uses ref to store data. ref_length in the above case is the size
needed to store current_position. ref is just a byte array that the server
will maintain. If you are using offsets to mark rows, then current_position
should be the offset. If it is a primary key like in BDB, then it needs to
be a primary key.
Called from filesort.cc, sql_select.cc, sql_delete.cc and sql_update.cc.
*/
void ha_federated::position(const byte *record)
{
DBUG_ENTER("ha_federated::position");
/* my_store_ptr Add seek storage */
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
*(MYSQL_ROW_OFFSET *) ref= current_position; // ref is always aligned
DBUG_VOID_RETURN;
}
/*
This is like rnd_next, but you are given a position to use to determine the
row. The position will be of the type that you stored in ref. You can use
ha_get_ptr(pos,ref_length) to retrieve whatever key or position you saved
when position() was called.
This method is required for an ORDER BY.
Called from filesort.cc records.cc sql_insert.cc sql_select.cc sql_update.cc.
*/
int ha_federated::rnd_pos(byte *buf, byte *pos)
{
DBUG_ENTER("ha_federated::rnd_pos");
statistic_increment(table->in_use->status_var.ha_read_rnd_count,
&LOCK_status);
memcpy_fixed(&current_position, pos, sizeof(MYSQL_ROW_OFFSET));
stored_result->current_row= 0;
stored_result->data_cursor= current_position;
DBUG_RETURN(rnd_next(buf));
}
/*
::info() is used to return information to the optimizer.
Currently this table handler doesn't implement most of the fields
really needed. SHOW also makes use of this data
Another note, you will probably want to have the following in your
code:
if (records < 2)
records = 2;
The reason is that the server will optimize for cases of only a single
record. If in a table scan you don't know the number of records
it will probably be better to set records to two so you can return
as many records as you need.
Along with records a few more variables you may wish to set are:
records
deleted
data_file_length
index_file_length
delete_length
check_time
Take a look at the public variables in handler.h for more information.
Called in:
filesort.cc
ha_heap.cc
item_sum.cc
opt_sum.cc
sql_delete.cc
sql_delete.cc
sql_derived.cc
sql_select.cc
sql_select.cc
sql_select.cc
sql_select.cc
sql_select.cc
sql_show.cc
sql_show.cc
sql_show.cc
sql_show.cc
sql_table.cc
sql_union.cc
sql_update.cc
*/
void ha_federated::info(uint flag)
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
char error_buffer[FEDERATED_QUERY_BUFFER_SIZE];
char status_buf[FEDERATED_QUERY_BUFFER_SIZE];
char escaped_table_name[FEDERATED_QUERY_BUFFER_SIZE];
int error;
uint error_code;
MYSQL_RES *result= 0;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
MYSQL_ROW row;
String status_query_string(status_buf, sizeof(status_buf), &my_charset_bin);
DBUG_ENTER("ha_federated::info");
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
error_code= ER_QUERY_ON_FOREIGN_DATA_SOURCE;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/* we want not to show table status if not needed to do so */
if (flag & (HA_STATUS_VARIABLE | HA_STATUS_CONST))
{
status_query_string.length(0);
status_query_string.append(FEDERATED_INFO);
status_query_string.append(FEDERATED_SQUOTE);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
escape_string_for_mysql(&my_charset_bin, (char *)escaped_table_name,
sizeof(escaped_table_name),
share->table_name,
share->table_name_length);
status_query_string.append(escaped_table_name);
status_query_string.append(FEDERATED_SQUOTE);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
if (mysql_real_query(mysql, status_query_string.ptr(),
status_query_string.length()))
goto error;
status_query_string.length(0);
result= mysql_store_result(mysql);
if (!result)
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
goto error;
if (!mysql_num_rows(result))
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
goto error;
if (!(row= mysql_fetch_row(result)))
goto error;
if (flag & HA_STATUS_VARIABLE | HA_STATUS_CONST)
{
/*
deleted is set in ha_federated::info
*/
/*
need to figure out what this means as far as federated is concerned,
since we don't have a "file"
data_file_length = ?
index_file_length = ?
delete_length = ?
*/
if (row[4] != NULL)
records= (ha_rows) my_strtoll10(row[4], (char**) 0, &error);
if (row[5] != NULL)
mean_rec_length= (ha_rows) my_strtoll10(row[5], (char**) 0, &error);
if (row[12] != NULL)
update_time= (ha_rows) my_strtoll10(row[12], (char**) 0, &error);
if (row[13] != NULL)
check_time= (ha_rows) my_strtoll10(row[13], (char**) 0, &error);
}
if (flag & HA_STATUS_CONST)
{
block_size= 4096;
}
}
if (result)
mysql_free_result(result);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_VOID_RETURN;
error:
if (result)
mysql_free_result(result);
my_sprintf(error_buffer, (error_buffer, ": %d : %s",
mysql_errno(mysql), mysql_error(mysql)));
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
my_error(error_code, MYF(0), error_buffer);
DBUG_VOID_RETURN;
}
/*
Used to delete all rows in a table. Both for cases of truncate and
for cases where the optimizer realizes that all rows will be
removed as a result of a SQL statement.
Called from item_sum.cc by Item_func_group_concat::clear(),
Item_sum_count_distinct::clear(), and Item_func_group_concat::clear().
Called from sql_delete.cc by mysql_delete().
Called from sql_select.cc by JOIN::reinit().
Called from sql_union.cc by st_select_lex_unit::exec().
*/
int ha_federated::delete_all_rows()
{
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
char query_buffer[FEDERATED_QUERY_BUFFER_SIZE];
String query(query_buffer, sizeof(query_buffer), &my_charset_bin);
DBUG_ENTER("ha_federated::delete_all_rows");
query.length(0);
query.set_charset(system_charset_info);
query.append(FEDERATED_TRUNCATE);
query.append(FEDERATED_BTICK);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
query.append(share->table_name);
query.append(FEDERATED_BTICK);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
/*
TRUNCATE won't return anything in mysql_affected_rows
*/
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
if (mysql_real_query(mysql, query.ptr(), query.length()))
{
DBUG_RETURN(stash_remote_error());
}
deleted+= records;
records= 0;
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(0);
}
/*
The idea with handler::store_lock() is the following:
The statement decided which locks we should need for the table
for updates/deletes/inserts we get WRITE locks, for SELECT... we get
read locks.
Before adding the lock into the table lock handler (see thr_lock.c)
mysqld calls store lock with the requested locks. Store lock can now
modify a write lock to a read lock (or some other lock), ignore the
lock (if we don't want to use MySQL table locks at all) or add locks
for many tables (like we do when we are using a MERGE handler).
Berkeley DB for federated changes all WRITE locks to TL_WRITE_ALLOW_WRITE
(which signals that we are doing WRITES, but we are still allowing other
reader's and writer's.
When releasing locks, store_lock() are also called. In this case one
usually doesn't have to do anything.
In some exceptional cases MySQL may send a request for a TL_IGNORE;
This means that we are requesting the same lock as last time and this
should also be ignored. (This may happen when someone does a flush
table when we have opened a part of the tables, in which case mysqld
closes and reopens the tables and tries to get the same locks at last
time). In the future we will probably try to remove this.
Called from lock.cc by get_lock_data().
*/
THR_LOCK_DATA **ha_federated::store_lock(THD *thd,
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
THR_LOCK_DATA **to,
enum thr_lock_type lock_type)
{
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
if (lock_type != TL_IGNORE && lock.type == TL_UNLOCK)
{
/*
Here is where we get into the guts of a row level lock.
If TL_UNLOCK is set
If we are not doing a LOCK TABLE or DISCARD/IMPORT
TABLESPACE, then allow multiple writers
*/
if ((lock_type >= TL_WRITE_CONCURRENT_INSERT &&
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
lock_type <= TL_WRITE) && !thd->in_lock_tables)
lock_type= TL_WRITE_ALLOW_WRITE;
/*
In queries of type INSERT INTO t1 SELECT ... FROM t2 ...
MySQL would use the lock TL_READ_NO_INSERT on t2, and that
would conflict with TL_WRITE_ALLOW_WRITE, blocking all inserts
to t2. Convert the lock to a normal read lock to allow
concurrent inserts to t2.
*/
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
if (lock_type == TL_READ_NO_INSERT && !thd->in_lock_tables)
lock_type= TL_READ;
lock.type= lock_type;
}
*to++= &lock;
return to;
}
/*
create() does nothing, since we have no local setup of our own.
FUTURE: We should potentially connect to the foreign database and
*/
int ha_federated::create(const char *name, TABLE *table_arg,
WL# 2094 This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
2005-02-06 18:40:07 +01:00
HA_CREATE_INFO *create_info)
{
int retval;
FEDERATED_SHARE tmp_share; // Only a temporary share, to test the url
DBUG_ENTER("ha_federated::create");
if (!(retval= parse_url(&tmp_share, table_arg, 1)))
retval= check_foreign_data_source(&tmp_share, 1);
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
my_free((gptr) tmp_share.scheme, MYF(MY_ALLOW_ZERO_PTR));
This is the same patch as 1.1937, with small variable declaration changes, memory deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
2005-07-16 02:33:47 +02:00
DBUG_RETURN(retval);
}
int ha_federated::stash_remote_error()
{
DBUG_ENTER("ha_federated::stash_remote_error()");
remote_error_number= mysql_errno(mysql);
Review fixes of new pushed code - Fixed tests - Optimized new code - Fixed some unlikely core dumps - Better bug fixes for: - #14397 - OPTIMIZE TABLE with an open HANDLER causes a crash - #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null mysql-test/r/create.result: Update results after removing wrong warnings for CREATE ... SELECT New tests mysql-test/r/handler.result: Drop used tables mysql-test/r/kill.result: Make test portable mysql-test/r/mysqlshow.result: Drop tables used by previous test mysql-test/r/trigger.result: Reuse old procedure name mysql-test/r/view.result: Extra tests mysql-test/t/create.test: New tests to test fix of removing wrong warnings for CREATE ... SELECT mysql-test/t/disabled.def: Enable 'kill' test (should now be portable) mysql-test/t/handler.test: Drop used tables mysql-test/t/kill.test: Make test portable even if kill doesn't work at once mysql-test/t/mysqlshow.test: Drop tables used by previous test mysql-test/t/trigger.test: Reuse old procedure name mysql-test/t/view.test: Extra tests sql/field.cc: Removed compiler warning sql/ha_federated.cc: my_snprintf -> strmake() (Simple optimization) sql/ha_ndbcluster.cc: Indentation cleanups and trival optimization sql/item.cc: Moved save_org_in_field() to item.cc to make it easier to test Remove setting of null_value as this is not needed sql/item.h: Moved save_org_in_field() to item.cc to make it easier to test sql/log_event.cc: Remove inline of slave_load_file_stem() Added 'extension' parameter to slave_load_file_stem() to get smaller code Removed not critical (or needed) DBUG_ASSERT()'s Cleaned up usage of slave_load_file_stem() to not depend on constant string lengths Indentation fixes sql/opt_range.cc: Moved code from declaration to function body (To make it more readable) sql/parse_file.cc: Fixed DBUG_PRINT sql/sp.cc: Simple cleanups - Removed not needed {} level - Ensure saved variables starts with old_ sql/sp_head.cc: Indentation fixes Remove core dump when using --debug when m_next_cached_sp == 0 Fixed compiler warnings Trivial optimizations sql/sp_head.h: Changed argument to set_definer() to const Added THD argument to recursion_level_error() to avoid call to current_thd sql/sql_acl.cc: Removed not needed test (first_not_own_table is the guard) sql/sql_base.cc: Removed extra empty line sql/sql_handler.cc: Don't test table version in mysql_ha_read() as this is already tested in lock_tables() Moved call to insert_fields to be after lock_table() to guard aganst reopen of tables (Better fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash) sql/sql_insert.cc: Mark fields that are set in CREATE ... SELECT as used (Removed wrong warnings about field not having a default value) sql/sql_parse.cc: Removed not needed test of 'tables' (first_not_own_table is the guard) Simplify code sql/sql_select.cc: Use group->field to check if value is null instead of item called by 'save_org_in_field' This is a better bug fix for #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null) sql/sql_trigger.cc: Move sql_modes_parameters outside of function Indentation fixes Fixed compiler warning Ensure that thd->lex->query_tables_own_last is set properly before calling check_table_access() (This allows us to remove the extra test in check_grant() and check_table_access())
2006-01-05 23:47:49 +01:00
strmake(remote_error_buf, mysql_error(mysql), sizeof(remote_error_buf)-1);
DBUG_RETURN(HA_FEDERATED_ERROR_WITH_REMOTE_SYSTEM);
}
bool ha_federated::get_error_message(int error, String* buf)
{
DBUG_ENTER("ha_federated::get_error_message");
DBUG_PRINT("enter", ("error: %d", error));
if (error == HA_FEDERATED_ERROR_WITH_REMOTE_SYSTEM)
{
Inefficient usage of String::append() fixed. Bad examples of usage of a string with its length fixed. The incorrect length in the trigger file configuration descriptor fixed (BUG#14090). A hook for unknown keys added to the parser to support old .TRG files. sql/field.cc: Inefficient usage of String::append() fixed. Bad examples of usage of a string with its length fixed. sql/ha_berkeley.cc: A bad example of usage of a string with its length fixed. sql/ha_federated.cc: Inefficient usage of String::append() fixed. sql/ha_myisammrg.cc: Bad examples of usage of a string with its length fixed. sql/handler.cc: Inefficient usage of String::append() fixed. sql/item.cc: Bad examples of usage of a string with its length fixed. sql/item.h: A bad example of usage of a string with its length fixed. sql/item_cmpfunc.cc: Bad examples of usage of a string with its length fixed. sql/item_func.cc: Bad examples of usage of a string with its length fixed. sql/item_strfunc.cc: Bad examples of usage of a string with its length fixed. sql/item_subselect.cc: Bad examples of usage of a string with its length fixed. sql/item_sum.cc: Bad examples of usage of a string with its length fixed. Inefficient usage of String::append() fixed. sql/item_timefunc.cc: Inefficient using of String::append() fixed. Bad examples of usage of a string with its length fixed. sql/item_uniq.h: Bad examples of usage of a string with its length fixed. sql/key.cc: Bad examples of usage of a string with its length fixed. sql/log.cc: Bad examples of usage of a string with its length fixed. sql/log_event.cc: Bad examples of usage of a string with its length fixed. sql/mysqld.cc: The dummy parser hook allocated. sql/opt_range.cc: Inefficient usage of String::append() fixed. sql/parse_file.cc: Bad examples of usage of a string with its length fixed. A hook for unknown keys added to the parser. sql/parse_file.h: A hook for unknown keys added to the parser. sql/protocol.cc: A bad example of usage of a string with its length fixed. sql/repl_failsafe.cc: Bad examples of usage of a string with its length fixed. sql/share/errmsg.txt: A warning for old format config file. sql/slave.cc: Bad examples of usage of a string with its length fixed. sql/sp.cc: Bad examples of usage of a string with its length fixed. sql/sp_head.cc: Bad examples of usage of a string with its length fixed. sql/spatial.cc: A bad example of usage of a string with its length fixed. sql/sql_acl.cc: Bad examples of usage of a string with its length fixed. sql/sql_analyse.cc: Bad examples of usage of a string with its length fixed. Inefficient usage of String::append() fixed. sql/sql_lex.cc: Bad examples of usage of a string with its length fixed. sql/sql_load.cc: A bad example of usage of a string with its length fixed. sql/sql_parse.cc: Bad examples of usage of a string with its length fixed. sql/sql_prepare.cc: A bad example of usage of a string with its length fixed. sql/sql_select.cc: Bad examples of usage of a string with its length fixed. sql/sql_show.cc: Bad examples of usage of a string with its length fixed. sql/sql_string.cc: Bad examples of usage of a string with its length fixed. sql/sql_string.h: The macro definition moved to sql_string.h to be accessible in all parts of server. sql/sql_table.cc: Bad examples of usage of a string with its length fixed. sql/sql_trigger.cc: Bad examples of usage of a string with its length fixed. The incorrect length in the trigger file configuration descriptor fixed (BUG#14090). The hook for processing incorrect sql_mode record added. sql/sql_view.cc: A dummy hook used for parsing views. sql/structs.h: The macro definition moved to sql_string.h to be accessible in all parts of server. sql/table.cc: A bad example of usage of a string with its length fixed. sql/tztime.cc: A bad example of usage of a string with its length fixed.
2005-11-20 19:47:07 +01:00
buf->append(STRING_WITH_LEN("Error on remote system: "));
buf->qs_append(remote_error_number);
Inefficient usage of String::append() fixed. Bad examples of usage of a string with its length fixed. The incorrect length in the trigger file configuration descriptor fixed (BUG#14090). A hook for unknown keys added to the parser to support old .TRG files. sql/field.cc: Inefficient usage of String::append() fixed. Bad examples of usage of a string with its length fixed. sql/ha_berkeley.cc: A bad example of usage of a string with its length fixed. sql/ha_federated.cc: Inefficient usage of String::append() fixed. sql/ha_myisammrg.cc: Bad examples of usage of a string with its length fixed. sql/handler.cc: Inefficient usage of String::append() fixed. sql/item.cc: Bad examples of usage of a string with its length fixed. sql/item.h: A bad example of usage of a string with its length fixed. sql/item_cmpfunc.cc: Bad examples of usage of a string with its length fixed. sql/item_func.cc: Bad examples of usage of a string with its length fixed. sql/item_strfunc.cc: Bad examples of usage of a string with its length fixed. sql/item_subselect.cc: Bad examples of usage of a string with its length fixed. sql/item_sum.cc: Bad examples of usage of a string with its length fixed. Inefficient usage of String::append() fixed. sql/item_timefunc.cc: Inefficient using of String::append() fixed. Bad examples of usage of a string with its length fixed. sql/item_uniq.h: Bad examples of usage of a string with its length fixed. sql/key.cc: Bad examples of usage of a string with its length fixed. sql/log.cc: Bad examples of usage of a string with its length fixed. sql/log_event.cc: Bad examples of usage of a string with its length fixed. sql/mysqld.cc: The dummy parser hook allocated. sql/opt_range.cc: Inefficient usage of String::append() fixed. sql/parse_file.cc: Bad examples of usage of a string with its length fixed. A hook for unknown keys added to the parser. sql/parse_file.h: A hook for unknown keys added to the parser. sql/protocol.cc: A bad example of usage of a string with its length fixed. sql/repl_failsafe.cc: Bad examples of usage of a string with its length fixed. sql/share/errmsg.txt: A warning for old format config file. sql/slave.cc: Bad examples of usage of a string with its length fixed. sql/sp.cc: Bad examples of usage of a string with its length fixed. sql/sp_head.cc: Bad examples of usage of a string with its length fixed. sql/spatial.cc: A bad example of usage of a string with its length fixed. sql/sql_acl.cc: Bad examples of usage of a string with its length fixed. sql/sql_analyse.cc: Bad examples of usage of a string with its length fixed. Inefficient usage of String::append() fixed. sql/sql_lex.cc: Bad examples of usage of a string with its length fixed. sql/sql_load.cc: A bad example of usage of a string with its length fixed. sql/sql_parse.cc: Bad examples of usage of a string with its length fixed. sql/sql_prepare.cc: A bad example of usage of a string with its length fixed. sql/sql_select.cc: Bad examples of usage of a string with its length fixed. sql/sql_show.cc: Bad examples of usage of a string with its length fixed. sql/sql_string.cc: Bad examples of usage of a string with its length fixed. sql/sql_string.h: The macro definition moved to sql_string.h to be accessible in all parts of server. sql/sql_table.cc: Bad examples of usage of a string with its length fixed. sql/sql_trigger.cc: Bad examples of usage of a string with its length fixed. The incorrect length in the trigger file configuration descriptor fixed (BUG#14090). The hook for processing incorrect sql_mode record added. sql/sql_view.cc: A dummy hook used for parsing views. sql/structs.h: The macro definition moved to sql_string.h to be accessible in all parts of server. sql/table.cc: A bad example of usage of a string with its length fixed. sql/tztime.cc: A bad example of usage of a string with its length fixed.
2005-11-20 19:47:07 +01:00
buf->append(STRING_WITH_LEN(": "));
buf->append(remote_error_buf);
remote_error_number= 0;
remote_error_buf[0]= '\0';
}
DBUG_PRINT("exit", ("message: %s", buf->ptr()));
DBUG_RETURN(FALSE);
}
int ha_federated::external_lock(THD *thd, int lock_type)
{
int error= 0;
ha_federated *trx= (ha_federated *)thd->ha_data[federated_hton.slot];
DBUG_ENTER("ha_federated::external_lock");
if (lock_type != F_UNLCK)
{
DBUG_PRINT("info",("federated not lock F_UNLCK"));
if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))
{
DBUG_PRINT("info",("federated autocommit"));
/*
This means we are doing an autocommit
*/
error= connection_autocommit(TRUE);
if (error)
{
DBUG_PRINT("info", ("error setting autocommit TRUE: %d", error));
DBUG_RETURN(error);
}
trans_register_ha(thd, FALSE, &federated_hton);
}
else
{
DBUG_PRINT("info",("not autocommit"));
if (!trx)
{
/*
This is where a transaction gets its start
*/
error= connection_autocommit(FALSE);
if (error)
{
DBUG_PRINT("info", ("error setting autocommit FALSE: %d", error));
DBUG_RETURN(error);
}
thd->ha_data[federated_hton.slot]= this;
trans_register_ha(thd, TRUE, &federated_hton);
/*
Send a lock table to the remote end.
We do not support this at the moment
*/
if (thd->options & (OPTION_TABLE_LOCK))
{
DBUG_PRINT("info", ("We do not support lock table yet"));
}
}
else
{
ha_federated *ptr;
for (ptr= trx; ptr; ptr= ptr->trx_next)
if (ptr == this)
break;
else if (!ptr->trx_next)
ptr->trx_next= this;
}
}
}
DBUG_RETURN(0);
}
static int federated_commit(THD *thd, bool all)
{
int return_val= 0;
ha_federated *trx= (ha_federated *)thd->ha_data[federated_hton.slot];
DBUG_ENTER("federated_commit");
if (all)
{
int error= 0;
ha_federated *ptr, *old= NULL;
for (ptr= trx; ptr; old= ptr, ptr= ptr->trx_next)
{
if (old)
old->trx_next= NULL;
error= ptr->connection_commit();
if (error && !return_val);
return_val= error;
}
thd->ha_data[federated_hton.slot]= NULL;
}
DBUG_PRINT("info", ("error val: %d", return_val));
DBUG_RETURN(return_val);
}
static int federated_rollback(THD *thd, bool all)
{
int return_val= 0;
ha_federated *trx= (ha_federated *)thd->ha_data[federated_hton.slot];
DBUG_ENTER("federated_rollback");
if (all)
{
int error= 0;
ha_federated *ptr, *old= NULL;
for (ptr= trx; ptr; old= ptr, ptr= ptr->trx_next)
{
if (old)
old->trx_next= NULL;
error= ptr->connection_rollback();
if (error && !return_val)
return_val= error;
}
thd->ha_data[federated_hton.slot]= NULL;
}
DBUG_PRINT("info", ("error val: %d", return_val));
DBUG_RETURN(return_val);
}
int ha_federated::connection_commit()
{
DBUG_ENTER("ha_federated::connection_commit");
DBUG_RETURN(execute_simple_query("COMMIT", 6));
}
int ha_federated::connection_rollback()
{
DBUG_ENTER("ha_federated::connection_rollback");
DBUG_RETURN(execute_simple_query("ROLLBACK", 8));
}
int ha_federated::connection_autocommit(bool state)
{
const char *text;
DBUG_ENTER("ha_federated::connection_autocommit");
text= (state == true) ? "SET AUTOCOMMIT=1" : "SET AUTOCOMMIT=0";
DBUG_RETURN(execute_simple_query(text, 16));
handlerton cleanup: duplicate fields removed, st_mysql_storage_engine added to support run-time handlerton initialization (no compiler warnings), handler API is now tied to MySQL version, handlerton->plugin mapping added (slot-based), dummy default_hton removed, plugin-type-specific initialization generalized, built-in plugins are now initialized too, --default-storage-engine no longer needs a list of storage engines in handle_options(). mysql-test-run.pl bugfixes include/mysql/plugin.h: added st_mysql_storage_engine made handlerton tied to MySQL version mysql-test/mysql-test-run.pl: bugfixes (umask, --no-defaults) mysql-test/r/ndb_dd_basic.result: update error message mysql-test/t/partition_mgm_err2.test: fix typo sql/ha_berkeley.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_berkeley.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_federated.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_heap.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_innodb.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_innodb.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_myisam.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_myisammrg.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster_binlog.cc: no 'name' in the handlerton anymore sql/ha_partition.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/handler.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, handlerton->plugin mapping sql/handler.h: handlerton cleanup: remove duplicate fields sql/log.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/mysql_priv.h: handler.h needs plugin.h sql/mysqld.cc: Convert --default-storage-engine to a handlerton* when all storage engines are initialized and not in getopt sql/set_var.cc: no name in the handlerton anymore sql/sql_parse.cc: no default_hton anymore sql/sql_partition.cc: no name in the handlerton anymore sql/sql_plugin.cc: generalize plugin type-specific initialization. initialize built-in plugins too sql/sql_plugin.h: generalize plugin type-specific initialization. sql/sql_show.cc: st_mysql_storage_engine structure no name in the handlerton anymore sql/sql_table.cc: no name in the handlerton anymore no default_hton anymore sql/sql_tablespace.cc: no name in the handlerton anymore no default_hton anymore sql/sql_yacc.yy: no default_hton anymore issue "unknown storage engine" warning where it is discovered storage/archive/ha_archive.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/archive/ha_archive.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/blackhole/ha_blackhole.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/csv/ha_tina.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/example/ha_example.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings
2006-05-28 14:51:01 +02:00
}
int ha_federated::execute_simple_query(const char *query, int len)
{
DBUG_ENTER("ha_federated::execute_simple_query");
if (mysql_real_query(mysql, query, len))
{
DBUG_RETURN(stash_remote_error());
}
DBUG_RETURN(0);
}
handlerton cleanup: duplicate fields removed, st_mysql_storage_engine added to support run-time handlerton initialization (no compiler warnings), handler API is now tied to MySQL version, handlerton->plugin mapping added (slot-based), dummy default_hton removed, plugin-type-specific initialization generalized, built-in plugins are now initialized too, --default-storage-engine no longer needs a list of storage engines in handle_options(). mysql-test-run.pl bugfixes include/mysql/plugin.h: added st_mysql_storage_engine made handlerton tied to MySQL version mysql-test/mysql-test-run.pl: bugfixes (umask, --no-defaults) mysql-test/r/ndb_dd_basic.result: update error message mysql-test/t/partition_mgm_err2.test: fix typo sql/ha_berkeley.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_berkeley.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_federated.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_heap.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_innodb.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_innodb.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_myisam.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_myisammrg.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster_binlog.cc: no 'name' in the handlerton anymore sql/ha_partition.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/handler.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, handlerton->plugin mapping sql/handler.h: handlerton cleanup: remove duplicate fields sql/log.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/mysql_priv.h: handler.h needs plugin.h sql/mysqld.cc: Convert --default-storage-engine to a handlerton* when all storage engines are initialized and not in getopt sql/set_var.cc: no name in the handlerton anymore sql/sql_parse.cc: no default_hton anymore sql/sql_partition.cc: no name in the handlerton anymore sql/sql_plugin.cc: generalize plugin type-specific initialization. initialize built-in plugins too sql/sql_plugin.h: generalize plugin type-specific initialization. sql/sql_show.cc: st_mysql_storage_engine structure no name in the handlerton anymore sql/sql_table.cc: no name in the handlerton anymore no default_hton anymore sql/sql_tablespace.cc: no name in the handlerton anymore no default_hton anymore sql/sql_yacc.yy: no default_hton anymore issue "unknown storage engine" warning where it is discovered storage/archive/ha_archive.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/archive/ha_archive.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/blackhole/ha_blackhole.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/csv/ha_tina.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/example/ha_example.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings
2006-05-28 14:51:01 +02:00
struct st_mysql_storage_engine federated_storage_engine=
{ MYSQL_HANDLERTON_INTERFACE_VERSION, &federated_hton };
WL#3201 " Configure support for server plugins " storage/blackhole/ha_blackhole.h: Rename: sql/ha_blackhole.h -> storage/blackhole/ha_blackhole.h BitKeeper/deleted/.del-storage.m4~24bf2fffdaa328ad: Delete: config/ac-macros/storage.m4 BitKeeper/deleted/.del-ha_archive.m4~a07fac7110b39294: Delete: config/ac-macros/ha_archive.m4 BitKeeper/deleted/.del-ha_blackhole.m4~8ed06eb91f6420ed: Delete: config/ac-macros/ha_blackhole.m4 BitKeeper/deleted/.del-ha_example.m4~1dfb268163297708: Delete: config/ac-macros/ha_example.m4 BitKeeper/deleted/.del-ha_federated.m4~7acddd58286acfd6: Delete: config/ac-macros/ha_federated.m4 BitKeeper/deleted/.del-ha_innodb.m4~6f141fb5b80c1f39: Delete: config/ac-macros/ha_innodb.m4 BitKeeper/deleted/.del-ha_partition.m4~bc57067550be5f89: Delete: config/ac-macros/ha_partition.m4 BitKeeper/deleted/.del-ha_tina.m4~f658506ebbc113ca: Delete: config/ac-macros/ha_tina.m4 BitKeeper/deleted/.del-handlerton.cc.in~377156e7b06067cc: Delete: sql/handlerton.cc.in BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df: Delete: sql/handlerton-win.cc BUILD/SETUP.sh: WL#3201 Changes in configure arguments Makefile.am: WL#3201 changes in build subst names config/ac-macros/ha_berkeley.m4: WL#3201 remove unused variable Makefile is always made config/ac-macros/ha_ndbcluster.m4: WL#3201 remove unused variables Split big macro configure.in: WL#3201 out with storage.m4, in with plugins.m4 change how plugins are declared include makefiles, remove handlerton.cc, add sql_builtin.cc include/mysql/plugin.h: WL#3201 support static and dynamic build - MYSQL_DYNAMIC_PLUGIN libmysqld/Makefile.am: WL#3201 Storage engine files still left in sql subdir are not conditionally compiled. Should move them out soon, plugin/Makefile.am: WL#3201 update makefile plugin/fulltext/Makefile.am: WL#3201 update makefile plugin/fulltext/plugin_example.c: WL#3201 change to mysql_declare_plugin macro sql/Makefile.am: WL#3201 Storage engine files still left in sql subdir are not conditionally compiled. Should move them out soon, sql/ha_berkeley.cc: WL#3201 make into a plugin conditionally compile content sql/ha_federated.cc: WL#3201 make into a plugin conditionally compile content sql/ha_heap.cc: WL#3201 make into a plugin sql/ha_innodb.cc: WL#3201 make into a plugin conditionally compile content sql/ha_myisam.cc: WL#3201 make into a plugin sql/ha_myisammrg.cc: WL#3201 make into a plugin sql/ha_ndbcluster.cc: WL#3201 make into a plugin conditionally compile content sql/ha_ndbcluster_binlog.cc: WL#3201 make into a plugin conditionally compile content sql/ha_partition.cc: WL#3201 make into a plugin conditionally compile content sql/handler.cc: WL#3201 Simplify how storage engines are found by db_type (hopefully we can get rid of it soon) Code cleanup sql/handler.h: WL#3201 new DB_TYPE_FIRST_DYNAMIC new func ha_finalize_handlerton() remove ha_register_builtin_plugins() sql/log.cc: WL#3201 make into a plugin sql/mysqld.cc: WL#3201 remove ha_register_builtin_plugins() alter init order so that storage engines are initialized before first use sql/partition_info.cc: WL#3201 conditionally compile content sql/sql_delete.cc: WL#3201 conditionally include ha_innodb.h sql/sql_plugin.cc: WL#3201 All compiled in plugins are in mysqld_builtins[] add funcs for plugin finalization install builtin plugins on initialization sql/sql_show.cc: WL#3201 Fix to use plugin_foreach() sql/sql_yacc.yy: WL#3201 SHOW FULL PLUGIN storage/archive/Makefile.am: WL#3201 setup as plugin makefile storage/archive/ha_archive.cc: WL#3201 Convert into a plugin storage/archive/ha_archive.h: WL#3201 azlib.h now in local dir storage/blackhole/ha_blackhole.cc: WL#3201 convert into a plugin storage/csv/Makefile.am: WL#3201 setup as plugin makefile storage/csv/ha_tina.cc: WL#3201 remove conditional compilation on MYSQL_PLUGIN mysql_declare_plugin macro change storage/example/Makefile.am: WL#3201 fix as new-style plugin makefile storage/example/ha_example.cc: WL#3201 remove conditional compilation on MYSQL_PLUGIN mysql_declare_plugin macro change storage/innobase/Makefile.am: WL#3201 Lets make life easier and reduce innodb into a single library file config/ac-macros/plugins.m4: New BitKeeper file ``config/ac-macros/plugins.m4'' sql/sql_builtin.cc.in: New BitKeeper file ``sql/sql_builtin.cc.in'' storage/blackhole/Makefile.am: New BitKeeper file ``storage/blackhole/Makefile.am''
2006-04-13 22:49:29 +02:00
mysql_declare_plugin(federated)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
handlerton cleanup: duplicate fields removed, st_mysql_storage_engine added to support run-time handlerton initialization (no compiler warnings), handler API is now tied to MySQL version, handlerton->plugin mapping added (slot-based), dummy default_hton removed, plugin-type-specific initialization generalized, built-in plugins are now initialized too, --default-storage-engine no longer needs a list of storage engines in handle_options(). mysql-test-run.pl bugfixes include/mysql/plugin.h: added st_mysql_storage_engine made handlerton tied to MySQL version mysql-test/mysql-test-run.pl: bugfixes (umask, --no-defaults) mysql-test/r/ndb_dd_basic.result: update error message mysql-test/t/partition_mgm_err2.test: fix typo sql/ha_berkeley.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_berkeley.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_federated.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_heap.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_innodb.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_innodb.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_myisam.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_myisammrg.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster_binlog.cc: no 'name' in the handlerton anymore sql/ha_partition.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/handler.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, handlerton->plugin mapping sql/handler.h: handlerton cleanup: remove duplicate fields sql/log.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/mysql_priv.h: handler.h needs plugin.h sql/mysqld.cc: Convert --default-storage-engine to a handlerton* when all storage engines are initialized and not in getopt sql/set_var.cc: no name in the handlerton anymore sql/sql_parse.cc: no default_hton anymore sql/sql_partition.cc: no name in the handlerton anymore sql/sql_plugin.cc: generalize plugin type-specific initialization. initialize built-in plugins too sql/sql_plugin.h: generalize plugin type-specific initialization. sql/sql_show.cc: st_mysql_storage_engine structure no name in the handlerton anymore sql/sql_table.cc: no name in the handlerton anymore no default_hton anymore sql/sql_tablespace.cc: no name in the handlerton anymore no default_hton anymore sql/sql_yacc.yy: no default_hton anymore issue "unknown storage engine" warning where it is discovered storage/archive/ha_archive.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/archive/ha_archive.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/blackhole/ha_blackhole.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/csv/ha_tina.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/example/ha_example.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings
2006-05-28 14:51:01 +02:00
&federated_storage_engine,
"FEDERATED",
WL#3201 " Configure support for server plugins " storage/blackhole/ha_blackhole.h: Rename: sql/ha_blackhole.h -> storage/blackhole/ha_blackhole.h BitKeeper/deleted/.del-storage.m4~24bf2fffdaa328ad: Delete: config/ac-macros/storage.m4 BitKeeper/deleted/.del-ha_archive.m4~a07fac7110b39294: Delete: config/ac-macros/ha_archive.m4 BitKeeper/deleted/.del-ha_blackhole.m4~8ed06eb91f6420ed: Delete: config/ac-macros/ha_blackhole.m4 BitKeeper/deleted/.del-ha_example.m4~1dfb268163297708: Delete: config/ac-macros/ha_example.m4 BitKeeper/deleted/.del-ha_federated.m4~7acddd58286acfd6: Delete: config/ac-macros/ha_federated.m4 BitKeeper/deleted/.del-ha_innodb.m4~6f141fb5b80c1f39: Delete: config/ac-macros/ha_innodb.m4 BitKeeper/deleted/.del-ha_partition.m4~bc57067550be5f89: Delete: config/ac-macros/ha_partition.m4 BitKeeper/deleted/.del-ha_tina.m4~f658506ebbc113ca: Delete: config/ac-macros/ha_tina.m4 BitKeeper/deleted/.del-handlerton.cc.in~377156e7b06067cc: Delete: sql/handlerton.cc.in BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df: Delete: sql/handlerton-win.cc BUILD/SETUP.sh: WL#3201 Changes in configure arguments Makefile.am: WL#3201 changes in build subst names config/ac-macros/ha_berkeley.m4: WL#3201 remove unused variable Makefile is always made config/ac-macros/ha_ndbcluster.m4: WL#3201 remove unused variables Split big macro configure.in: WL#3201 out with storage.m4, in with plugins.m4 change how plugins are declared include makefiles, remove handlerton.cc, add sql_builtin.cc include/mysql/plugin.h: WL#3201 support static and dynamic build - MYSQL_DYNAMIC_PLUGIN libmysqld/Makefile.am: WL#3201 Storage engine files still left in sql subdir are not conditionally compiled. Should move them out soon, plugin/Makefile.am: WL#3201 update makefile plugin/fulltext/Makefile.am: WL#3201 update makefile plugin/fulltext/plugin_example.c: WL#3201 change to mysql_declare_plugin macro sql/Makefile.am: WL#3201 Storage engine files still left in sql subdir are not conditionally compiled. Should move them out soon, sql/ha_berkeley.cc: WL#3201 make into a plugin conditionally compile content sql/ha_federated.cc: WL#3201 make into a plugin conditionally compile content sql/ha_heap.cc: WL#3201 make into a plugin sql/ha_innodb.cc: WL#3201 make into a plugin conditionally compile content sql/ha_myisam.cc: WL#3201 make into a plugin sql/ha_myisammrg.cc: WL#3201 make into a plugin sql/ha_ndbcluster.cc: WL#3201 make into a plugin conditionally compile content sql/ha_ndbcluster_binlog.cc: WL#3201 make into a plugin conditionally compile content sql/ha_partition.cc: WL#3201 make into a plugin conditionally compile content sql/handler.cc: WL#3201 Simplify how storage engines are found by db_type (hopefully we can get rid of it soon) Code cleanup sql/handler.h: WL#3201 new DB_TYPE_FIRST_DYNAMIC new func ha_finalize_handlerton() remove ha_register_builtin_plugins() sql/log.cc: WL#3201 make into a plugin sql/mysqld.cc: WL#3201 remove ha_register_builtin_plugins() alter init order so that storage engines are initialized before first use sql/partition_info.cc: WL#3201 conditionally compile content sql/sql_delete.cc: WL#3201 conditionally include ha_innodb.h sql/sql_plugin.cc: WL#3201 All compiled in plugins are in mysqld_builtins[] add funcs for plugin finalization install builtin plugins on initialization sql/sql_show.cc: WL#3201 Fix to use plugin_foreach() sql/sql_yacc.yy: WL#3201 SHOW FULL PLUGIN storage/archive/Makefile.am: WL#3201 setup as plugin makefile storage/archive/ha_archive.cc: WL#3201 Convert into a plugin storage/archive/ha_archive.h: WL#3201 azlib.h now in local dir storage/blackhole/ha_blackhole.cc: WL#3201 convert into a plugin storage/csv/Makefile.am: WL#3201 setup as plugin makefile storage/csv/ha_tina.cc: WL#3201 remove conditional compilation on MYSQL_PLUGIN mysql_declare_plugin macro change storage/example/Makefile.am: WL#3201 fix as new-style plugin makefile storage/example/ha_example.cc: WL#3201 remove conditional compilation on MYSQL_PLUGIN mysql_declare_plugin macro change storage/innobase/Makefile.am: WL#3201 Lets make life easier and reduce innodb into a single library file config/ac-macros/plugins.m4: New BitKeeper file ``config/ac-macros/plugins.m4'' sql/sql_builtin.cc.in: New BitKeeper file ``sql/sql_builtin.cc.in'' storage/blackhole/Makefile.am: New BitKeeper file ``storage/blackhole/Makefile.am''
2006-04-13 22:49:29 +02:00
"Patrick Galbraith and Brian Aker, MySQL AB",
handlerton cleanup: duplicate fields removed, st_mysql_storage_engine added to support run-time handlerton initialization (no compiler warnings), handler API is now tied to MySQL version, handlerton->plugin mapping added (slot-based), dummy default_hton removed, plugin-type-specific initialization generalized, built-in plugins are now initialized too, --default-storage-engine no longer needs a list of storage engines in handle_options(). mysql-test-run.pl bugfixes include/mysql/plugin.h: added st_mysql_storage_engine made handlerton tied to MySQL version mysql-test/mysql-test-run.pl: bugfixes (umask, --no-defaults) mysql-test/r/ndb_dd_basic.result: update error message mysql-test/t/partition_mgm_err2.test: fix typo sql/ha_berkeley.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_berkeley.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_federated.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_heap.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_innodb.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_innodb.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_myisam.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_myisammrg.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/ha_ndbcluster_binlog.cc: no 'name' in the handlerton anymore sql/ha_partition.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/handler.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, handlerton->plugin mapping sql/handler.h: handlerton cleanup: remove duplicate fields sql/log.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings sql/mysql_priv.h: handler.h needs plugin.h sql/mysqld.cc: Convert --default-storage-engine to a handlerton* when all storage engines are initialized and not in getopt sql/set_var.cc: no name in the handlerton anymore sql/sql_parse.cc: no default_hton anymore sql/sql_partition.cc: no name in the handlerton anymore sql/sql_plugin.cc: generalize plugin type-specific initialization. initialize built-in plugins too sql/sql_plugin.h: generalize plugin type-specific initialization. sql/sql_show.cc: st_mysql_storage_engine structure no name in the handlerton anymore sql/sql_table.cc: no name in the handlerton anymore no default_hton anymore sql/sql_tablespace.cc: no name in the handlerton anymore no default_hton anymore sql/sql_yacc.yy: no default_hton anymore issue "unknown storage engine" warning where it is discovered storage/archive/ha_archive.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/archive/ha_archive.h: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/blackhole/ha_blackhole.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/csv/ha_tina.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings storage/example/ha_example.cc: handlerton cleanup: remove duplicate fields, add st_mysql_storage_engine, initialize handlerton run-time to avoid compiler warnings
2006-05-28 14:51:01 +02:00
"Federated MySQL storage engine",
federated_db_init, /* Plugin Init */
WL#3201 " Configure support for server plugins " storage/blackhole/ha_blackhole.h: Rename: sql/ha_blackhole.h -> storage/blackhole/ha_blackhole.h BitKeeper/deleted/.del-storage.m4~24bf2fffdaa328ad: Delete: config/ac-macros/storage.m4 BitKeeper/deleted/.del-ha_archive.m4~a07fac7110b39294: Delete: config/ac-macros/ha_archive.m4 BitKeeper/deleted/.del-ha_blackhole.m4~8ed06eb91f6420ed: Delete: config/ac-macros/ha_blackhole.m4 BitKeeper/deleted/.del-ha_example.m4~1dfb268163297708: Delete: config/ac-macros/ha_example.m4 BitKeeper/deleted/.del-ha_federated.m4~7acddd58286acfd6: Delete: config/ac-macros/ha_federated.m4 BitKeeper/deleted/.del-ha_innodb.m4~6f141fb5b80c1f39: Delete: config/ac-macros/ha_innodb.m4 BitKeeper/deleted/.del-ha_partition.m4~bc57067550be5f89: Delete: config/ac-macros/ha_partition.m4 BitKeeper/deleted/.del-ha_tina.m4~f658506ebbc113ca: Delete: config/ac-macros/ha_tina.m4 BitKeeper/deleted/.del-handlerton.cc.in~377156e7b06067cc: Delete: sql/handlerton.cc.in BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df: Delete: sql/handlerton-win.cc BUILD/SETUP.sh: WL#3201 Changes in configure arguments Makefile.am: WL#3201 changes in build subst names config/ac-macros/ha_berkeley.m4: WL#3201 remove unused variable Makefile is always made config/ac-macros/ha_ndbcluster.m4: WL#3201 remove unused variables Split big macro configure.in: WL#3201 out with storage.m4, in with plugins.m4 change how plugins are declared include makefiles, remove handlerton.cc, add sql_builtin.cc include/mysql/plugin.h: WL#3201 support static and dynamic build - MYSQL_DYNAMIC_PLUGIN libmysqld/Makefile.am: WL#3201 Storage engine files still left in sql subdir are not conditionally compiled. Should move them out soon, plugin/Makefile.am: WL#3201 update makefile plugin/fulltext/Makefile.am: WL#3201 update makefile plugin/fulltext/plugin_example.c: WL#3201 change to mysql_declare_plugin macro sql/Makefile.am: WL#3201 Storage engine files still left in sql subdir are not conditionally compiled. Should move them out soon, sql/ha_berkeley.cc: WL#3201 make into a plugin conditionally compile content sql/ha_federated.cc: WL#3201 make into a plugin conditionally compile content sql/ha_heap.cc: WL#3201 make into a plugin sql/ha_innodb.cc: WL#3201 make into a plugin conditionally compile content sql/ha_myisam.cc: WL#3201 make into a plugin sql/ha_myisammrg.cc: WL#3201 make into a plugin sql/ha_ndbcluster.cc: WL#3201 make into a plugin conditionally compile content sql/ha_ndbcluster_binlog.cc: WL#3201 make into a plugin conditionally compile content sql/ha_partition.cc: WL#3201 make into a plugin conditionally compile content sql/handler.cc: WL#3201 Simplify how storage engines are found by db_type (hopefully we can get rid of it soon) Code cleanup sql/handler.h: WL#3201 new DB_TYPE_FIRST_DYNAMIC new func ha_finalize_handlerton() remove ha_register_builtin_plugins() sql/log.cc: WL#3201 make into a plugin sql/mysqld.cc: WL#3201 remove ha_register_builtin_plugins() alter init order so that storage engines are initialized before first use sql/partition_info.cc: WL#3201 conditionally compile content sql/sql_delete.cc: WL#3201 conditionally include ha_innodb.h sql/sql_plugin.cc: WL#3201 All compiled in plugins are in mysqld_builtins[] add funcs for plugin finalization install builtin plugins on initialization sql/sql_show.cc: WL#3201 Fix to use plugin_foreach() sql/sql_yacc.yy: WL#3201 SHOW FULL PLUGIN storage/archive/Makefile.am: WL#3201 setup as plugin makefile storage/archive/ha_archive.cc: WL#3201 Convert into a plugin storage/archive/ha_archive.h: WL#3201 azlib.h now in local dir storage/blackhole/ha_blackhole.cc: WL#3201 convert into a plugin storage/csv/Makefile.am: WL#3201 setup as plugin makefile storage/csv/ha_tina.cc: WL#3201 remove conditional compilation on MYSQL_PLUGIN mysql_declare_plugin macro change storage/example/Makefile.am: WL#3201 fix as new-style plugin makefile storage/example/ha_example.cc: WL#3201 remove conditional compilation on MYSQL_PLUGIN mysql_declare_plugin macro change storage/innobase/Makefile.am: WL#3201 Lets make life easier and reduce innodb into a single library file config/ac-macros/plugins.m4: New BitKeeper file ``config/ac-macros/plugins.m4'' sql/sql_builtin.cc.in: New BitKeeper file ``sql/sql_builtin.cc.in'' storage/blackhole/Makefile.am: New BitKeeper file ``storage/blackhole/Makefile.am''
2006-04-13 22:49:29 +02:00
NULL, /* Plugin Deinit */
0x0100 /* 1.0 */,
}
mysql_declare_plugin_end;
#endif