1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Commit Graph

1580 Commits

Author SHA1 Message Date
unknown
e1ff81bbce Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug18198


mysql-test/r/partition.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_partition.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item_cmpfunc.h:
  e
2006-10-16 15:40:40 -04:00
mikael/pappa@dator5.(none)
4a7cd3a1cb Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug18198
2006-10-16 15:40:40 -04:00
unknown
76cdfbbdfe Added license information display to output of plugins schema, and tagged all plugins with GPL flag.
include/mysql/plugin.h:
  Adding license information.
plugin/fulltext/plugin_example.c:
  License
sql/ha_ndbcluster.cc:
  License
sql/ha_partition.cc:
  License
sql/handler.h:
  License
sql/log.cc:
  License
sql/sql_show.cc:
  Additional PLUIN display information
storage/archive/ha_archive.cc:
  License information added
storage/blackhole/ha_blackhole.cc:
  License information added
storage/csv/ha_tina.cc:
  License Information
storage/example/ha_example.cc:
  License information
storage/federated/ha_federated.cc:
  License Information
storage/heap/ha_heap.cc:
  License Information
storage/innobase/handler/ha_innodb.cc:
  License Information
storage/myisam/ha_myisam.cc:
  License Information
storage/myisammrg/ha_myisammrg.cc:
  License Information
2006-10-05 00:41:29 -07:00
brian@zim.(none)
faff46eefe Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 2006-10-05 00:41:29 -07:00
unknown
93f4daf1b4 BUG#18198: Partition function handling
Fixes of after review fixes


mysql-test/r/partition_hash.result:
  Fixed test cases
mysql-test/r/partition_range.result:
  Fixed test cases
mysql-test/t/partition_range.test:
  Fixed test cases
sql/ha_ndbcluster.cc:
  Fixed error printout to avoid complex character set code in print_error
sql/ha_partition.cc:
  Fixed error printout to avoid complex character set code in print_error
sql/partition_info.cc:
  Fixed error printout to avoid complex character set code in print_error
sql/partition_info.h:
  Fixed error printout to avoid complex character set code in print_error
sql/sql_partition.cc:
  indendentation fix
2006-10-02 15:52:29 -04:00
mikael/pappa@dator5.(none)
1cdf82e012 BUG#18198: Partition function handling
Fixes of after review fixes
2006-10-02 15:52:29 -04:00
unknown
40bf7b0ae2 This patch updates to remove most global hton needs. Cleans up wrong message in partition.
mysql-test/r/partition.result:
  Updated results
sql/ha_ndbcluster.cc:
  Updated hton
sql/ha_partition.cc:
  Removed need for global internal hton.
sql/handler.cc:
  Removed need for global mrg
sql/mysql_priv.h:
  Updated needs for global variables.
sql/mysqld.cc:
  Removed needs around hton
sql/partition_info.cc:
  Removed bug.... aka what happens if tables are neither?
sql/share/errmsg.txt:
  Made error message more generic.
sql/sql_cache.cc:
  Removed specific hton reference
2006-09-30 18:31:13 -07:00
brian@zim.(none)
56505c01f9 This patch updates to remove most global hton needs. Cleans up wrong message in partition. 2006-09-30 18:31:13 -07:00
unknown
48d5b3bd1f This removes the passing of global hton to engine instance.
sql/ha_ndbcluster.cc:
  Removed global hton
sql/ha_ndbcluster.h:
  Removed global hton need
sql/ha_partition.cc:
  Removed global hton
sql/ha_partition.h:
  Removed global hton
sql/handler.cc:
  Removed global hton
sql/handler.h:
  Removed global hton
storage/archive/ha_archive.cc:
  Removed global hton
storage/archive/ha_archive.h:
  Global hton removed
storage/blackhole/ha_blackhole.cc:
  Global removed hton
storage/blackhole/ha_blackhole.h:
  Global hton removal
storage/csv/ha_tina.cc:
  Global hton removal
storage/csv/ha_tina.h:
  Removed global removed
storage/example/ha_example.cc:
  Global removed hton
storage/example/ha_example.h:
  Global removed hton
storage/federated/ha_federated.cc:
  Global removed hton
storage/federated/ha_federated.h:
  Global removed hton
storage/heap/ha_heap.cc:
  Global removed hton
storage/heap/ha_heap.h:
  Global removed hton
