1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Commit Graph

19274 Commits

Author SHA1 Message Date
unknown
f918dfc8b2 rename of net_pkg.cc to protocol.cc
Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.


libmysql/libmysql.c:
  Jump over reserved bits in the binary protocol
libmysqld/Makefile.am:
  rename of net_pkg.cc to protocol.cc
mysql-test/r/case.result:
  Fixed previously wrong test
mysql-test/r/cast.result:
  Fixed previously wrong test
sql/Makefile.am:
  Rename of net_pkg.cc to protocol.cc
sql/field.cc:
  Binary protocol
  Added key handling functions for new VARCHAR type
sql/field.h:
  New protocol
sql/ha_berkeley.cc:
  New protocol
sql/ha_berkeley.h:
  New protocol
sql/ha_innodb.cc:
  New protocol
sql/ha_myisam.cc:
  New protocol
sql/item.cc:
  New protocol
sql/item.h:
  New protocol
sql/item_func.cc:
  Removed old code from 3.23
sql/item_func.h:
  Set cached_result_type as it was previosly used before set
sql/item_subselect.cc:
  Standard make_field() is now good enough
sql/item_subselect.h:
  Use default make_field()
sql/item_sum.cc:
  Clean up Item_sum::make_field()
sql/item_sum.h:
  Use standard make_field()
sql/item_timefunc.h:
  return correct types for casts()
  Use standard make_field()
sql/log_event.cc:
  New protocol
sql/log_event.h:
  New protocol
sql/mysql_priv.h:
  Move things to protocol.h
sql/opt_range.cc:
  Indentation cleanups + small optimization
sql/procedure.h:
  Use MYSQL_TYPE instead of FIELD_TYPE
sql/protocol.cc:
  Class for sending data from server to client.
  This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
sql/repl_failsafe.cc:
  New protocol
sql/slave.cc:
  New protocol
sql/sql_acl.cc:
  New protocol
sql/sql_base.cc:
  Move send_fields() to protocol.cc
sql/sql_class.cc:
  New protocol
sql/sql_class.h:
  New protocol
sql/sql_db.cc:
  New protocol
sql/sql_error.cc:
  New protocol
sql/sql_handler.cc:
  New protocol
sql/sql_help.cc:
  New protocol
sql/sql_parse.cc:
  Remove wrong assert (variable was not initalized at this point)
sql/sql_prepare.cc:
  New protocol
sql/sql_repl.cc:
  New protocol
sql/sql_select.cc:
  New protocol
sql/sql_show.cc:
  New protocol
sql/sql_string.h:
  New functions used by the protocol functions
sql/sql_table.cc:
  New protocol
sql/structs.h:
  Make second_part ulong to prepare for ANSI sub-seconds
sql/time.cc:
  New convert function needed by the new protocol functions
2002-12-11 09:17:51 +02:00
unknown
3bbf4e9701 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-12-10 21:38:30 +01:00
unknown
91d3e2b3b8 postreview fix (SCRUM)
NULL fixed
max_length fixed
layout fixed


mysql-test/r/row.result:
  NULL fixed
mysql-test/t/row.test:
  NULL fixed
sql/item.cc:
  postreview fix
sql/item.h:
  postreview fix
sql/item_cmpfunc.cc:
  layout fix
  postreview fix
  max_length fix
  NULL fixed
sql/item_cmpfunc.h:
  postreview fix
sql/item_row.cc:
  NULL fixed
sql/item_row.h:
  NULL fixed
sql/sql_class.cc:
  postreview fix
2002-12-10 18:10:00 +02:00
unknown
62ce900c2e Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_analyse.cc:
  Auto merged
2002-12-10 13:39:06 +02:00
unknown
6f88718fc9 merging
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-12-10 11:45:40 +02:00
unknown
cd292d1f03 merging
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
2002-12-10 11:41:47 +02:00
unknown
3a25ef2191 More new style str->num 2002-12-10 12:43:17 +04:00
unknown
37a02e4ce4 Update Windows binaries prefix according MySQL Pro release package
sql/mysqld.cc:
  With the introduction of Pro release version the InnoDB table engine
  was added for all binaries and not more define only the max package
