Commits · a681af904d4fc8e02042b93b9035855ea989a155 · Kirill Smelkov / mariadb

04 Jun, 2005 2 commits

mergemerged · a681af90

unknown authored Jun 04, 2005


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

a681af90

after mergemerge · 61c12aa2
unknown authored Jun 04, 2005

61c12aa2

03 Jun, 2005 12 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 15eb5a1f
unknown authored Jun 03, 2005
```
into mysql.com:/home/my/mysql-4.1
```
15eb5a1f

Move USE_PRAGMA_IMPLEMENTATION to proper place · 72dd44b9

unknown authored Jun 03, 2005

Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable


mysql-test/r/func_gconcat.result:
  Move innodb specific test to innodb.test
  Changed table name r2 -> t2
  More test to see how ROLLUP was optimized
mysql-test/r/innodb.result:
  Moved test here form func_gconcat
mysql-test/r/olap.result:
  New test results after optimization
mysql-test/t/func_gconcat.test:
  Move innodb specific test to innodb.test
  Changed table name r2 -> t2
  More test to see how ROLLUP was optimized
mysql-test/t/innodb.test:
  Moved test here form func_gconcat
sql/field.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_berkeley.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_blackhole.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_heap.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_innodb.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_isam.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_isammrg.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_myisam.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_myisammrg.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/ha_ndbcluster.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/handler.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/hash_filo.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_cmpfunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_func.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
  Ensure that 'null_value' is not accessed before val() is called
sql/item_geofunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_strfunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_subselect.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_sum.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_timefunc.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/item_uniq.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/log_event.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/mysql_priv.h:
  Change key_map_full to not be const as we are giving it a proper value on startup
sql/mysqld.cc:
  Move key_map variables here and initialize key_map_full properly
sql/opt_range.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/opt_range.h:
  Fix that test_quick_select() works with any ammount of keys
sql/procedure.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/protocol.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/protocol_cursor.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/set_var.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_analyse.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_class.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_crypt.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_insert.cc:
  Fixed that max_rows is ulong
sql/sql_list.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_map.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_olap.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_select.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
  Fixed that ROLLUP don't have to always create a temporary table
  Added new argument to remove_const() to make above possible
  Fixed some errors that creapt up when we don't always do a temporary table for ROLLUP
sql/sql_string.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_table.cc:
  Simple optimizations
  Fixed wrong checking of build_table_path() in undef-ed code
sql/sql_udf.cc:
  Move USE_PRAGMA_IMPLEMENTATION to proper place
sql/sql_yacc.yy:
  removed extra {}

72dd44b9

mergemerged · 33022c52

unknown authored Jun 03, 2005


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

33022c52

after merge fixes · 7509b500
unknown authored Jun 03, 2005

7509b500

merged · 70442e0a

unknown authored Jun 03, 2005


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/create.result:
  merged, need fixing
sql/sql_parse.cc:
  merged (perhaps wrong)

70442e0a

