maria-developers team mailing list archive

[<serg@xxxxxxxxxxxx>]

At http://bazaar.launchpad.net/~maria-captains/maria/5.2/

------------------------------------------------------------
revno: 2776 [merge]
revision-id: sergii@xxxxxxxxx-20100408085536-qjt3rz3su3oumthu
parent: sergii@xxxxxxxxx-20100406110456-zhkf13tvdcywb9tb
parent: sanja@xxxxxxxxxxxx-20100406000609-jl8415st523eq5jj
committer: Sergei Golubchik <sergii@xxxxxxxxx>
branch nick: 5.2
timestamp: Thu 2010-04-08 10:55:36 +0200
message:
  post-review changes, and merge of the MWL#43 CREATE TABLE options
added:
  mysql-test/r/create_options.result create_options.resul-20100406150813-x9l18ft2v5asbu6u-1
  mysql-test/t/create_options.test create_options.test-20100405221601-8v82yzjsbg8d5t9h-1
  sql/create_options.cc          create_options.cc-20100405221547-pgejz63vqubo45gk-1
  sql/create_options.h           create_options.h-20100405221550-zuwt433ekdv7y9u3-1
modified:
  .bzrignore                     sp1f-ignore-20001018235455-q4gxfbritt5f42nwix354ufpsvrf5ebj
  Docs/sp-imp-spec.txt           sp1f-spimpspec.txt-20030202164941-cm47byoggfqjr73hhqr24vos7luqh36q
  include/my_base.h              sp1f-my_base.h-19700101030959-3yhq5cta6tatwfxpqmoukzvevlehtxoz
  include/my_sys.h               sp1f-my_sys.h-19700101030959-lyllvna5vzqfcjnmlcrutgqocylhtb54
  libmysqld/CMakeLists.txt       sp1f-cmakelists.txt-20060403082523-x3vxka3k56u2wpzwcrlpykznlz2akpxd
  libmysqld/Makefile.am          sp1f-makefile.am-20010411110351-26htpk3ynkyh7pkfvnshztqrxx3few4g
  mysql-test/r/events_bugs.result sp1f-events_bugs.result-20060220225211-jzbz6uk6vlho4vlbzbfymaub54fll3ou
  mysql-test/r/information_schema.result sp1f-information_schema.r-20041113105544-waoxa2fjjsicturpothmjmi6jc3yrovn
  mysql-test/r/plugin.result     sp1f-plugin.result-20061214230953-dljmjo3wuacc3eox3gwroufqmk3hlne7
  mysql-test/r/sp.result         sp1f-sp.result-20030117133802-duandg3yzagzyv7zhhbbt2kcomcegpc7
  mysql-test/r/system_mysql_db.result sp1f-system_mysql_db.resu-20040310185404-f7br5g4442iqwxireltudlyu5ppbkijo
  mysql-test/suite/funcs_1/r/is_columns_mysql.result sp1f-is_columns_mysql.res-20080307163304-a2ymkif2vzliwqqqzr22cglbaf75tthe
  mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result is_columns_mysql_emb-20080616171935-sl04j972o55obadv-7
  mysql-test/t/events_bugs.test  sp1f-events_bugs.test-20060220225212-ji5acdijogityb45kk4msvs7h5gn4ld3
  mysql-test/t/plugin.test       sp1f-plugin.test-20061214230953-rdqkovjzpupoeypjzzvefseahkmrdz4f
  mysql-test/t/sp.test           sp1f-sp.test-20030117133803-b6pcfv2yscbqkur5fszep7acmdg7nf5k
  scripts/mysql_system_tables.sql sp1f-mysql_system_tables.-20070226104923-4n5a67fuifobcyhhicfbacpsv5npohgv
  scripts/mysql_system_tables_fix.sql sp1f-mysql_fix_privilege_-20030604152848-cz6lnrig5srcrvkt7d5m35bk3wsz4bdc
  sql/CMakeLists.txt             sp1f-cmakelists.txt-20060831175237-esoeu5kpdtwjvehkghwy6fzbleniq2wy
  sql/Makefile.am                sp1f-makefile.am-19700101030959-xsjdiakci3nqcdd4xl4yomwdl5eo2f3q
  sql/event_db_repository.cc     sp1f-event_db_repository.-20060627064838-k6rpjg72omnihtxhbubu6ht7wjvxggb7
  sql/field.cc                   sp1f-field.cc-19700101030959-f4imaofclsea3n4fj4ow5m7havmyxa2r
  sql/field.h                    sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
  sql/ha_partition.cc            sp1f-ha_partition.cc-20050718113037-eoky4qluumb5dmdyg5z6n2fvdkgutxms
  sql/handler.cc                 sp1f-handler.cc-19700101030959-ta6zfrlbxzucylciyro3musjsdpocrdh
  sql/handler.h                  sp1f-handler.h-19700101030959-mumq2hpilkpgxuf22ftyv5kbilysnzvn
  sql/log_event.h                sp1f-log_event.h-19700101030959-clq6ett55tcqbpys2i4cpfrdccq7j4om
  sql/mysql_priv.h               sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
  sql/mysqld.cc                  sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
  sql/share/errmsg.txt           sp1f-errmsg.txt-20041213212820-do5w642w224ja7ctyqhyl6iihdmpkzv5
  sql/sp.cc                      sp1f-sp.cc-20021212121421-6xwuvxq5bku2b4yv655kp2e5gsvautd5
  sql/sp_head.cc                 sp1f-sp_head.cc-20021208185920-jtgc5wvyqdnu2gvcdus3gazrfhxbofxd
  sql/sql_class.cc               sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
  sql/sql_class.h                sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
  sql/sql_insert.cc              sp1f-sql_insert.cc-19700101030959-xgwqe5svnimxudzdcuitauljzz2zjk5g
  sql/sql_lex.h                  sp1f-sql_lex.h-19700101030959-sgldb2sooc7twtw5q7pgjx7qzqiaa3sn
  sql/sql_parse.cc               sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
  sql/sql_plugin.cc              sp1f-sql_plugin.cc-20051105112032-hrm64p6xfjq33ud6zy3uivpo7azm75a2
  sql/sql_show.cc                sp1f-sql_show.cc-19700101030959-umlljfnpplg452h7reeyqr4xnbmlkvfj
  sql/sql_table.cc               sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
  sql/sql_view.cc                sp1f-sql_view.cc-20040715221517-nw4p4mja6nzzlvwwhzfgfqb4umxqobe4
  sql/sql_yacc.yy                sp1f-sql_yacc.yy-19700101030959-wvn4qyy2drpmge7kaq3dysprbhlrv27j
  sql/structs.h                  sp1f-structs.h-19700101030959-dqulhwijezc2pwv2x4g32qdggnybj2nc
  sql/table.cc                   sp1f-table.cc-19700101030959-nsxtem2adyqzwe6nz4cgrpcmts3o54v7
  sql/table.h                    sp1f-table.h-19700101030959-dv72bajftxj5fbdjuajquappanuv2ija
  sql/unireg.cc                  sp1f-unireg.cc-19700101030959-6a4wymwak6cmvk25gch56ctjvadrhu3v
  storage/example/ha_example.cc  sp1f-ha_example.cc-20040331231732-d55r4dr2e7cf5dutte3f74z6h6yxdywb
  storage/example/ha_example.h   sp1f-ha_example.h-20040331231733-ssl4zmhqjrevhtqixivtivdmlwiau2x5
  storage/pbxt/src/discover_xt.cc discover_xt.cc-20090326121724-x683v32twzr3fi0y-26

Diff too large for email (3198 lines, the limit is 1000).