2002-12-10 04:17:31 -04:00
unknown
0eef805e5a Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-12-10 10:55:19 +04:00
unknown
181537e924 incorrect bugfix removed. EQ+BETWEEN still cannot be optimized :( 2002-12-10 00:07:25 +01:00
unknown
127d01dd01 ANALYZE for MERGE 2002-12-10 00:06:05 +01:00
unknown
4e20633094 fix for a bug with UNION in sub-select's and start working on
UNION's in derived tables
2002-12-09 20:47:47 +02:00
unknown
41b045f483 More use of new str->num conversion routines 2002-12-09 17:57:17 +04:00
unknown
26a5f74152 Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pz/mysql/mysql-4.1-root
2002-12-09 15:30:15 +03:00
unknown
89524b29c4 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_select.cc:
  Auto merged
2002-12-09 14:04:29 +02:00
unknown
97a1587691 More use of new str->num conversion routines 2002-12-09 15:58:33 +04:00
unknown
8ae15f948f More use of new str->num functions 2002-12-09 15:45:05 +04:00
unknown
b569fa6a3e Minor new auth fixes
sql/password.c:
  Add checks and fix new auth changes.
sql/sql_parse.cc:
  Remove the check. It is done in different place
2002-12-09 14:29:17 +03:00
unknown
bb0343b120 More use of new str->number routines 2002-12-09 14:58:24 +04:00
unknown
e503a5807d More use of new string->number conversion routines 2002-12-09 14:31:11 +04:00
unknown
a13f24b490 Use of new string->number conversion routines 2002-12-09 14:08:42 +04:00
unknown
3b24e7c065 fixed typo in cardinality check of row items (SCRUM)
sql/item_cmpfunc.cc:
  fixed typo
2002-12-08 23:56:40 +02:00
unknown
27de9ece81 Simplistic, experimental framework for Stored Procedures (SPs).
Implements creation and dropping of PROCEDUREs, IN, OUT, and INOUT parameters,
single-statement procedures, rudimentary multi-statement (begin-end) prodedures
(when the client can handle it), and local variables.
Missing most of the embedded SQL language, all attributes, FUNCTIONs, error handling,
reparses procedures at each call (no caching), etc, etc.
Certainly buggy too, but procedures can actually be created and called....


sql/Makefile.am:
  Added SP files.
sql/item.cc:
  Added this*_item() methods for Item_splocal. (SP local variable)
sql/item.h:
  Added this*_item() methods for SPs in Item, and the new Item_splocal
  class (SP local variable).
sql/lex.h:
  Added new symbols for SPs. (Note: SPSET is temporary and will go away later.)
sql/sql_class.cc:
  Initialize SP runtime context in THD.
sql/sql_class.h:
  Add SP runtime context to THD.
sql/sql_lex.cc:
  Init. buf pointer to beginning of command (needed by SPs).
  Also initialize SP head and parse time context.
sql/sql_lex.h:
  New SQLCOM_ tags for SPs, and added pointer to beginning of command pointer and
  SP head and parse-time context to LEX.
sql/sql_parse.cc:
  Added SQLCOM_CREATE_PROCEDURE, _CALL, _ALTER_PROCEDURE and _DROP_PROCEDURE cases.
  (Still rudimentary and lacking proper error handling...)
sql/sql_yacc.yy:
  Lots and lots of additions for SPs...
  (Still even more missing, and no error messages...)
2002-12-08 19:59:22 +01:00
unknown
b392b78400 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
2002-12-08 17:28:11 +02:00
unknown
230f5f3b0f optimized IN with Rows (SCRUM)
NULL with row (IN)
cardinality error of row inside row
new[]
fixed layout


mysql-test/r/row.result:
  test of optimized IN with Rows
  test of NULL with row
  test of cardinality error of row inside row
mysql-test/t/row.test:
  test of optimized IN with Rows
  test of NULL with row
  test of cardinality error of row inside row
sql/item_cmpfunc.cc:
  optimized IN with Rows
  NULL with row (IN)
  cardinality error of row inside row
sql/item_cmpfunc.h:
  optimized IN with Rows
  NULL with row (IN)
  cardinality error of row inside row
  fixed layout
sql/sql_list.h:
  fixed layout
  new[]
2002-12-08 03:19:03 +02:00
unknown
6271ea35b8 bulk insert code optimized
mysql-test/r/distinct.result:
  updated
mysql-test/r/fulltext.result:
  updated
mysql-test/r/select.result:
  updated
mysql-test/r/show_check.result:
  updated
mysql-test/t/insert.test:
  updated
2002-12-07 22:40:20 +01:00
unknown
5b54427d7d IN with row item without constant optimisation (SCRUM)
renamed row item test


mysql-test/r/row.result:
  IN with row item without constant optimisation
mysql-test/t/row.test:
  IN with row item without constant optimisation
sql/item_cmpfunc.cc:
  IN with row item without constant optimisation
sql/item_cmpfunc.h:
  IN with row item without constant optimisation
2002-12-07 19:58:05 +02:00
unknown
30cb4a8676 Merge sanja.is.com.ua:/home/bell/mysql/work-null-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-12-07 16:02:03 +02:00
unknown
71622d51c3 Row item fixing (SCRUM related)
Inserted comment


sql/item_row.cc:
  Row item fixing
sql/item_row.h:
  Row item fixing
sql/sql_select.cc:
  Inserted comment
2002-12-07 16:00:39 +02:00
unknown
d7fa62cbc6 Made sql_yacc.yy work with bison 1.75.
sql/sql_yacc.yy:
  Made it work with bison 1.75.
  Removed a duplicate type definition, removed two extraneous ; and added two more {}.
2002-12-07 12:35:57 +01:00
unknown
e9c64656f2 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_analyse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-12-07 12:19:33 +02:00
unknown
a20a8ffba6 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
2002-12-07 10:53:52 +02:00
unknown
0a65a22432 probably fix depended subselect cleanup
fixed cleanup on error message handling
2002-12-07 10:53:33 +02:00
unknown
cd5ef4d94b item.cc:
Fix for save_in_field to take extra bool argumnet (4.0 merge compatibility)


sql/item.cc:
  Fix for save_in_field to take extra bool argumnet (missed one)
sql/sql_prepare.cc:
  cleanups for init_param_items
2002-12-06 23:39:11 -08:00
unknown
5a55e25c87 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-12-06 22:50:50 +02:00
unknown
7cc9c3c6bf Don't initialize fulltext functions twice in multi-table-update
mysql-test/mysql-test-run.sh:
  Added option --extern (from 4.1)
mysql-test/r/multi_update.result:
  Portability fix
mysql-test/t/multi_update.test:
  Portability fix
2002-12-06 22:49:16 +02:00
unknown
baebdcfc58 Remove usage of acl_getroot() in embedded server.
Fixed compilation problem when OPENSSL was enabled.


libmysqld/lib_sql.cc:
  Remove usage of acl_getroot() as user accounts is not useful with embedded server
sql/sql_acl.cc:
  Fixed compilation problem when OPENSSL was enabled
2002-12-06 22:01:12 +02:00
unknown
59b3711986 _NEW_ IN/ALL/ANY/SOME behaviour with NULL (SCRUM related)
optimization of left expression evaluation
more descriptive method name


mysql-test/r/func_in.result:
  test of _NEW_ IN behaviour with NULL
mysql-test/r/subselect.result:
  test of _NEW_ IN/ALL/ANY/SOME behaviour with NULL
mysql-test/t/func_in.test:
  test of _NEW_ IN behaviour with NULL
mysql-test/t/subselect.test:
  test of _NEW_ IN/ALL/ANY/SOME behaviour with NULL
sql/item.cc:
  _NEW_ IN/ALL/ANY/SOME behaviour with NULL
  optimization of left expression evaluation
sql/item.h:
  _NEW_ IN/ALL/ANY/SOME behaviour with NULL
  optimization of left expression evaluation
sql/item_cmpfunc.cc:
  _NEW_ IN/ALL/ANY/SOME behaviour with NULL
  optimization of left expression evaluation
sql/item_cmpfunc.h:
  _NEW_ IN/ALL/ANY/SOME behaviour with NULL
  optimization of left expression evaluation
sql/item_subselect.cc:
  _NEW_ IN/ALL/ANY/SOME behaviour with NULL
  optimization of left expression evaluation
sql/item_subselect.h:
  _NEW_ IN/ALL/ANY/SOME behaviour with NULL
  optimization of left expression evaluation
sql/sql_class.cc:
  more descriptive method name
sql/sql_union.cc:
  more descriptive method name
2002-12-06 21:55:53 +02:00
unknown
3b0f8e896a merge fix
libmysql/libmysql.c:
  Auto merged
libmysql/password.c:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/password.c:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-06 21:15:05 +02:00
unknown
ae4323e0d9 After merge fixes
Added THD to add_to_xxx_list() functions for faster parsing.


heap/_check.c:
  After merge fix
mysql-test/r/distinct.result:
  After merge fix
mysql-test/r/multi_update.result:
  Make timestamp test portable
mysql-test/t/multi_update.test:
  Make timestamp test portable
sql/field.cc:
  After merge fix
sql/item_sum.cc:
  After merge fix
sql/log_event.cc:
  Remove compiler warning
sql/mysql_priv.h:
  Added THD to add_to_list (Faster parsing)
sql/sql_derived.cc:
  Fixed parameters to create_tmp_table()
sql/sql_lex.cc:
  Added THD to add_to_list (Faster parsing)
sql/sql_lex.h:
  Added THD to add_to_list (Faster parsing)
sql/sql_parse.cc:
  Added THD to add_to_list (Faster parsing)
sql/sql_select.cc:
  After merge fixes
  Fixed return values from JOIN::optimize()
  Replaced test_function_query with '!tables_list'
  Optimized arguments to create_tmp_table()
sql/sql_select.h:
  Removed test_function_query variable
  Updated prototypes
sql/sql_union.cc:
  Updated argument lists.
sql/sql_update.cc:
  After merge fixes
sql/sql_yacc.yy:
  Added THD to all add_xxx_to_list() functions
sql/table.h:
  After merge fix
2002-12-06 21:11:27 +02:00
unknown
9deccde0d4 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_analyse.cc:
  Auto merged
2002-12-06 18:36:25 +02:00
unknown
f67abe26fb fixed bug of PROCEDURE in same query with subselects
prohibited using procedure inside subquery
fixed error handling of procedure analize


mysql-test/r/subselect.result:
  test of PROCEDURE in subselect
  test of PROCEDURE of subselect
mysql-test/t/subselect.test:
  test of PROCEDURE in subselect
  test of PROCEDURE of subselect
sql/sql_analyse.cc:
  fixed error handling in procedure analize
sql/sql_parse.cc:
  fixed bug of PROCEDURE in same query with subselects
sql/sql_yacc.yy:
  prohibited using procedure inside subquery
2002-12-06 00:40:28 +02:00
unknown
23865c0eea Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-12-05 21:38:55 +01:00
unknown
a29ee10048 current_user() to return priv_user 2002-12-05 21:38:27 +01:00
unknown
ef4f5b2148 sql_error.cc:
make tests to go ; becuase of DROP TABLE ID EXISTS warnings


sql/sql_error.cc:
  make tests to go ; becuase of DROP TABLE ID EXISTS warnings
2002-12-05 12:34:22 -08:00
unknown
446f877906 row0mysql.c, dict0dict.c, db0err.h, ha_innobase.cc:
Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd


sql/ha_innobase.cc:
  Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
innobase/include/db0err.h:
  Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
innobase/dict/dict0dict.c:
  Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
innobase/row/row0mysql.c:
  Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
2002-12-05 22:03:24 +02:00
unknown
c5e377e0cd Fix for few PROCEDURE bugs ... 2002-12-05 21:51:22 +02:00
unknown
3196a915c9 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1


sql/mysql_priv.h:
  Auto merged
2002-12-05 11:34:15 -08:00
unknown
6d33f73416 Merge with 4.0.6
BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
heap/hp_delete.c:
  Auto merged
heap/hp_scan.c:
  Auto merged
include/my_base.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/hash.c:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/uniques.cc:
  Auto merged
strings/strto.c:
  Auto merged
vio/vio.c:
  Auto merged
BitKeeper/triggers/post-commit:
  Add changeset to commit messages
sql-bench/crash-me.sh:
  Use version from 4.0
sql-bench/server-cfg.sh:
  Use version from 4.0
2002-12-05 19:38:42 +02:00
unknown
fdb093fc47 Copy arguments given to mysql_server_init()
Made keybuff_size longlong (To make show variables work similar on 32
and 64 bit systems)
Fixed some 'not initalized variable errors' in multi-table-update.
Fixed memory leak in multi-table-update.
Now all tests works under valgrind without any errors.


libmysqld/lib_sql.cc:
  Copy arguments given to mysql_server_init()
mysql-test/r/temp_table.result:
  Update test results (after merge form 3.23)
sql/handler.cc:
  Made keybuff_size longlong
sql/mysql_priv.h:
  Made keybuff_size longlong
sql/mysqld.cc:
  Made keybuff_size longlong
sql/set_var.cc:
  Made keybuff_size longlong
sql/set_var.h:
  Made keybuff_size longlong
sql/sql_select.cc:
  Simple cleanup
sql/sql_select.h:
  Make TMP_TABLE_PARAM to be allocated through Sql_alloc
sql/sql_update.cc:
  Fixed some 'not initalized variable errors' in multi-table-update.
  Fixed memory leak in multi-table-update
2002-12-05 16:38:49 +02:00