Merge bk-internal:/home/bk/mysql-4.0/ · ef30cc61
unknown authored Jun 03, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
```
ef30cc61
*don't* mess with kernel defines, boy. · 78fc4172
unknown authored Jun 03, 2005
```
and HAVE_ATOMIC_ADD/HAVE_ATOMIC_SUB is tested in configure
```
78fc4172
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0298ebb5
unknown authored Jun 03, 2005
```
into mysql.com:/home/my/mysql-4.1
```
0298ebb5

check-cpu fixes/improvements (Bug #11065) · fcb3be9f

unknown authored Jun 03, 2005

    
    - support additional platforms (OpenBSD, Darwin)
    - make use of /proc/cpuinfo CPU flag information
      (needed to distinguish EMT64 Xeons from normal ones)
    - chose the right CPU related options depending on 
      GCC version and target architecture
    - check if the chosen CPU type is actually supported
      by the GCC version , fallback to CPUs predecessor
      until test compile succeeds

fcb3be9f

sql_repl.cc: · 74dd6421

unknown authored Jun 03, 2005

  Bug #11064  	some read error not detected in replication on 64-bit platform


sql/sql_repl.cc:
  Bug #11064  	some read error not detected in replication on 64-bit platform
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

74dd6421

bundle the check-cpu helper script with source packages. · 9979feb3
unknown authored Jun 03, 2005
```
BUG#10696
```
9979feb3

ctype_utf8.result, ctype_utf8.test: · 52b70cef

unknown authored Jun 03, 2005

  adding test
field.cc:
  bug#10714 Inserting double value into utf8 column crashes server:
  sprintf was executed with too big length, which caused
  crash on some Windows platforms.


sql/field.cc:
  bug#10714 Inserting double value into utf8 column crashes server
  sprintf was executed with too long length, which cau
  crashe on Windows.
mysql-test/t/ctype_utf8.test:
  adding test
mysql-test/r/ctype_utf8.result:
  adding test

52b70cef

02 Jun, 2005 11 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 74f3014c
unknown authored Jun 03, 2005
```
into mysql.com:/home/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged
```
74f3014c
Removed duplicated and wrong merged code · 1b999482
unknown authored Jun 03, 2005
```
sql/sql_base.cc:
  Fixed wrong comment
```
1b999482
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 336d32b1
unknown authored Jun 02, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/tmp
```
336d32b1

CommandInterpreter.cpp: · 28a467c6

unknown authored Jun 02, 2005

Bug #11050 ndb_mgm "show" prints incorrectly after master data node fails

ndb/src/mgmclient/CommandInterpreter.cpp:
Bug #11050 ndb_mgm "show" prints incorrectly after master data node fails

28a467c6

fixed compile problem by replacing W_OK with F_OK · dd3225b2
unknown authored Jun 02, 2005
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
dd3225b2

item_func.cc: · 17678a7b

unknown authored Jun 02, 2005

set_var.cc:
variables.result
variables.test

  Bug #10904 Illegal mix of collations between a system variable and a constant
  Changing coercibility of system variables to SYSCONST,
  to be the same with USER(), DATABASE(), etc.


sql/item_func.cc:
  Bug #10904 Illegal mix of collations between a system variable and a constant
  Changing coercibility of system variables to SYSCONST
  To be the same with USER(), DATABASE(), etc.

17678a7b

Merge mysql.com:/home/mydev/mysql-4.1 · d7d3be6b
unknown authored Jun 02, 2005
```
into mysql.com:/home/mydev/mysql-4.1-4100
```
d7d3be6b

Merge · e2bf6b04

unknown authored Jun 01, 2005


sql/ha_heap.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_repl.cc:
  SCCS merged

e2bf6b04

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · e71ef941
unknown authored Jun 02, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-4.1


sql/item_func.cc:
  Auto merged
```
e71ef941

tztime.cc: · cee10f97

unknown authored Jun 02, 2005

  Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION


client/sql_string.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
mysys/raid.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/field.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_berkeley.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_blackhole.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_heap.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_innodb.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_isam.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_isammrg.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_myisam.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_myisammrg.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/ha_ndbcluster.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/handler.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/hash_filo.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_cmpfunc.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_func.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_geofunc.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_strfunc.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_subselect.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_sum.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_timefunc.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/item_uniq.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/log_event.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/opt_range.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/procedure.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/protocol.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/protocol_cursor.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/set_var.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_analyse.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_class.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_crypt.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_list.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_map.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_olap.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/examples/ha_archive.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_select.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_string.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/sql_udf.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/examples/ha_example.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/examples/ha_tina.cc:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
sql/tztime.cc:
  Set #pragma implementation" earlier

cee10f97

Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed... · 0218ecf7

unknown authored Jun 01, 2005

Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.


client/mysqladmin.cc:
  gcc 4.0 fix
sql/examples/ha_archive.cc:
  Bunch of little cleanups from -Wall and gcc 4.0 fixes
sql/examples/ha_example.cc:
  Noticed that the error call was not quite right.
sql/examples/ha_tina.cc:
  Bunch of cleanups (many of which were quite dumb of me... and I have no earthly idea how they missed everyone's notice).
sql/ha_heap.cc:
  Removed unused variable (-Wall find)
sql/item_subselect.cc:
  Removed unused label.
sql/mysqld.cc:
  Cleanup of unused function and gcc 4.0 bit.
sql/opt_range.h:
  Cleanup for gcc 4.0
sql/repl_failsafe.cc:
  Cleanup for gcc 4.0
sql/slave.cc:
  Cleanup for gcc 4.0
sql/sql_acl.cc:
  Cleanup for gcc 4.0
sql/sql_insert.cc:
  Cleanedup for gcc 4.0
sql/sql_parse.cc:
  Cleanedup for gcc 4.0
sql/sql_repl.cc:
  Removed unused variable
sql/sql_select.cc:
  Cleanedup for gcc 4.0

0218ecf7

01 Jun, 2005 13 commits

Fix --with-bdb to be --with-berkeley-db in BUILD/SETUP.sh · 638bb0a2
unknown authored Jun 01, 2005
```
BUILD/SETUP.sh:
  Fix --with-bdb to --with-berkeley-db