storage/innobase/handler/ha_innodb.cc:
  Global removed hton
storage/innobase/handler/ha_innodb.h:
  Removed global hton
storage/myisam/ha_myisam.cc:
  Globally removed hton
storage/myisam/ha_myisam.h:
  Globally removed hton
storage/myisammrg/ha_myisammrg.cc:
  Globally removed hton
storage/myisammrg/ha_myisammrg.h:
  Globaly removed hton
2006-09-29 17:19:02 -07:00
brian@zim.(none)
a756fd36ef This removes the passing of global hton to engine instance. 2006-09-29 17:19:02 -07:00
unknown
057f98b326 Removed Field (this came in as an idea from a previous patch by Serg)
include/mysql/plugin.h:
  Field Removed
sql/ha_ndbcluster.cc:
  Field Removed
sql/ha_partition.cc:
  Field Removed
sql/log.cc:
  Removed Field
storage/archive/ha_archive.cc:
  Removed Field
storage/blackhole/ha_blackhole.cc:
  Removed Field
storage/csv/ha_tina.cc:
  Removed Field
storage/example/ha_example.cc:
  Removed Field
storage/federated/ha_federated.cc:
  Removed Field
storage/heap/ha_heap.cc:
  Removed Field
storage/innobase/handler/ha_innodb.cc:
  Removed Field
storage/myisam/ha_myisam.cc:
  Removed Field
storage/myisammrg/ha_myisammrg.cc:
  Removed Field
2006-09-26 21:26:04 -07:00
brian@zim.(none)
f9a02811da Removed Field (this came in as an idea from a previous patch by Serg) 2006-09-26 21:26:04 -07:00
unknown
0bea3a4a24 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
into  dator5.(none):/home/pappa/bug21210


sql/ha_partition.cc:
  Auto merged
2006-09-19 07:48:40 -04:00
mikael/pappa@dator5.(none)
6c07d55a39 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
into  dator5.(none):/home/pappa/bug21210
2006-09-19 07:48:40 -04:00
unknown
0812a1f02e Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug21210


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged
2006-09-19 07:44:18 -04:00
mikael/pappa@dator5.(none)
fb2ad12f1d Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug21210
2006-09-19 07:44:18 -04:00
unknown
392c3122f6 BUG#22178: Scan ordered performed also on engines not supporting ordered scans
Scan of ranges without start key should not use ordered scans unless it
is requested.


sql/ha_partition.cc:
  Scan of ranges without start key should not use ordered scans unless it
  is requested.
sql/ha_partition.h:
  Scan of ranges without start key should not use ordered scans unless it
  is requested.
2006-09-19 02:56:02 -04:00
mikael/pappa@dator5.(none)
3b4ef2a975 BUG#22178: Scan ordered performed also on engines not supporting ordered scans
Scan of ranges without start key should not use ordered scans unless it
is requested.
2006-09-19 02:56:02 -04:00
unknown
d79485a9be This changes the order of the universe, black is now the new white.
In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database. 


include/mysql/plugin.h:
  Optional to pass parameter now to init and deinit functions
sql/ha_ndbcluster.cc:
  Cleanup, handlerton is now a pointer.
sql/ha_ndbcluster_binlog.cc:
  Cleanup (handlerton is now a pointer)
sql/ha_ndbcluster_binlog.h:
  Cleanup (handlerton is now a pointer)
sql/ha_partition.cc:
  Cleaned up handlerton change
sql/handler.cc:
  Cheanup of handlerton change
sql/item_sum.cc:
  Cleanedup of handlerton change
sql/log.cc:
  Cleanup of handlerton change
sql/mysql_priv.h:
  Reverted patch for variables (what would have happen previously if a have_ would have been called that was dynamically loaded? boom!)
sql/mysqld.cc:
  Cleanup of handlerton changes and reverted have variable patch
sql/partition_info.cc:
  Cleanup of handlerton (we need to clean this up a bit more).
sql/set_var.cc:
  Cleanup related to handlerton changes
sql/sql_cache.cc:
  Handlerton changes cleanup
sql/sql_insert.cc:
  Handlerton changes cleanup.
sql/sql_partition.cc:
  Handlerton cleanup changes
sql/sql_plugin.cc:
  Handlerton changes.
  
  init() can now be controlled by a plugin specific startup. 
  
  There was also an issue with how we deinited the status variables. It should have been occuring before we shut down the engines.
