Skip to content

M
mariadb
Switch branch/tag
  1. 13 Oct, 2003 3 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 692820cc
      unknown authored 
      into sanja.is.com.ua:/home/bell/mysql/bk/work-group_concat-4.1
      692820cc
    • unknown's avatar
      Many files: · d212ba60
      unknown authored 
        ALTER TABLE ... DISCARD/IMPORT TABLESPACE
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x


sql/ha_innodb.cc:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_class.cc:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_parse.cc:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_table.cc:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/ha_innodb.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/handler.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/lex.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/mysql_priv.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_class.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_lex.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
sql/sql_yacc.yy:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/ha/ha0ha.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/ha/hash0hash.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/buf/buf0buf.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/buf/buf0flu.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/buf/buf0lru.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/buf/buf0rea.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/btr/btr0btr.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/btr/btr0sea.c:
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
innobase/fil/fil0fil.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/buf0buf.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/ha0ha.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/hash0hash.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/row0mysql.h:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/buf0buf.ic:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/ha0ha.ic:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/include/ibuf0ibuf.ic:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/page/page0page.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/row/row0mysql.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/row/row0purge.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/row/row0uins.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
innobase/row/row0umod.c:
  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
      d212ba60
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 2c7948dc
      unknown authored 
      into sanja.is.com.ua:/home/bell/mysql/bk/work-group_concat-4.1
      2c7948dc
  3. 12 Oct, 2003 2 commits
    • unknown's avatar
      wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed. · 1862f671
      unknown authored 
      typo in error message text corrected.
new tests added


mysql-test/r/func_compress.result:
  new tests added
mysql-test/t/func_compress.test:
  new tests added
sql/item_strfunc.cc:
  max size of uncompressed data is max_allowed_packet not 8K
sql/share/czech/errmsg.txt:
  typo fixed
sql/share/danish/errmsg.txt:
  typo fixed
sql/share/dutch/errmsg.txt:
  typo fixed
sql/share/english/errmsg.txt:
  typo fixed
sql/share/estonian/errmsg.txt:
  typo fixed
sql/share/french/errmsg.txt:
  typo fixed
sql/share/german/errmsg.txt:
  typo fixed
sql/share/greek/errmsg.txt:
  typo fixed
sql/share/hungarian/errmsg.txt:
  typo fixed
sql/share/italian/errmsg.txt:
  typo fixed
sql/share/japanese/errmsg.txt:
  typo fixed
sql/share/korean/errmsg.txt:
  typo fixed
sql/share/norwegian-ny/errmsg.txt:
  typo fixed
sql/share/norwegian/errmsg.txt:
  typo fixed
sql/share/polish/errmsg.txt:
  typo fixed
sql/share/portuguese/errmsg.txt:
  typo fixed
sql/share/romanian/errmsg.txt:
  typo fixed
sql/share/russian/errmsg.txt:
  typo fixed
sql/share/serbian/errmsg.txt:
  typo fixed
sql/share/slovak/errmsg.txt:
  typo fixed
sql/share/spanish/errmsg.txt:
  typo fixed
sql/share/swedish/errmsg.txt:
  typo fixed
