mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align Added OLAP function ROLLUP Split mysql_fix_privilege_tables to a script and a .sql data file Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects. Added table_alias_charset, for easier --lower-case-table-name handling Better SQL_MODE handling (Setting complex options also sets sub options) New (faster) assembler string functions for x86 BitKeeper/etc/ignore: added libmysqld/sql_state.c client/mysql.cc: Added SQLSTATE to error messages Added new function put_error() to be able to clean up some old code. client/mysqltest.c: Write ERROR SQLSTATE for all errors dbug/dbug.c: Portability fixes include/m_string.h: Rename bmove_allign as bmove_align include/mysql.h: Added SQLSTATE (for embedded version) include/mysql_com.h: Send correct SQLSTATE for the error to the client libmysql/libmysql.c: Changed default error state to HY000 Applied code cleanup patch libmysqld/Makefile.am: Added sql_state.cc libmysqld/libmysqld.c: Added sqlstate mysql-test/r/analyse.result: Updated results mysql-test/r/ansi.result: Updated results mysql-test/r/auto_increment.result: Updated results mysql-test/r/bdb-deadlock.result: Updated results mysql-test/r/bdb.result: Updated results mysql-test/r/comments.result: Updated results mysql-test/r/create.result: Updated results mysql-test/r/ctype_collate.result: Updated results mysql-test/r/delayed.result: Updated results mysql-test/r/delete.result: Updated results mysql-test/r/derived.result: Updated results mysql-test/r/distinct.result: Updated results mysql-test/r/drop.result: Updated results mysql-test/r/err000001.result: Updated results mysql-test/r/explain.result: Updated results mysql-test/r/flush.result: Updated results mysql-test/r/fulltext.result: Updated results mysql-test/r/func_gconcat.result: Updated results mysql-test/r/func_system.result: Updated results mysql-test/r/grant_cache.result: Updated results mysql-test/r/group_by.result: Updated results mysql-test/r/handler.result: Updated results mysql-test/r/heap.result: Updated results mysql-test/r/heap_btree.result: Updated results mysql-test/r/heap_hash.result: Updated results mysql-test/r/innodb.result: Updated results mysql-test/r/innodb_handler.result: Updated results mysql-test/r/insert_select.result: Updated results mysql-test/r/insert_update.result: Updated results mysql-test/r/join.result: Updated results mysql-test/r/join_outer.result: Updated results mysql-test/r/key.result: Updated results mysql-test/r/lock.result: Updated results mysql-test/r/lock_multi.result: Updated results mysql-test/r/merge.result: Updated results mysql-test/r/multi_update.result: Updated results mysql-test/r/myisam.result: Updated results mysql-test/r/null.result: Updated results mysql-test/r/olap.result: Updated results mysql-test/r/order_by.result: Updated results mysql-test/r/packet.result: Updated results mysql-test/r/query_cache.result: Updated results mysql-test/r/row.result: Updated results mysql-test/r/rpl000001.result: Updated results mysql-test/r/rpl000009.result: Updated results mysql-test/r/rpl_empty_master_crash.result: Updated results mysql-test/r/rpl_log.result: Updated results mysql-test/r/rpl_replicate_do.result: Updated results mysql-test/r/rpl_rotate_logs.result: Updated results mysql-test/r/select.result: Updated results mysql-test/r/select_safe.result: Updated results mysql-test/r/show_check.result: Updated results mysql-test/r/sql_mode.result: Updated results mysql-test/r/subselect.result: Updated results mysql-test/r/temp_table.result: Updated results mysql-test/r/truncate.result: Updated results mysql-test/r/type_blob.result: Updated results mysql-test/r/type_decimal.result: Updated results mysql-test/r/type_float.result: Updated results mysql-test/r/type_ranges.result: Updated results mysql-test/r/union.result: Updated results mysql-test/r/update.result: Updated results mysql-test/r/user_var.result: Updated results mysql-test/r/varbinary.result: Updated results mysql-test/r/variables.result: Updated results mysql-test/t/ansi.test: Test of sql_mode mysql-test/t/derived.test: Updated results mysql-test/t/func_system.test: Make this independen of the MySQL server name mysql-test/t/lowercase_table.test: Cleanup mysql-test/t/olap.test: A lot of new tests mysql-test/t/sql_mode.test: More test for sql_mode mysql-test/t/subselect.test: Added a few new tests (to find a bug in the item_ref code) scripts/Makefile.am: Added mysql_fix_privilege_tables.sql scripts/mysql_fix_privilege_tables.sh: Totally new script. This bascily just pipes mysql_fix_privilege_tables.sql through 'mysql' to 'mysqld' sql/Makefile.am: Added sql_state.cc sql/item.cc: Extended Item_field::eq() to be able to better match GROUP BY fields on the command line. Needed for ROLLUP sql/item.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/item_sum.cc: Moved copy_or_same() and some reset() functions from item_sum.h Needed to be able to access thd->mem_root. sql/item_sum.h: Moved some functions to item_sum.cc Added make_unique() for ROLLUP sql/item_uniq.h: Fixed return value sql/mysql_priv.h: Updated MODE flags sql/mysqld.cc: Added ANSI as it's own mode Moved charset_info variables here Cleaned up handler_count handling (for NT) Added table_alias_charset, for easier --lower-case-table-name handling sql/net_serv.cc: New comment sql/protocol.cc: Send SQLSTATE to client sql/set_var.cc: Better SQL_MODE handling (Setting complex options also sets sub options) sql/set_var.h: Better SQL_MODE handling sql/sql_base.cc: Make alias depend on --lower-case-table-names Make find_item_in_list also check database name sql/sql_cache.cc: Indentation cleanup sql/sql_list.h: Added safety assert Addes support of alloc without current_thd() sql/sql_prepare.cc: Update after prototype change sql/sql_select.cc: Added ROLLUP sql/sql_select.h: structures for rollup sql/sql_show.cc: Easier SQL_MODE handling sql/sql_string.cc: Move CHARSET_INFO to mysqld (to be together with all other global variables) sql/sql_string.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/sql_table.cc: Simpler --lower-case-table-name handling sql/sql_union.cc: Update after prototype change sql/sql_yacc.yy: ROLLUP sql/unireg.h: bmove_allign ->bmove_align strings/Makefile.am: Fix to be able to compile str_test.c strings/ctype.c: Removed empty lines strings/str_test.c: Added test of bmove_align strings/strings-x86.s: Faster bmove_align, bmove_upp and strmake strings/strings.asm: move_allg
This commit is contained in:
@ -23,44 +23,53 @@
|
||||
# Move a alligned, not overlapped, by (long) divided memory area
|
||||
# Args: to,from,length
|
||||
|
||||
.globl bmove_allign
|
||||
.type bmove_allign,@function
|
||||
bmove_allign:
|
||||
.globl bmove_align
|
||||
.type bmove_align,@function
|
||||
bmove_align:
|
||||
movl %edi,%edx
|
||||
movl %esi,%eax
|
||||
push %esi
|
||||
movl 4(%esp),%edi # to
|
||||
movl 8(%esp),%esi # from
|
||||
movl 12(%esp),%ecx # length
|
||||
addw $3,%cx # fix if not divisible with long
|
||||
shrw $2,%cx
|
||||
rep
|
||||
movsl
|
||||
movl %eax,%esi
|
||||
jz .ba_20
|
||||
.p2align 4,,7
|
||||
.ba_10:
|
||||
movl -4(%esi,%ecx),%eax
|
||||
movl %eax,-4(%edi,%ecx)
|
||||
decl %ecx
|
||||
jnz .ba_10
|
||||
.ba_20: pop %esi
|
||||
movl %edx,%edi
|
||||
ret
|
||||
.end:
|
||||
.size bmove_allign,.end-bmove_allign
|
||||
.size bmove_align,.end-bmove_align
|
||||
|
||||
# Move a string from higher to lower
|
||||
# Arg from+1,to+1,length
|
||||
# Arg from_end+1,to_end+1,length
|
||||
|
||||
.globl bmove_upp
|
||||
.type bmove_upp,@function
|
||||
bmove_upp:
|
||||
std # Work downward
|
||||
movl %edi,%edx
|
||||
movl %esi,%eax
|
||||
movl 4(%esp),%edi # p1
|
||||
movl 8(%esp),%esi # p2
|
||||
movl 12(%esp),%ecx # length
|
||||
decl %edi # Don't move last arg
|
||||
decl %esi
|
||||
rep
|
||||
movsb # One byte a time because overlap
|
||||
cld # C library wants cld
|
||||
movl %eax,%esi
|
||||
movl %edi,%edx # Remember %edi
|
||||
push %esi
|
||||
movl 8(%esp),%edi # dst
|
||||
movl 16(%esp),%ecx # length
|
||||
movl 12(%esp),%esi # source
|
||||
test %ecx,%ecx
|
||||
jz .bu_20
|
||||
subl %ecx,%esi # To start of strings
|
||||
subl %ecx,%edi
|
||||
|
||||
.p2align 4,,7
|
||||
.bu_10: movb -1(%esi,%ecx),%al
|
||||
movb %al,-1(%edi,%ecx)
|
||||
decl %ecx
|
||||
jnz .bu_10
|
||||
.bu_20: pop %esi
|
||||
movl %edx,%edi
|
||||
ret
|
||||
|
||||
.bmove_upp_end:
|
||||
.size bmove_upp,.bmove_upp_end-bmove_upp
|
||||
|
||||
@ -304,22 +313,23 @@ si_99: popl %ebp
|
||||
strmake:
|
||||
pushl %edi
|
||||
pushl %esi
|
||||
movl 12(%esp),%edi # dst
|
||||
movl 16(%esp),%esi # src
|
||||
movl 20(%esp),%ecx # Length of memory-area
|
||||
clrb %al # For test of end-null
|
||||
jecxz sm_90 # Nothing to move, put zero at end.
|
||||
|
||||
sm_10: cmpb (%esi),%al # Next char to move
|
||||
movsb # move arg
|
||||
jz sm_99 # last char, we are ready
|
||||
loop sm_10 # Continue moving
|
||||
sm_90: movb %al,(%edi) # Set end pos
|
||||
incl %edi # Fix that di points at end null
|
||||
sm_99: decl %edi # di points now at end null
|
||||
movl %edi,%eax # Ret value.p $
|
||||
popl %esi
|
||||
popl %edi
|
||||
mov 12(%esp),%edi # dst
|
||||
movl $0,%edx
|
||||
movl 20(%esp),%ecx # length
|
||||
movl 16(%esp),%esi # src
|
||||
cmpl %edx,%ecx
|
||||
jz sm_90
|
||||
sm_00: movb (%esi,%edx),%al
|
||||
cmpb $0,%al
|
||||
jz sm_90
|
||||
movb %al,(%edi,%edx)
|
||||
incl %edx
|
||||
cmpl %edx,%ecx
|
||||
jnz sm_00
|
||||
sm_90: movb $0,(%edi,%edx)
|
||||
sm_99: lea (%edi,%edx),%eax # Return pointer to end null
|
||||
pop %esi
|
||||
pop %edi
|
||||
ret
|
||||
.strmake_end:
|
||||
.size strmake,.strmake_end-strmake
|
||||
|
Reference in New Issue
Block a user