mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
bbab9ec678
Noteworthy: - New HANDLER code - New multi-update-grant-check code - Table lock code in ha_innodb.cc was not applied BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e: Auto merged Build-tools/mysql-copyright-2: Auto merged acinclude.m4: Auto merged client/mysqladmin.c: Auto merged client/mysqldump.c: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/myisam.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/buf/buf0buf.c: Auto merged ltmain.sh: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/log/log0log.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/row/row0row.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/ut/ut0dbg.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_close.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_locking.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/r/delete.result: Auto merged mysql-test/r/func_if.result: Auto merged Build-tools/mysql-copyright: Merge with 4.0 (too most of the code from 4.0) Makefile.am: merge client/mysql.cc: Used 4.1 code configure.in: merge innobase/os/os0file.c: merge innobase/row/row0mysql.c: merge mysql-test/r/ctype_latin1_de.result: merge mysql-test/r/flush_table.result: merge mysql-test/r/func_str.result: merge mysql-test/r/handler.result: merge mysql-test/r/multi_update.result: merge mysql-test/r/type_timestamp.result: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/r/update.result: merge mysql-test/t/delete.test: merge mysql-test/t/flush_table.test: merge mysql-test/t/func_str.test: merge mysql-test/t/handler.test: merge mysql-test/t/multi_update.test: merge mysql-test/t/type_timestamp.test: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/t/update.test: merge mysys/errors.c: merge mysys/my_fstream.c: merge mysys/my_pread.c: merge mysys/my_write.c: merge mysys/mysys_priv.h: merge scripts/mysqlhotcopy.sh: merge sql/field.cc: Keep code from 4.1 sql/field.h: Keep code from 4.1 sql/ha_innodb.cc: Don't merge lock code from 4.0; Heikki will look at this sql/ha_myisam.cc: merge sql/handler.cc: merge sql/item_cmpfunc.cc: merge sql/item_cmpfunc.h: merge sql/item_strfunc.cc: merge sql/mysql_priv.h: merge sql/mysqld.cc: merge sql/protocol.cc: merge sql/records.cc: merge sql/repl_failsafe.cc: merge mysql-test/r/lock_multi.result: merge mysql-test/t/ctype_latin1_de.test: merge mysql-test/t/func_if.test: merge mysql-test/t/lock_multi.test: merge sql/repl_failsafe.h: merge Remove unnessessary header protection sql/slave.h: merge sql/sql_acl.cc: merge sql/sql_base.cc: merge sql/sql_cache.cc: auto merge sql/sql_class.cc: merge sql/sql_class.h: merge sql/sql_delete.cc: merge sql/sql_handler.cc: Get new HANDLER code into 4.1 sql/sql_parse.cc: Keep old file sql/sql_repl.cc: merge sql/sql_repl.h: merge sql/sql_show.cc: merge sql/sql_table.cc: merge sql/sql_union.cc: Applied the examine_rows bug fix from 4.0 by hand sql/sql_update.cc: New multi-update-grant-check code from 4.0 sql/sql_yacc.yy: New multi-update-grant-check code from 4.0 sql/stacktrace.c: merge sql/table.h: merge |
||
|---|---|---|
| .. | ||
| .cvsignore | ||
| array.c | ||
| ChangeLog | ||
| charset-def.c | ||
| charset.c | ||
| charset2html.c | ||
| checksum.c | ||
| default.c | ||
| errors.c | ||
| hash.c | ||
| list.c | ||
| make-ccc | ||
| make-conf.c | ||
| Makefile.am | ||
| md5.c | ||
| mf_brkhant.c | ||
| mf_cache.c | ||
| mf_dirname.c | ||
| mf_fn_ext.c | ||
| mf_format.c | ||
| mf_getdate.c | ||
| mf_iocache.c | ||
| mf_iocache2.c | ||
| mf_keycache.c | ||
| mf_keycaches.c | ||
| mf_loadpath.c | ||
| mf_pack.c | ||
| mf_path.c | ||
| mf_qsort.c | ||
| mf_qsort2.c | ||
| mf_radix.c | ||
| mf_same.c | ||
| mf_sort.c | ||
| mf_soundex.c | ||
| mf_strip.c | ||
| mf_tempdir.c | ||
| mf_tempfile.c | ||
| mf_unixpath.c | ||
| mf_util.c | ||
| mf_wcomp.c | ||
| mf_wfile.c | ||
| mulalloc.c | ||
| my_aes.c | ||
| my_alarm.c | ||
| my_alloc.c | ||
| my_append.c | ||
| my_bit.c | ||
| my_bitmap.c | ||
| my_chsize.c | ||
| my_clock.c | ||
| my_compress.c | ||
| my_copy.c | ||
| my_crc32.c | ||
| my_create.c | ||
| my_delete.c | ||
| my_div.c | ||
| my_dup.c | ||
| my_error.c | ||
| my_file.c | ||
| my_fopen.c | ||
| my_fstream.c | ||
| my_gethostbyname.c | ||
| my_gethwaddr.c | ||
| my_getopt.c | ||
| my_getsystime.c | ||
| my_getwd.c | ||
| my_handler.c | ||
| my_init.c | ||
| my_lib.c | ||
| my_lock.c | ||
| my_lockmem.c | ||
| my_lread.c | ||
| my_lwrite.c | ||
| my_malloc.c | ||
| my_messnc.c | ||
| my_mkdir.c | ||
| my_net.c | ||
| my_netware.c | ||
| my_new.cc | ||
| my_once.c | ||
| my_open.c | ||
| my_os2cond.c | ||
| my_os2dirsrch.c | ||
| my_os2dirsrch.h | ||
| my_os2dlfcn.c | ||
| my_os2dlfcn.h0 | ||
| my_os2file64.c | ||
| my_os2mutex.c | ||
| my_os2thread.c | ||
| my_os2tls.c | ||
| my_port.c | ||
| my_pread.c | ||
| my_pthread.c | ||
| my_quick.c | ||
| my_read.c | ||
| my_realloc.c | ||
| my_redel.c | ||
| my_rename.c | ||
| my_seek.c | ||
| my_semaphore.c | ||
| my_sleep.c | ||
| my_static.c | ||
| my_static.h | ||
| my_symlink.c | ||
| my_symlink2.c | ||
| my_sync.c | ||
| my_tempnam.c | ||
| my_thr_init.c | ||
| my_wincond.c | ||
| my_winsem.c | ||
| my_winthread.c | ||
| my_write.c | ||
| mysys_priv.h | ||
| ptr_cmp.c | ||
| queues.c | ||
| raid.cc | ||
| raid2.c | ||
| rijndael.c | ||
| safemalloc.c | ||
| sha1.c | ||
| string.c | ||
| test_charset.c | ||
| test_dir.c | ||
| test_fn.c | ||
| test_xml.c | ||
| testhash.c | ||
| thr_alarm.c | ||
| thr_lock.c | ||
| thr_mutex.c | ||
| thr_rwlock.c | ||
| tree.c | ||
| typelib.c | ||