sql/sql_select.cc:
  Handlerton cleanup changes
sql/sql_show.cc:
  Handlerton cleanup changes
sql/sql_table.cc:
  Handlerton cleanup changes
sql/table.cc:
  Cleanup
storage/archive/ha_archive.cc:
  Cleanup
storage/archive/ha_archive.h:
  Cleanup
storage/blackhole/ha_blackhole.cc:
  Cleanup
storage/csv/ha_tina.cc:
  Cleanup
storage/example/ha_example.cc:
  Cleanup
storage/federated/ha_federated.cc:
  Cleanup
storage/heap/ha_heap.cc:
  Cleanup
storage/innobase/handler/ha_innodb.cc:
  Cleanup
storage/myisam/ha_myisam.cc:
  Cleanup
storage/myisammrg/ha_myisammrg.cc:
  Cleanup
2006-09-15 10:28:00 -07:00
brian@zim.(none)
7194b6d75a This changes the order of the universe, black is now the new white.
In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database.
2006-09-15 10:28:00 -07:00
unknown
24f9f35eb6 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug21210


sql/ha_partition.cc:
  Auto merged
2006-09-08 06:29:35 -04:00
mikael/pappa@dator5.(none)
4f122ed95b Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug21210
2006-09-08 06:29:35 -04:00
unknown
8b50dee746 BUG#21210: ALTER TABLE t1 REORGANIZE PARTITION crashes when using InnoDB
Inserted wrong handlers into the new_file_array which later caused
havoc in rename_partitions


sql/ha_partition.cc:
  Inserted wrong handlers into the new_file_array which later caused
  havoc in rename_partitions
2006-09-04 11:18:34 -04:00
mikael/pappa@dator5.(none)
814b81ad6b BUG#21210: ALTER TABLE t1 REORGANIZE PARTITION crashes when using InnoDB
Inserted wrong handlers into the new_file_array which later caused
havoc in rename_partitions
2006-09-04 11:18:34 -04:00
unknown
b1e2cfce3d Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into  zim.(none):/tmp/mysql-5.1-arch


sql/ha_innodb.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged
2006-09-01 09:19:10 -07:00
brian@zim.(none)
c7baf60267 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into  zim.(none):/tmp/mysql-5.1-arch
2006-09-01 09:19:10 -07:00
unknown
37c67ec927 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug21388


sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged
2006-08-31 04:21:14 -04:00
mikael/pappa@dator5.(none)
8c5db16fc5 Merge dator5.(none):/home/pappa/clean-mysql-5.1
into  dator5.(none):/home/pappa/bug21388
2006-08-31 04:21:14 -04:00
unknown
2dfaa6697c add 2 placeholder values for config and system variables. 2006-08-30 14:27:29 -07:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
38a59efbc9 add 2 placeholder values for config and system variables. 2006-08-30 14:27:29 -07:00
unknown
bfa81464ca Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
into  dator5.(none):/home/pappa/bug21388


sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2006-08-26 06:14:05 -04:00
mikael/pappa@dator5.(none)
b28a550eb4 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
into  dator5.(none):/home/pappa/bug21388
2006-08-26 06:14:05 -04:00
unknown
4ec86b1c04 This is a cleanup of warnings that windows is complaining about.
client/mysql.cc:
  Windows warnings clean up
server-tools/instance-manager/parse.cc:
  Cleanedup warning
sql/field.cc:
  Removed unused variables
sql/filesort.cc:
  Removed unused variables
sql/ha_innodb.cc:
  Removed unused variables
sql/ha_partition.cc:
  Fixing warning
sql/partition_element.h:
  Fixing declaration for warnings
2006-08-23 15:12:42 -07:00
brian@zim.(none)
d41188130a This is a cleanup of warnings that windows is complaining about. 2006-08-23 15:12:42 -07:00
unknown
0baa801e16 Bug#20548 Events: crash if InnoDB, multiple events, busy procedures, partitions
setup 'share' struct for all partiton file elements. It's neccessary because we use
m_file[0]->update_create_info(create_info) during ha_partition::update_create_info
and 'share' for m_file[0] should be valid


sql/ha_partition.h:
  Bug#20548 Events: crash if InnoDB, multiple events, busy procedures, partitions