sql/share/ukrainian/errmsg.txt:
  typo fixed
      1862f671
    • unknown's avatar
      fixed fix_fields() parameters for GROUP_CONCAT() ORDER BY clause · 6159df3e
      unknown authored 
      (BUG#1537)


mysql-test/r/func_gconcat.result:
  test of BUG#1537
mysql-test/t/func_gconcat.test:
  test of BUG#1537
sql/item_sum.cc:
  passing correct address of pointer to item to fix_dields(), using that addres to get access to item after fix_fields
      6159df3e
  5. 11 Oct, 2003 1 commit
    • unknown's avatar
      mysqld.cc: · b297e764
      unknown authored 
        Fix error in --show-slave-auth-info help string.


sql/mysqld.cc:
  Fix error in --show-slave-auth-info help string.
      b297e764
  7. 10 Oct, 2003 1 commit
  9. 09 Oct, 2003 4 commits
    • unknown's avatar
      Don't show Slave_IO_State in the testsuite (replace it with #) because it can't be predicted. · bc8f801b
      unknown authored 
      I manually edited rpl_openssl.result because the test is skipped on my
machine. Hope it's correct.


mysql-test/r/rpl000015.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_error_ignored_table.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_flush_log_loop.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_loaddata.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_log.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_log_pos.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_max_relay_size.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_openssl.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_replicate_do.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_reset_slave.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_rotate_logs.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_trunc_binlog.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/r/rpl_until.result:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl000015.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_empty_master_crash.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_error_ignored_table.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_flush_log_loop.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_loaddata.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_log.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_log_pos.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_max_relay_size.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_openssl.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_redirect.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_replicate_do.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_reset_slave.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_rotate_logs.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_trunc_binlog.test:
  Don't show Slave_IO_State because it can't be predicted.
mysql-test/t/rpl_until.test:
  Don't show Slave_IO_State because it can't be predicted.
      bc8f801b
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 029b5c2a
      unknown authored 
      into mysql.com:/home/mysql_src/mysql-4.1
      029b5c2a
    • unknown's avatar
      Tiny cleanup after the push of WL#1098 "Seconds_behind_master in SHOW SLAVE STATUS": · 9b194438
      unknown authored 
      a better comment, and replacing an assignment by an equivalent simpler one.


sql/log_event.cc:
  a better comment, and replacing an assignment by an equivalent simpler one.
      9b194438
    • unknown's avatar
      os0file.h: · d2aa1ab3
      unknown authored 
        Fix the Windows compilation error reported by Miguel 1.5 hours ago


innobase/include/os0file.h:
  Fix the Windows compilation error reported by Miguel 1.5 hours ago
      d2aa1ab3
  11. 08 Oct, 2003 22 commits
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · ce85c733
      unknown authored 
      into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
      ce85c733
    • unknown's avatar
      errmsg.txt: · 67e33060
      unknown authored 
        Add Stefan's new translations.


sql/share/german/errmsg.txt:
  Add Stefan's new translations.
      67e33060
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 25363c81
      unknown authored 
      into mysql.com:/home/mysql_src/mysql-4.1
      25363c81
    • unknown's avatar
      Final push for WL#1098: · a7a7a8ca
      unknown authored 
      "Add a column "Timestamp_of_last_master_event_executed" in SHOW SLAVE STATUS".
Finally this is adding
- Slave_IO_State (a copy of the State column of SHOW PROCESSLIST for the I/O thread,
so that the users, most of the time, has enough info with only SHOW SLAVE STATUS).
- Seconds_behind_master. When the slave connects to the master it does SELECT UNIX_TIMESTAMP()
on the master, computes the absolute difference between the master's and the slave's clock.
It records the timestamp of the last event executed by the SQL thread, and does a
small computation to find the number of seconds by which the slave is late.


mysql-test/r/rpl000015.result:
  result update
mysql-test/r/rpl_empty_master_crash.result:
  result update
mysql-test/r/rpl_error_ignored_table.result:
  result update
mysql-test/r/rpl_flush_log_loop.result:
  result update
mysql-test/r/rpl_loaddata.result:
  result update
mysql-test/r/rpl_log.result:
  result update
mysql-test/r/rpl_log_pos.result:
  result update
mysql-test/r/rpl_max_relay_size.result:
  result update
mysql-test/r/rpl_redirect.result:
  result update
mysql-test/r/rpl_replicate_do.result:
  result update
mysql-test/r/rpl_reset_slave.result:
  result update
mysql-test/r/rpl_rotate_logs.result:
  result update
mysql-test/r/rpl_trunc_binlog.result:
  result update
mysql-test/r/rpl_until.result:
  result update
mysql-test/t/rpl000015.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_empty_master_crash.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_error_ignored_table.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_flush_log_loop.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_loaddata.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_log.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_log_pos.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_max_relay_size.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_openssl.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_redirect.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_replicate_do.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_reset_slave.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_rotate_logs.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_trunc_binlog.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
mysql-test/t/rpl_until.test:
  update to be independant of the new column Seconds_behind_master in SHOW SLAVE STATUS
sql/log_event.cc:
  when the SQL thread executes an event, we record its timestamp
sql/slave.cc:
  in check_master_version() we know read the master's clock, to know the clock difference
  with the slave.
  In show_master_info() we send the state of the I/O thread, and compute the number of
  seconds by which the slave is late.
sql/slave.h:
  timestamp of the last master's event executed by the SQL thread,
  and difference between the clocks of the master and slave.
sql/sql_repl.cc:
  clear the Seconds_behind_master column of SHOW SLAVE STATUS when RESET SLAVE or CHANGE MASTER.
      a7a7a8ca
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 40bb6d8c
      unknown authored 
      into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1:
  Auto merged
      40bb6d8c
    • unknown's avatar
      deleted conflicting file · 21713178
      unknown authored 
      
BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1:
  Delete: VC++Files/mysqlshutdown/MYSQL.ICO
      21713178
    • unknown's avatar
      Merge · e1042c85
      unknown authored 
      
BitKeeper/deleted/.del-mysql.ico:
  Delete: VC++Files/mysqlshutdown/mysql.ico
      e1042c85
    • unknown's avatar
      Portability fix · 617e09ab
      unknown authored
      617e09ab
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 198e1b92
      unknown authored 
      into mysql.com:/home/mysql_src/mysql-4.1
      198e1b92
    • unknown's avatar
      Indentation cleanups · d1d07c99
      unknown authored 
      Remove wait_if_global_read_lock on commit as this can cause deadlocks


BUILD/FINISH.sh:
  Cleanup
BUILD/SETUP.sh:
  Cleanup
BUILD/compile-pentium-valgrind-max:
  Don't write message twice
mysql-test/r/innodb.result:
  Removed failure as this can cause deadlocks
mysql-test/r/rpl_max_relay_size.result:
  Make test repeatable
mysql-test/t/innodb.test:
  Removed failure as this can cause deadlocks
mysql-test/t/rpl_max_relay_size.test:
  Removed failure as this can cause deadlocks
sql/handler.cc:
  Remove wait_if_global_read_lock as this can cause deadlocks
sql/opt_range.cc:
  Indentation cleanup
sql/sql_db.cc:
  Comment cleanup
sql/sql_parse.cc:
  Comment cleanup
sql/sql_repl.cc:
  Indentation cleanup
sql/sql_select.cc:
  Indentation cleanup
      d1d07c99
    • unknown's avatar
      Incorporate Stefan's new translations of German error messages. · 9a2663f5
      unknown authored
      9a2663f5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 44e3cbcf
      unknown authored 
      into narttu.mysql.fi:/my/mysql-4.1


libmysqld/examples/Makefile.am:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
      44e3cbcf
    • unknown's avatar
      Fixed bug in error handling of CREATE ... SELECT · 32747b19
      unknown authored 
      More tests cases
After merge fixes


BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838:
  Delete: mysql-test/t/ansi-master.opt
mysql-test/r/ansi.result:
  Cleaned up test to be able to remove ansi-master.opt
mysql-test/r/create.result:
  Updated results
mysql-test/r/insert_select.result:
  Updated results
mysql-test/r/rpl000009.result:
  Updated results
mysql-test/t/ansi.test:
  Cleaned up test to be able to remove ansi-master.opt
mysql-test/t/create.test:
  More tests
mysql-test/t/insert_select.test:
  More tests
mysql-test/t/mysqlbinlog.test:
  Fixed test after merge
sql/mysql_priv.h:
  Added character-sets-dir to 'show variables'
sql/set_var.cc:
  Added character-sets-dir to 'show variables'
sql/sql_class.cc:
  Fixed that send_error() is called properly when a SELECT fails
sql/sql_class.h:
  Fixed that send_error() is called properly when a SELECT fails
sql/sql_insert.cc:
  Fixed bug in error handling of CREATE ... SELECT
sql/sql_select.cc:
  Fixed bug in error handling of CREATE ... SELECT
      32747b19
    • unknown's avatar
      - portability fix: replaced "uint" with "unsigned int" · 4c93473f
      unknown authored
      4c93473f
    • unknown's avatar
      - added missing link line that seemed to have gone lost during the last · 387485bb
      unknown authored 
         4.0->4.1 merge (mysqltest needs to be linked with a C++ compiler)
      387485bb
    • unknown's avatar
      merge with 4.0 to get fix for mysqlbinlog · 69ea87fe
      unknown authored 
      
client/mysqlbinlog.cc:
  Auto merged
mysql-test/t/rpl_trunc_binlog.test:
  Auto merged
      69ea87fe
    • unknown's avatar
      Fixes after merge · 1ead85e6
      unknown authored 
      
mysql-test/std_data/trunc_binlog.000001:
  Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001
client/mysqltest.c:
  Fixed merge problem
mysql-test/mysql-test-run.sh:
  Fixed merge problem
mysql-test/r/distinct.result:
  Fix after merge
mysql-test/r/drop_temp_table.result:
  Fix after merge
mysql-test/r/join_outer.result:
  Fix after merge
mysql-test/r/mysqldump.result:
  Fix after merge
mysql-test/r/null_key.result:
  Fix after merge
mysql-test/r/order_by.result:
  Fix after merge
mysql-test/r/rpl_alter.result:
  Fix after merge
mysql-test/r/rpl_loaddata.result:
  Fix after merge
mysql-test/r/rpl_loaddata_rule_m.result:
  Fix after merge
mysql-test/r/rpl_trunc_binlog.result:
  Fix after merge
mysql-test/r/select_safe.result:
  Fix after merge
mysql-test/t/insert.test:
  Fix after merge
mysql-test/t/mysqlbinlog.test:
  Fix after merge
mysql-test/t/rpl000009.test:
  Fix after merge
mysql-test/t/rpl_alter.test:
  Fix after merge
mysql-test/t/rpl_loaddata_rule_m.test:
  Fix after merge
mysql-test/t/rpl_trunc_binlog.test:
  Fix after merge
sql-common/client.c:
  Fix after merge
sql/item_subselect.cc:
  Fix after merge
sql/repl_failsafe.cc:
  Fix after merge
sql/slave.cc:
  Fix after merge
sql/sql_insert.cc:
  Fix after merge
      1ead85e6
    • unknown's avatar
      Fixed test case that my last patch to mysqlbinlog broke. · 26456b88
      unknown authored 
      Changed --remote to --read-from-remote-server (mysqlbinlog)


client/mysqlbinlog.cc:
  Changed --remote to --read-from-remote-server to make option more understandable
mysql-test/t/mysqlbinlog.test:
  Fixed test case that --remote broke
      26456b88
    • unknown's avatar
      Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 21e2957d
      unknown authored 
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
      21e2957d
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7de043be
      unknown authored 
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
      7de043be
    • unknown's avatar
      query_cache.result, query_cache.test: · f6501fd3
      unknown authored 
        Character set variables test


mysql-test/t/query_cache.test:
  Character set variables test
mysql-test/r/query_cache.result:
  Character set variables test
      f6501fd3
    • unknown's avatar
      Fixed test case to work on NetWare. · ddfb716d
      unknown authored 
      
mysql-test/r/func_gconcat.result:
  Removed extraneous CR (0x0D)
mysql-test/t/func_gconcat.test:
  Removed extraneous CR (0x0D)
      ddfb716d
  13. 07 Oct, 2003 7 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 927909f5
      unknown authored 
      into narttu.mysql.fi:/my/mysql-4.0
      927909f5
    • unknown's avatar
      Fix for option 'R' (connect to remote server) in mysqlbinlog · 9214babe
      unknown authored 
      
client/mysqlbinlog.cc:
  Fix for option 'R' (connect to remote server)
      9214babe
    • unknown's avatar
      mysql_real_connect picks the Unix login when the user "" is used. · 12e5e094
      unknown authored 
       This makes the test non-repeatable when running as root.
 So I change to not use the "" user, but a random string which will
 always result in the @localhost user being selected by the server.


mysql-test/t/rpl_temporary.test:
  mysql_real_connect picks the Unix login when the user "" is used.
  This makes the test non-repeatable when running as root.
  So I change to not use the "" user, but a random string which will
  always result in the @localhost user being selected by the server.
      12e5e094
    • unknown's avatar
      merge · 118d5321
      unknown authored 
      
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
innobase/row/row0mysql.c:
  merge (no changes)
innobase/row/row0sel.c:
  merge (no changes)
sql/item_subselect.cc:
  Use sanjas patch instead
      118d5321
    • unknown's avatar
      Fix for a test failure with the standard (no-BDB) binary: · 654d266c
      unknown authored 
      as the test is meaningful only if the slave supports transactions,
we require this. As in 4.0 the slave runs with --skip-innodb, we
test for BDB.
      654d266c
    • unknown's avatar
      Merge with 4.0 to get fix for mysqlbinlog · 60e4f7d5
      unknown authored 
      
client/mysqlbinlog.cc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Cleaned up argument handling for external programs
      60e4f7d5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 19e954d2
      unknown authored 
      into narttu.mysql.fi:/my/mysql-4.0
      19e954d2
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7