```
638bb0a2
Fix compile error when HAVE_BERKELEY_DB · 4e19af27
unknown authored Jun 01, 2005
```
sql/sql_table.cc:
  Add missing argument
```
4e19af27
Update results of test after merge of bugfix · b4953598
unknown authored Jun 01, 2005
```
mysql-test/r/rpl_failed_optimize.result:
  Update results
```
b4953598
Merge mysql.com:/home/jimw/my/mysql-4.1-8572 · 8dad75b2
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
8dad75b2
Merge mysql.com:/home/jimw/my/mysql-4.1-9660 · be804109
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_table.cc:
  Auto merged
```
be804109
Merge mysql.com:/home/jimw/my/mysql-4.1-10944 · 61bb1f34
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
61bb1f34
Merge mysql.com:/home/jimw/my/mysql-4.1-8135 · dd1168a3
unknown authored Jun 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_table.cc:
  Auto merged
```
dd1168a3

Fix handling of NULL fields in FIELD(). (Bug #10944) · f20c56a9

unknown authored Jun 01, 2005


mysql-test/r/func_str.result:
  Update results
mysql-test/t/func_str.test:
  Add regression tests
sql/item_func.cc:
  Handle NULL as first argument to FIELD()

f20c56a9

Merge mysql.com:/home/mydev/mysql-4.1 · 2855192e
unknown authored Jun 01, 2005
```
into mysql.com:/home/mydev/mysql-4.1-4100
```
2855192e

Bug#10602 - LOAD INDEX INTO CACHE deadlocks · 6d397aae

unknown authored Jun 01, 2005

Fixed two deadlocks.
Made minor changes.


mysys/mf_keycache.c:
  Bug#10602 - LOAD INDEX INTO CACHE deadlocks
  Fixed two deadlocks.
  Made keycache traces line buffered.
  Removed unused macro and function.
  Added comments and trace messages.
  Fixed two compiler warnings.
  Fixed some coding style issues.

6d397aae

Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 · 853a55ad
unknown authored Jun 01, 2005
```
configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
```
853a55ad

- removed references to some obsolete files (BUG#10824) · 0d4b1184

unknown authored Jun 01, 2005

- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
  spec file)


BitKeeper/deleted/.del-mysql-max.spec.sh~ca055d86585c1010:
  Delete: support-files/mysql-max.spec.sh
configure.in:
  - removed references to some obsolete files
scripts/make_binary_distribution.sh:
  - removed references to some obsolete files

0d4b1184

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · a0affca7
unknown authored Jun 01, 2005
```
into mysql.com:/space/my/mysql-4.1
```
a0affca7

31 May, 2005 2 commits
- Merge · 10481cd0
  unknown authored May 31, 2005
```
mysql-test/r/create.result:
  SCCS merged
mysql-test/t/create.test:
  SCCS merged
```
  10481cd0
- Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. · 601b5bca
  unknown authored May 31, 2005
```
After merge fix.
```
  601b5bca