sql/handler.h:
  Bug#20548 Events: crash if InnoDB, multiple events, busy procedures, partitions
2006-08-23 16:58:36 +05:00
gluh@mysql.com/gluh.(none)
0ba4ff24ef Bug#20548 Events: crash if InnoDB, multiple events, busy procedures, partitions
setup 'share' struct for all partiton file elements. It's neccessary because we use
m_file[0]->update_create_info(create_info) during ha_partition::update_create_info
and 'share' for m_file[0] should be valid
2006-08-23 16:58:36 +05:00
unknown
f56dd7f9f8 Merge dator5.(none):/home/pappa/bug21350
into  dator5.(none):/home/pappa/bug21388


sql/ha_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
2006-08-17 09:32:13 -04:00
mikael/pappa@dator5.(none)
ddbdc16a21 Merge dator5.(none):/home/pappa/bug21350
into  dator5.(none):/home/pappa/bug21388
2006-08-17 09:32:13 -04:00
unknown
a5b43381fe BUG#21350: Fix correct error handling when using DATA DIRECTORY and INDEX DIRECTORY
Review fixes
2006-08-17 09:05:15 -04:00
mikael/pappa@dator5.(none)
85b3ac683c BUG#21350: Fix correct error handling when using DATA DIRECTORY and INDEX DIRECTORY
Review fixes
2006-08-17 09:05:15 -04:00
unknown
0aab7b87f9 Merge dator5.(none):/home/pappa/bug21357
into  dator5.(none):/home/pappa/bug21388


sql/ha_partition.cc:
  Auto merged
2006-08-16 10:56:22 -04:00
mikael/pappa@dator5.(none)
2c64f1d1e0 Merge dator5.(none):/home/pappa/bug21357
into  dator5.(none):/home/pappa/bug21388
2006-08-16 10:56:22 -04:00
unknown
47ed8cec46 Merge dator5.(none):/home/pappa/bug21143
into  dator5.(none):/home/pappa/bug21388


sql/ha_partition.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
2006-08-16 10:53:20 -04:00
mikael/pappa@dator5.(none)
a6df8abf2c Merge dator5.(none):/home/pappa/bug21143
into  dator5.(none):/home/pappa/bug21388
2006-08-16 10:53:20 -04:00
unknown
8ed7e1484a BUG#21173: SHOW TABLE STATUS crashes mysqld
Review fixes


mysql-test/r/partition.result:
  New test cases
mysql-test/t/partition.test:
  New test cases
sql/ha_partition.cc:
  Added comments after review
  + removed erroneus setting
2006-08-08 09:58:55 -04:00
mikael/pappa@dator5.(none)
77090920f8 BUG#21173: SHOW TABLE STATUS crashes mysqld
Review fixes
2006-08-08 09:58:55 -04:00
unknown
2bf914b40e BUG#21143: mysqld hangs when using wrong number of subpartitions
Rewrote if-statement a bit shorter
Added check for subpartitions in REORGANIZE partitions to be of same number as
in base table.


mysql-test/r/partition_mgm.result:
  New test case
mysql-test/t/partition_mgm.test:
  New test case
sql/ha_partition.cc:
  Fixed stuff I should done long ago (monty comments)
sql/sql_partition.cc:
  Rewrote if-statement a bit shorter
  Added check for subpartitions in REORGANIZE partitions to be of same number as
  in base table.
2006-08-08 08:52:51 -04:00
mikael/pappa@dator5.(none)
79ab9cef27 BUG#21143: mysqld hangs when using wrong number of subpartitions
Rewrote if-statement a bit shorter
Added check for subpartitions in REORGANIZE partitions to be of same number as
in base table.
2006-08-08 08:52:51 -04:00
unknown
9cfcc21450 BUG#21173: SHOW TABLE STATUS crashes on InnoDB tables
Don't use get_auto_increment on tables without auto_increment fields


mysql-test/r/partition.result:
  new test case
mysql-test/t/partition.test:
  new test case
sql/ha_partition.cc:
  Don't use get_auto_increment on tables without auto_increment fields
2006-08-08 08:47:58 -04:00
mikael/pappa@dator5.(none)
47a8ebe733 BUG#21173: SHOW TABLE STATUS crashes on InnoDB tables
Don't use get_auto_increment on tables without auto_increment fields
2006-08-08 08:47:58 -04:00