- 03 Oct, 2006 5 commits
-
-
unknown authored
-
unknown authored
After merge fix. field.cc: After merge fix sql/field.cc: After merge fix sql/sql_yacc.yy: After merge fix.
-
unknown authored
BitKeeper/deleted/.del-ps_6bdb.result: Auto merged client/mysql.cc: Auto merged include/m_ctype.h: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysql-test/t/strict.test: Auto merged sql/field_conv.cc: Auto merged sql/item_func.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-cp932.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-eucjpms.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-ujis.c: Auto merged strings/ctype-utf8.c: Auto merged
-
unknown authored
into mysql.com:/usr/home/bar/mysql-5.0-rpl mysql-test/r/cast.result: null merge for bug#8663 It will beed another fix for 5.0 - changes in new DECIMAL instead of FLOAT mysql-test/r/ps.result: null merge mysql-test/t/cast.test: null merge mysql-test/t/count_distinct3.test: null merge sql/item_func.cc: null merge
-
unknown authored
into mysql.com:/usr/home/bar/mysql-4.1-rpl mysql-test/r/cast.result: Auto merged mysql-test/r/ps.result: Auto merged sql/item_func.cc: Auto merged
-
- 02 Oct, 2006 6 commits
-
-
unknown authored
into mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged
-
unknown authored
into romeo.(none):/home/bk/fix-mysql-5.1-new-rpl
-
unknown authored
Adding test case. mysql-test/extra/rpl_tests/rpl_row_basic.test: Rename: mysql-test/include/rpl_row_basic.inc -> mysql-test/extra/rpl_tests/rpl_row_basic.test mysql-test/r/rpl_row_basic_11bugs.result: Result change mysql-test/t/rpl_row_basic_11bugs.test: Adding test case for bug. mysql-test/t/rpl_row_basic_2myisam.test: Moving test include file to extra/rpl_tests mysql-test/t/rpl_row_basic_3innodb.test: Moving test include file to extra/rpl_tests mysql-test/t/rpl_row_basic_7ndb.test: Moving test include file to extra/rpl_tests
-
unknown authored
-
- 01 Oct, 2006 6 commits
-
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch sql/mysql_priv.h: Auto merged sql/share/errmsg.txt: Auto merged
-
unknown authored
This patch makes ndbcluster_hton not static. I have a second patch for ndbcluster_hton to be static, but I want to talk to Jonas first. sql/ha_ndbcluster.cc: Can't quite make it static yet :) sql/ha_ndbcluster_binlog.h: Moving bad extern replacement
-
unknown authored
into zim.(none):/home/brian/mysql/merge-5.1 sql/mysql_priv.h: Auto merged
-
unknown authored
sql/sql_cursor.cc: Merge bit...
-
unknown authored
into zim.(none):/home/brian/mysql/arch-5.1 sql/mysql_priv.h: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_show.cc: Auto merged sql/handler.h: Merge from G's work sql/sql_cursor.cc: Merge from G's work storage/csv/ha_tina.cc: Merge of G's work storage/innobase/handler/ha_innodb.cc: Merge of G's work storage/innobase/handler/ha_innodb.h: Merge of G's work storage/myisam/ha_myisam.cc: Merge of G's work
-
unknown authored
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
-
- 30 Sep, 2006 3 commits
-
-
unknown authored
This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch). Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call. include/heap.h: Added new function sql/ha_ndbcluster.cc: Updated hanlderton functions sql/ha_ndbcluster_binlog.cc: Updated handlerton functions. sql/handler.cc: Updated handlerton functions. sql/handler.h: Updated hanlderton functions sql/log.cc: Updated handlerton functions sql/mysql_priv.h: Updated handlerton functions sql/mysqld.cc: Added Legacy handlerton functions sql/partition_info.cc: Added flag support for marking engines not compatible with partitioning sql/sql_cursor.cc: Updated hanlderton functions sql/sql_show.cc: Updated hanlderton functions sql/sql_tablespace.cc: Update for handlerton functions storage/archive/ha_archive.cc: Update for hanlderton functions storage/archive/ha_archive.h: Update for handlerton functions storage/blackhole/ha_blackhole.cc: Update for handlerton functions storage/csv/ha_tina.cc: Update for handlerton functions storage/csv/ha_tina.h: Update for handlerton functions storage/federated/ha_federated.cc: Updated for handlerton functions storage/federated/ha_federated.h: Updated for handlerton functions storage/heap/ha_heap.cc: Update for handlerton functions storage/heap/hp_panic.c: Update of function name storage/heap/hp_test1.c: Update of function name storage/heap/hp_test2.c: Update of function name. storage/innobase/handler/ha_innodb.cc: Update of function name storage/innobase/handler/ha_innodb.h: Update of function name storage/myisam/ha_myisam.cc: Update of function name. storage/myisammrg/ha_myisammrg.cc: Update of function name
-
unknown authored
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
-
unknown authored
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
-
- 29 Sep, 2006 12 commits
-
-
unknown authored
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
-
unknown authored
into mysql.com:/home/psergey/mysql-5.1-bug14940-r10a sql/sql_select.cc: Auto merged
-
unknown authored
-
unknown authored
mysql-test/t/view.test: moved the new error message last sql/share/errmsg.txt: moved the new error message last
-
unknown authored
- Re-worked the prev_record_reads() function to return the lower bound of number of different table access scans that will be performed. mysql-test/r/join.result: BUG#14940: testcase mysql-test/t/join.test: BUG#14940: testcase sql/sql_select.cc: BUG#14940: Slow join order is chosen: - Re-worked the prev_record_reads() function to return the lower bound of number of different table access scans that will be performed. sql/sql_select.h: BUG#14940: Slow join order is chosen: - Added comments in struct POSITION - Added POSITION::ref_depend_map: bitmap of tables that the table access method depends on.
-
unknown authored
into mysql.com:/usr/home/bar/mysql-5.0.b6147rpl mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/strict.test: Auto merged sql/field.cc: Auto merged
-
unknown authored
Fix: "mysql --xml" now print NULL values the same way that "mysqldump --xml" does: <field name="name" xsi:nil="true" /> to distinguish from empty strings: <field name="name"></field> and from string "NULL": <field name="name">NULL</field> client/mysql.cc: Fixing to print NULLs differently from empty strings mysql-test/r/client_xml.result: Fixing test result accordingly
-
unknown authored
Problem: for character sets having mbmaxlen==2, any ALTER TABLE changed TEXT column type to MEDIUMTEXT, due to wrong "internal length to create length" formula. Fix: removing rounding code introduced in early 4.1 time, which is not correct anymore. mysql-test/r/ctype_gbk.result: Adding test case mysql-test/t/ctype_gbk.test: Adding test case sql/field.cc: Fixing "internal length to create length" formula.
-
unknown authored
Adding a multibyte-aware VARCHAR copying function, to put correct column prefix, taking in account number of characters (instead just limiting on number of bytes). For example, for a KEY(col(3)) on a UTF8 column when copying the string 'foo bar foo', we should put only 3 leftmost characters: 'foo'. 9 characters were incorrectly put before this fix. mysql-test/r/ctype_utf8.result: Adding test case mysql-test/t/ctype_utf8.test: Adding test case sql/field_conv.cc: Adding multibyte aware copy function for VARCHAR
-
unknown authored
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt mysql-test/r/view.result: Auto merged mysql-test/t/view.test: Auto merged sql/mysql_priv.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt mysql-test/r/view.result: Auto merged mysql-test/t/view.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_yacc.yy: Auto merged
-
- 28 Sep, 2006 8 commits
-
-
unknown authored
After merge fix mysql-test/t/view.test: After merge fix
-
unknown authored
into moonbone.local:/work/5505-bug-5.0-opt-mysql sql/share/errmsg.txt: Auto merged sql/sql_base.cc: Auto merged mysql-test/r/view.result: Manual merge mysql-test/t/view.test: Manual merge
-
unknown authored
On an INSERT into an updatable but non-insertable view an error message was issued stating the view being not updatable. This can lead to a confusion of a user. A new error message is introduced. Is is showed when a user tries to insert into a non-insertable view. sql/sql_base.cc: Fixed bug#5505: Wrong error message on INSERT into a view The update_non_unique_table_error() function now issues proper error for an INSERT. sql/sql_insert.cc: Fixed bug#5505: Wrong error message on INSERT into a view Issue the ER_NON_INSERTABLE_TABLE error instead of the ER_NON_UPDATABLE_TABLE on insert into a view. sql/sql_view.cc: Fixed bug#5505: Wrong error message on INSERT into a view Issue the ER_NON_INSERTABLE_TABLE error instead of the ER_NON_UPDATABLE_TABLE on insert into a view. mysql-test/r/view.result: Added the test case for bug#5505: Wrong error message on INSERT into a view Corrected a few test cases after fixing bug#5505 mysql-test/t/view.test: Added the test case for bug#5505: Wrong error message on INSERT into a view Corrected a few test cases after fixing bug#5505 sql/share/errmsg.txt: Fixed bug#5505: Wrong error message on INSERT into a view Added the ER_NON_INSERTABLE_TABLE error definition.
-
unknown authored
into zim.(none):/home/brian/mysql/merge-5.1 sql/handler.h: Auto merged
-
unknown authored
into zim.(none):/home/brian/mysql/merge-5.1 storage/csv/ha_tina.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged
-
unknown authored
binlog_row_binlog.test failure in team tree. Fixing the result that gets wrong with --binlog-format=mixed (so that skipped on pushbuild currently) mysql-test/r/binlog_stm_binlog.result: Fixing the result.
-
unknown authored
by make test - got changed due to show binlog events relocation to deterministic position at extra/binlog_tests/binlog_insert_delayed.test. mysql-test/r/binlog_statement_insert_delayed.result: results changed due to moving a binlog check affront of indetermistic queries.
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.1 sql/mysql_priv.h: Auto merged sql/sp.cc: Auto merged sql/sql_acl.cc: Auto merged
-